Remove all references to xvideosink, fix examples (#140845).

Original commit message from CVS:
* configure.ac:
* examples/capsfilter/capsfilter1.c: (main):
* examples/seeking/spider_seek.c: (make_spider_pipeline):
* ext/dvdread/Makefile.am:
* ext/dvdread/demo-play:
* ext/dvdread/demo-play.c:
* gconf/gstreamer.schemas.in:
* gst-libs/gst/gconf/gconf.c:
* sys/v4l/TODO:
* testsuite/Makefile.am:
* testsuite/embed/Makefile.am:
* testsuite/embed/embed.c: (cb_expose), (main):
Remove all references to xvideosink, fix examples (#140845).
* gst/playback/gstplaybasebin.c: (group_destroy):
Apparently, disposal does not unlink - so do explicitely.
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
Add debug.

6 files changed, 37 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 6aa12263..c19c8779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* configure.ac:
+	* examples/capsfilter/capsfilter1.c: (main):
+	* examples/seeking/spider_seek.c: (make_spider_pipeline):
+	* ext/dvdread/Makefile.am:
+	* ext/dvdread/demo-play:
+	* ext/dvdread/demo-play.c:
+	* gconf/gstreamer.schemas.in:
+	* gst-libs/gst/gconf/gconf.c:
+	* sys/v4l/TODO:
+	* testsuite/Makefile.am:
+	* testsuite/embed/Makefile.am:
+	* testsuite/embed/embed.c: (cb_expose), (main):
+	  Remove all references to xvideosink, fix examples (#140845).
+	* gst/playback/gstplaybasebin.c: (group_destroy):
+	  Apparently, disposal does not unlink - so do explicitely.
+	* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
+	  Add debug.
+
 2005-01-09  Maciej Katafiasz <mathrick@freedesktop.org>
 
 	* README: fix PKG_CONFIG_PATH instructions, what was there
diff --git a/configure.ac b/configure.ac
index f7124165..73333ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2104,6 +2104,7 @@ examples/indexing/Makefile
 examples/gstplay/Makefile
 examples/switch/Makefile
 examples/Makefile
+testsuite/embed/Makefile
 testsuite/spider/Makefile
 testsuite/alsa/Makefile
 testsuite/multifilesink/Makefile
diff --git a/examples/capsfilter/capsfilter1.c b/examples/capsfilter/capsfilter1.c
index 5948d601..617b89dd 100644
--- a/examples/capsfilter/capsfilter1.c
+++ b/examples/capsfilter/capsfilter1.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <gst/gst.h>
 
 /* This app uses a filter to connect colorspace and videosink
@@ -28,7 +29,7 @@ main (gint argc, gchar * argv[])
   GstElement *queue;
   GstElement *mpeg2dec;
   GstElement *colorspace;
-  GstElement *xvideosink;
+  GstElement *videosink;
   gboolean res;
 
   gst_init (&argc, &argv);
@@ -51,11 +52,10 @@ main (gint argc, gchar * argv[])
   queue = gst_element_factory_make ("queue", "queue");
   mpeg2dec = gst_element_factory_make ("mpeg2dec", "mpeg2dec");
   g_return_val_if_fail (mpeg2dec, -1);
-  colorspace = gst_element_factory_make ("colorspace", "colorspace");
+  colorspace = gst_element_factory_make ("ffmpegcolorspace", "colorspace");
   g_return_val_if_fail (colorspace, -1);
-  xvideosink = gst_element_factory_make ("xvideosink", "xvideosink");
-  g_return_val_if_fail (xvideosink, -1);
-  g_object_set (G_OBJECT (xvideosink), "toplevel", TRUE, NULL);
+  videosink = gst_element_factory_make ("ximagesink", "videosink");
+  g_return_val_if_fail (videosink, -1);
 
   gst_bin_add (GST_BIN (pipeline), filesrc);
   gst_bin_add (GST_BIN (pipeline), demux);
@@ -63,19 +63,17 @@ main (gint argc, gchar * argv[])
   gst_bin_add (GST_BIN (thread), queue);
   gst_bin_add (GST_BIN (thread), mpeg2dec);
   gst_bin_add (GST_BIN (thread), colorspace);
-  gst_bin_add (GST_BIN (thread), xvideosink);
+  gst_bin_add (GST_BIN (thread), videosink);
   gst_bin_add (GST_BIN (pipeline), thread);
 
-  gst_element_link (filesrc, "src", demux, "sink");
-  gst_element_link (queue, "src", mpeg2dec, "sink");
-  gst_element_link (mpeg2dec, "src", colorspace, "sink");
-  /* force RGB data passing between colorspace and xvideosink */
-  res = gst_element_link_filtered (colorspace, "src", xvideosink, "sink",
-      GST_CAPS_NEW ("filtercaps",
-          "video/raw", "format", GST_PROPS_FOURCC (GST_STR_FOURCC ("RGB "))
-      ));
+  gst_element_link_pads (filesrc, "src", demux, "sink");
+  gst_element_link_pads (queue, "src", mpeg2dec, "sink");
+  gst_element_link_pads (mpeg2dec, "src", colorspace, "sink");
+  /* force RGB data passing between colorspace and videosink */
+  res = gst_element_link_pads_filtered (colorspace, "src", videosink, "sink",
+      gst_caps_new_simple ("video/x-raw-rgb", NULL));
   if (!res) {
-    g_print ("could not connect colorspace and xvideosink\n");
+    g_print ("could not connect colorspace and videosink\n");
     return -1;
   }
 
diff --git a/examples/seeking/spider_seek.c b/examples/seeking/spider_seek.c
index 54c10897..46197c01 100644
--- a/examples/seeking/spider_seek.c
+++ b/examples/seeking/spider_seek.c
@@ -42,7 +42,7 @@ make_spider_pipeline (const gchar * location, gboolean thread)
 
   v_thread = gst_thread_new ("v_thread");
   v_queue = gst_element_factory_make ("queue", "v_queue");
-  videosink = gst_element_factory_make ("xvideosink", "v_sink");
+  videosink = gst_element_factory_make ("xvimagesink", "v_sink");
   //g_object_set (G_OBJECT (audiosink), "sync", FALSE, NULL);
 
   g_object_set (G_OBJECT (src), "location", location, NULL);
diff --git a/gconf/gstreamer.schemas.in b/gconf/gstreamer.schemas.in
index f2b6580c..e3d893c1 100644
--- a/gconf/gstreamer.schemas.in
+++ b/gconf/gstreamer.schemas.in
@@ -19,7 +19,7 @@
       <default>@DEFAULT_VIDEOSINK@</default>
       <locale name="C">
         <short>default GStreamer videosink</short>
-        <long>GStreamer can play video using any number of output elements.  Some possible choices are xvideosink, sdlvideosink and aasink.  The videosink can be a partial pipeline instead of just one element.</long>
+        <long>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.</long>
       </locale>
     </schema>
     <schema>
diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index 00b35a22..e89dc3a1 100644
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -217,7 +217,7 @@ 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 xvideosink is used as default output plugin.
+ * If key is invalid ximagesink is used as default output plugin.
  *
  * Returns: a #GstElement containing the video output bin, or NULL if
  * everything failed.