gst/playback/: Remove GLib-2.6 compatibility cruft.

Original commit message from CVS:
* gst/playback/gstplaybasebin.c: (gst_play_base_bin_get_property):
* gst/playback/gstplaybin.c: (gst_play_bin_get_property):
Remove GLib-2.6 compatibility cruft.

diff --git a/ChangeLog b/ChangeLog
index 9080638..2ffa79a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-26  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/playback/gstplaybasebin.c: (gst_play_base_bin_get_property):
+       * gst/playback/gstplaybin.c: (gst_play_bin_get_property):
+         Remove GLib-2.6 compatibility cruft.
+
 2006-07-24  Wim Taymans  <wim@fluendo.com>
 
        * gst-libs/gst/audio/gstbaseaudiosink.c:

diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index bd410b9..de6d5ec 100644 (file)
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -43,20 +43,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_play_base_bin_debug);
 #define GROUP_WAIT(pbb) g_cond_wait (pbb->group_cond, pbb->group_lock)
 #define GROUP_SIGNAL(pbb) g_cond_signal (pbb->group_cond)
 
-#ifndef GST_HAVE_GLIB_2_8
-#define _gst_gvalue_set_gstobject(gvalue,obj)  \
-      if (obj != NULL) {                       \
-        gst_object_ref (obj);                  \
-        g_value_set_object (gvalue, obj);      \
-        g_object_unref (obj);                  \
-      } else {                                 \
-        g_value_set_object (gvalue, NULL);     \
-      }
-#else
-#define _gst_gvalue_set_gstobject(gvalue,obj)  \
-      g_value_set_object (gvalue, obj);
-#endif
-
 /* props */
 enum
 {
@@ -1995,7 +1981,7 @@ gst_play_base_bin_get_property (GObject * object, guint prop_id, GValue * value,
       break;
     }
     case ARG_SOURCE:
-      _gst_gvalue_set_gstobject (value, play_base_bin->source);
+      g_value_set_object (value, play_base_bin->source);
       break;
     case ARG_VIDEO:
       GROUP_LOCK (play_base_bin);

diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c
index dcac5d9..ff61ca2 100644 (file)
--- a/gst/playback/gstplaybin.c
+++ b/gst/playback/gstplaybin.c
@@ -39,20 +39,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_play_bin_debug);
 
 #define VOLUME_MAX_DOUBLE 4.0
 
-#ifndef GST_HAVE_GLIB_2_8
-#define _gst_gvalue_set_gstobject(gvalue,obj)  \
-      if (obj != NULL) {                       \
-        gst_object_ref (obj);                  \
-        g_value_set_object (gvalue, obj);      \
-        g_object_unref (obj);                  \
-      } else {                                 \
-        g_value_set_object (gvalue, NULL);     \
-      }
-#else
-#define _gst_gvalue_set_gstobject(gvalue,obj)  \
-      g_value_set_object (gvalue, obj);
-#endif
-
 typedef struct _GstPlayBin GstPlayBin;
 typedef struct _GstPlayBinClass GstPlayBinClass;
 
@@ -518,13 +504,13 @@ gst_play_bin_get_property (GObject * object, guint prop_id, GValue * value,
 
   switch (prop_id) {
     case ARG_VIDEO_SINK:
-      _gst_gvalue_set_gstobject (value, play_bin->video_sink);
+      g_value_set_object (value, play_bin->video_sink);
       break;
     case ARG_AUDIO_SINK:
-      _gst_gvalue_set_gstobject (value, play_bin->audio_sink);
+      g_value_set_object (value, play_bin->audio_sink);
       break;
     case ARG_VIS_PLUGIN:
-      _gst_gvalue_set_gstobject (value, play_bin->visualisation);
+      g_value_set_object (value, play_bin->visualisation);
       break;
     case ARG_VOLUME:
       g_value_set_double (value, play_bin->volume);