From 23bcab0c9a634463b95db4c3a12ed3eb29ad5cfe Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Tue, 13 Apr 2004 13:41:20 +0000
Subject: [PATCH] make player example use gconf

Original commit message from CVS:
make player example use gconf
---
 ChangeLog                    |  6 ++++++
 examples/gstplay/Makefile.am |  3 ++-
 examples/gstplay/player.c    | 13 ++++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ac8f61058..1ca7728fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* examples/gstplay/Makefile.am:
+	* examples/gstplay/player.c: (main):
+          make the commandline player example use gconf settings
+
 2004-04-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/libcaca/gstcacasink.c: (gst_cacasink_class_init),
diff --git a/examples/gstplay/Makefile.am b/examples/gstplay/Makefile.am
index 795fc36205..cbae9cbf49 100644
--- a/examples/gstplay/Makefile.am
+++ b/examples/gstplay/Makefile.am
@@ -2,9 +2,10 @@
 noinst_PROGRAMS = player
 
 player_SOURCES = player.c
-player_CFLAGS = $(GST_CFLAGS)
+player_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS)
 player_LDFLAGS = \
     $(GST_LIBS) \
+    $(top_builddir)/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la \
     $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la \
     $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
 
diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c
index 92cb9bc7a9..4258d6459f 100644
--- a/examples/gstplay/player.c
+++ b/examples/gstplay/player.c
@@ -18,6 +18,7 @@
  */
 
 #include <gst/play/play.h>
+#include <gst/gconf/gconf.h>
 
 static GMainLoop *loop = NULL;
 static gint64 length = 0;
@@ -121,11 +122,17 @@ main (int argc, char *argv[])
   }
 
   /* Getting default audio and video plugins from GConf */
-  audio_sink = gst_element_factory_make ("osssink", "audio_sink");
-  video_sink = gst_element_factory_make ("ximagesink", "video_sink");
   vis_element = gst_element_factory_make ("goom", "vis_element");
   data_src = gst_element_factory_make ("gnomevfssrc", "source");
 
+  audio_sink = gst_gconf_get_default_audio_sink ();
+  if (!GST_IS_ELEMENT (audio_sink))
+    g_error ("Could not get default audio sink from GConf");
+  video_sink = gst_gconf_get_default_video_sink ();
+  if (!GST_IS_ELEMENT (video_sink))
+    g_error ("Could not get default video sink from GConf");
+
+
   /* Let's send them to GstPlay object */
   if (!gst_play_set_audio_sink (play, audio_sink))
     g_warning ("Could not set audio sink");
@@ -158,7 +165,7 @@ main (int argc, char *argv[])
   /* Change state to PLAYING */
   if (gst_element_set_state (GST_ELEMENT (play),
           GST_STATE_PLAYING) == GST_STATE_FAILURE)
-    g_warning ("Could not set state to PLAYING");
+    g_error ("Could not set state to PLAYING");
 
   g_idle_add ((GSourceFunc) idle_iterate, play);
   g_timeout_add (20000, (GSourceFunc) seek_timer, play);