From 4b1bf1e7b79ce885e9f20643ccf9c399444486df Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 9 Jun 2005 19:43:24 +0000 Subject: g/: Default to autovideosink instead of @DEFAULT_VIDEOSINK@. Original commit message from CVS: * gconf/gstreamer.schemas.in: * gst-libs/gst/gconf/gconf.c: (gst_gconf_get_default_video_sink): Default to autovideosink instead of @DEFAULT_VIDEOSINK@. Autovideosink dynamically selects between ximagesink/xvimagesink, and is thus more userfriendly --- ChangeLog | 8 ++++++++ gconf/gstreamer.schemas.in | 2 +- gst-libs/gst/gconf/gconf.c | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 736b7231..c92a08d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-06-09 Ronald S. Bultje + + * gconf/gstreamer.schemas.in: + * gst-libs/gst/gconf/gconf.c: (gst_gconf_get_default_video_sink): + Default to autovideosink instead of @DEFAULT_VIDEOSINK@. + Autovideosink dynamically selects between ximagesink/xvimagesink, + and is thus more userfriendly + 2005-06-09 Ronald S. Bultje * ext/mad/gstmad.c: (gst_mad_check_caps_reset), (gst_mad_chain): diff --git a/gconf/gstreamer.schemas.in b/gconf/gstreamer.schemas.in index e3d893c1..cc6cd4c7 100644 --- a/gconf/gstreamer.schemas.in +++ b/gconf/gstreamer.schemas.in @@ -16,7 +16,7 @@ /system/gstreamer/@GST_MAJORMINOR@/default/videosink gstreamer string - @DEFAULT_VIDEOSINK@ + autovideosink default GStreamer videosink GStreamer can play video using any number of output elements. Some possible choices are xvimagesink, ximagesink, sdlvideosink and aasink. The videosink can be a partial pipeline instead of just one element. diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c index de3182f0..e18a2192 100644 --- a/gst-libs/gst/gconf/gconf.c +++ b/gst-libs/gst/gconf/gconf.c @@ -217,8 +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, the default video sink for the platform is used - * (typically xvimagesink or ximagesink). + * If key is invalid, the default video sink for the platform is used, + * and this is detected by the autodetection bin autovideosink. * * Returns: a #GstElement containing the video output bin, or NULL if * everything failed. @@ -229,7 +229,7 @@ gst_gconf_get_default_video_sink (void) GstElement *ret = gst_gconf_render_bin_from_key ("default/videosink"); if (!ret) { - ret = gst_element_factory_make (DEFAULT_VIDEOSINK, NULL); + ret = gst_element_factory_make ("autovideosink", NULL); if (!ret) g_warning ("No GConf default video sink key and %s doesn't work", @@ -243,7 +243,7 @@ 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, the default audio source for the plaform is used. + * 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 -- cgit v1.2.1