From 7438894f77941806cd32f2f83dd853a9f4d7bc37 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Wed, 2 Feb 2005 08:14:01 +0000 Subject: configure.ac: Put DEFAULT_AUDIOSINK in config.h and use whereever possible. (Fixes #165997) Original commit message from CVS: * configure.ac: Put DEFAULT_AUDIOSINK in config.h and use whereever possible. (Fixes #165997) * examples/capsfilter/capsfilter1.c: (main): * examples/dynparams/filter.c: (create_ui): * examples/seeking/cdparanoia.c: (get_track_info), (main): * examples/seeking/chained.c: (main): * examples/seeking/seek.c: (make_mod_pipeline), (make_dv_pipeline), (make_wav_pipeline), (make_flac_pipeline), (make_sid_pipeline), (make_vorbis_pipeline), (make_mp3_pipeline), (make_avi_pipeline), (make_mpeg_pipeline), (make_mpegnt_pipeline): * examples/seeking/spider_seek.c: (make_spider_pipeline): * examples/switch/switcher.c: (main): * ext/dv/demo-play.c: (main): * ext/faad/gstfaad.c: (gst_faad_change_state): * ext/mad/gstmad.c: (gst_mad_chain): * ext/smoothwave/demo-osssrc.c: (main): * gst-libs/gst/gconf/gconf.c: (gst_gconf_set_string), (gst_gconf_render_bin_from_description), (gst_gconf_get_default_audio_sink), (gst_gconf_get_default_video_sink), (gst_gconf_get_default_audio_src), (gst_gconf_get_default_video_src), (gst_gconf_get_default_visualization_element): * gst/level/demo.c: (main): * gst/level/plot.c: (main): * gst/playback/gstplaybin.c: (gen_video_element), (gen_audio_element): * gst/playback/test.c: (gen_video_element), (gen_audio_element): * gst/playondemand/demo-mp3.c: (setup_pipeline): * gst/sine/demo-dparams.c: (main): * gst/spectrum/demo-osssrc.c: (main): * gst/speed/demo-mp3.c: (main): * gst/volume/demo.c: (main): * testsuite/embed/embed.c: (main): --- gst-libs/gst/gconf/gconf.c | 54 ++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'gst-libs/gst') diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c index e89dc3a1..de3182f0 100644 --- a/gst-libs/gst/gconf/gconf.c +++ b/gst-libs/gst/gconf/gconf.c @@ -123,7 +123,7 @@ gst_gconf_set_string (const gchar * key, const gchar * value) gconf_client_set_string (gst_gconf_get_client (), full_key, value, &error); if (error) { - g_print ("gst_gconf_set_string: error: %s\n", error->message); + GST_ERROR ("gst_gconf_set_string: error: %s\n", error->message); g_error_free (error); } g_free (full_key); @@ -150,7 +150,7 @@ gst_gconf_render_bin_from_description (const gchar * description) bin = GST_ELEMENT (gst_parse_launch (desc, &error)); g_free (desc); if (error) { - g_print ("DEBUG: gstgconf: error parsing pipeline %s\n%s\n", + GST_ERROR ("gstgconf: error parsing pipeline %s\n%s\n", description, error->message); g_error_free (error); return NULL; @@ -191,7 +191,8 @@ gst_gconf_render_bin_from_key (const gchar * key) * gst_gconf_get_default_audio_sink: * * Render audio output bin from GStreamer GConf key : "default/audiosink". - * If key is invalid osssink is used as default output plugin. + * If key is invalid, the default audio sink for the platform is used + * (typically osssink or sunaudiosink). * * Returns: a #GstElement containing the audio output bin, or NULL if * everything failed. @@ -202,12 +203,11 @@ gst_gconf_get_default_audio_sink (void) GstElement *ret = gst_gconf_render_bin_from_key ("default/audiosink"); if (!ret) { - ret = gst_element_factory_make ("osssink", NULL); + ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL); if (!ret) - g_warning ("No GConf default audio sink key and osssink doesn't work"); - else - g_print ("GConf audio sink not found, using osssink\n"); + g_warning ("No GConf default audio sink key and %s doesn't work", + DEFAULT_AUDIOSINK); } return ret; @@ -217,7 +217,8 @@ gst_gconf_get_default_audio_sink (void) * gst_gconf_get_default_video_sink: * * Render video output bin from GStreamer GConf key : "default/videosink". - * If key is invalid ximagesink is used as default output plugin. + * If key is invalid, the default video sink for the platform is used + * (typically xvimagesink or ximagesink). * * Returns: a #GstElement containing the video output bin, or NULL if * everything failed. @@ -228,12 +229,11 @@ gst_gconf_get_default_video_sink (void) GstElement *ret = gst_gconf_render_bin_from_key ("default/videosink"); if (!ret) { - ret = gst_element_factory_make ("ximagesink", NULL); + ret = gst_element_factory_make (DEFAULT_VIDEOSINK, NULL); if (!ret) - g_warning ("No GConf default video sink key and ximagesink doesn't work"); - else - g_print ("GConf video sink not found, using ximagesink\n"); + g_warning ("No GConf default video sink key and %s doesn't work", + DEFAULT_VIDEOSINK); } return ret; @@ -243,7 +243,8 @@ gst_gconf_get_default_video_sink (void) * gst_gconf_get_default_audio_src: * * Render audio acquisition bin from GStreamer GConf key : "default/audiosrc". - * If key is invalid osssrc is used as default source. + * If key is invalid, the default audio source for the plaform is used. + * (typically osssrc or sunaudiosrc). * * Returns: a #GstElement containing the audio source bin, or NULL if * everything failed. @@ -254,12 +255,11 @@ gst_gconf_get_default_audio_src (void) GstElement *ret = gst_gconf_render_bin_from_key ("default/audiosrc"); if (!ret) { - ret = gst_element_factory_make ("osssrc", NULL); + ret = gst_element_factory_make (DEFAULT_AUDIOSRC, NULL); if (!ret) - g_warning ("No GConf default audio src key and osssrc doesn't work"); - else - g_print ("GConf audio src not found, using osssrc\n"); + g_warning ("No GConf default audio src key and %s doesn't work", + DEFAULT_AUDIOSRC); } return ret; @@ -269,8 +269,8 @@ gst_gconf_get_default_audio_src (void) * gst_gconf_get_default_video_src: * * Render video acquisition bin from GStreamer GConf key : - * "default/videosrc". If key is invalid videotestsrc - * is used as default source. + * "default/videosrc". If key is invalid, the default video source + * for the platform is used (typically videotestsrc). * * Returns: a #GstElement containing the video source bin, or NULL if * everything failed. @@ -281,12 +281,11 @@ gst_gconf_get_default_video_src (void) GstElement *ret = gst_gconf_render_bin_from_key ("default/videosrc"); if (!ret) { - ret = gst_element_factory_make ("videotestsrc", NULL); + ret = gst_element_factory_make (DEFAULT_VIDEOSRC, NULL); if (!ret) - g_warning ("No GConf default video src key and videotestrc doesn't work"); - else - g_print ("GConf video src not found, using videotestrc\n"); + g_warning ("No GConf default video src key and %s doesn't work", + DEFAULT_VIDEOSRC); } return ret; @@ -296,7 +295,7 @@ gst_gconf_get_default_video_src (void) * gst_gconf_get_default_visualization_element: * * Render visualization bin from GStreamer GConf key : "default/visualization". - * If key is invalid goom is used as default visualization element. + * If key is invalid, the default visualization element is used. * * Returns: a #GstElement containing the visualization bin, or NULL if * everything failed. @@ -307,13 +306,12 @@ gst_gconf_get_default_visualization_element (void) GstElement *ret = gst_gconf_render_bin_from_key ("default/visualization"); if (!ret) { - ret = gst_element_factory_make ("goom", NULL); + ret = gst_element_factory_make (DEFAULT_VISUALIZER, NULL); if (!ret) g_warning - ("No GConf default visualization plugin key and goom doesn't work"); - else - g_print ("GConf visualization plugin not found, using goom\n"); + ("No GConf default visualization plugin key and %s doesn't work", + DEFAULT_VISUALIZER); } return ret; -- cgit v1.2.1