From: Tim-Philipp Müller <tim@centricular.net>
Date: Sun, 9 Sep 2012 17:36:49 +0000 (+0100)
Subject: Remove glib-compat-private.h stuff we don't need any more
X-Git-Tag: 1.19.3~511^2~5936
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2079a8c12b0476df3b8cdc2ab3d9816aa4d7cc5f;p=platform%2Fupstream%2Fgstreamer.git

Remove glib-compat-private.h stuff we don't need any more

It's all been ported to the latest GLib API now.
---

diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c
index 8fb7891..7dd4eb0 100644
--- a/ext/alsa/gstalsasink.c
+++ b/ext/alsa/gstalsasink.c
@@ -53,7 +53,6 @@
 
 #include <gst/audio/gstaudioiec61937.h>
 #include <gst/gst-i18n-plugin.h>
-#include "gst/glib-compat-private.h"
 
 #define DEFAULT_DEVICE		"default"
 #define DEFAULT_DEVICE_NAME	""
diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c
index 55eaedc..3e11bf5 100644
--- a/ext/alsa/gstalsasrc.c
+++ b/ext/alsa/gstalsasrc.c
@@ -48,7 +48,6 @@
 
 #include "gstalsasrc.h"
 #include "gstalsadeviceprobe.h"
-#include "gst/glib-compat-private.h"
 
 #include <gst/gst-i18n-plugin.h>
 
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 4844ff1..22f42cb 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -46,8 +46,6 @@
 
 #include "gstoggdemux.h"
 
-#include "gst/glib-compat-private.h"
-
 #define CHUNKSIZE (8500)        /* this is out of vorbisfile */
 
 /* we hope we get a granpos within this many bytes off the end */
diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index dd8a6ec..5270b51 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -74,8 +74,6 @@
 #include "gstapp-marshal.h"
 #include "gstappsink.h"
 
-#include "gst/glib-compat-private.h"
-
 struct _GstAppSinkPrivate
 {
   GstCaps *caps;
diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c
index 6e8459d..d096a23 100644
--- a/gst-libs/gst/app/gstappsrc.c
+++ b/gst-libs/gst/app/gstappsrc.c
@@ -100,8 +100,6 @@
 #include "gstapp-marshal.h"
 #include "gstappsrc.h"
 
-#include "gst/glib-compat-private.h"
-
 struct _GstAppSrcPrivate
 {
   GCond *cond;
diff --git a/gst-libs/gst/audio/gstaudioringbuffer.c b/gst-libs/gst/audio/gstaudioringbuffer.c
index 60e2029..4893133 100644
--- a/gst-libs/gst/audio/gstaudioringbuffer.c
+++ b/gst-libs/gst/audio/gstaudioringbuffer.c
@@ -43,8 +43,6 @@
 
 #include "gstaudioringbuffer.h"
 
-#include "gst/glib-compat-private.h"
-
 GST_DEBUG_CATEGORY_STATIC (gst_audio_ring_buffer_debug);
 #define GST_CAT_DEFAULT gst_audio_ring_buffer_debug
 
diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c
index 6efa2f5..c10c5a1 100644
--- a/gst-libs/gst/audio/gstaudiosink.c
+++ b/gst-libs/gst/audio/gstaudiosink.c
@@ -71,8 +71,6 @@
 
 #include "gstaudiosink.h"
 
-#include "gst/glib-compat-private.h"
-
 GST_DEBUG_CATEGORY_STATIC (gst_audio_sink_debug);
 #define GST_CAT_DEFAULT gst_audio_sink_debug
 
diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c
index a09cf87..d6eff00 100644
--- a/gst-libs/gst/audio/gstaudiosrc.c
+++ b/gst-libs/gst/audio/gstaudiosrc.c
@@ -71,8 +71,6 @@
 
 #include "gstaudiosrc.h"
 
-#include "gst/glib-compat-private.h"
-
 GST_DEBUG_CATEGORY_STATIC (gst_audio_src_debug);
 #define GST_CAT_DEFAULT gst_audio_src_debug
 
diff --git a/gst-libs/gst/glib-compat-private.h b/gst-libs/gst/glib-compat-private.h
index 53a9c80..51cb6a7 100644
--- a/gst-libs/gst/glib-compat-private.h
+++ b/gst-libs/gst/glib-compat-private.h
@@ -23,88 +23,16 @@
 #ifndef __GLIB_COMPAT_PRIVATE_H__
 #define __GLIB_COMPAT_PRIVATE_H__
 
+#if 0
 #include <glib.h>
 
 G_BEGIN_DECLS
 
-/* FIXME: can use unconditionally now */
-#define GLIB_HAS_GDATETIME
-
-/* FIXME: can use the new functions unconditionally now */
-#define G_ATOMIC_POINTER_COMPARE_AND_EXCHANGE(a,b,c) \
-    g_atomic_pointer_compare_and_exchange ((a),(b),(c))
-#define G_ATOMIC_INT_COMPARE_AND_EXCHANGE(a,b,c) \
-    g_atomic_int_compare_and_exchange ((a),(b),(c))
-#define G_ATOMIC_INT_ADD(a,b) g_atomic_int_add ((a),(b))
-
 /* copies */
 
-/* FIXME: use new GLib API */
-#define g_mutex_new gst_g_mutex_new
-static inline GMutex *
-gst_g_mutex_new (void)
-{
-  GMutex *mutex = g_slice_new (GMutex);
-  g_mutex_init (mutex);
-  return mutex;
-}
-#define g_mutex_free gst_g_mutex_free
-static inline void
-gst_g_mutex_free (GMutex *mutex)
-{
-  g_mutex_clear (mutex);
-  g_slice_free (GMutex, mutex);
-}
-#define g_static_rec_mutex_init gst_g_static_rec_mutex_init
-static inline void
-gst_g_static_rec_mutex_init (GStaticRecMutex *mutex)
-{
-  static const GStaticRecMutex init_mutex = G_STATIC_REC_MUTEX_INIT;
-
-  *mutex = init_mutex;
-}
-#define g_cond_new gst_g_cond_new
-static inline GCond *
-gst_g_cond_new (void)
-{
-  GCond *cond = g_slice_new (GCond);
-  g_cond_init (cond);
-  return cond;
-}
-#define g_cond_free gst_g_cond_free
-static inline void
-gst_g_cond_free (GCond *cond)
-{
-  g_cond_clear (cond);
-  g_slice_free (GCond, cond);
-}
-#define g_cond_timed_wait gst_g_cond_timed_wait
-static inline gboolean
-gst_g_cond_timed_wait (GCond *cond, GMutex *mutex, GTimeVal *abs_time)
-{
-  gint64 end_time;
-
-  if (abs_time == NULL) {
-    g_cond_wait (cond, mutex);
-    return TRUE;
-  }
-
-  end_time = abs_time->tv_sec;
-  end_time *= 1000000;
-  end_time += abs_time->tv_usec;
-
-  /* would be nice if we had clock_rtoffset, but that didn't seem to
-   * make it into the kernel yet...
-   */
-  /* if CLOCK_MONOTONIC is not defined then g_get_montonic_time() and
-   * g_get_real_time() are returning the same clock and we'd add ~0
-   */
-  end_time += g_get_monotonic_time () - g_get_real_time ();
-  return g_cond_wait_until (cond, mutex, end_time);
-}
-
 /* adaptations */
 
 G_END_DECLS
+#endif
 
 #endif
diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c
index 2630eaa..3403d75 100644
--- a/gst-libs/gst/pbutils/gstdiscoverer.c
+++ b/gst-libs/gst/pbutils/gstdiscoverer.c
@@ -47,8 +47,6 @@
 #include "pbutils.h"
 #include "pbutils-private.h"
 
-#include "gst/glib-compat-private.h"
-
 GST_DEBUG_CATEGORY_STATIC (discoverer_debug);
 #define GST_CAT_DEFAULT discoverer_debug
 
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index 69dedbe..64a0608 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -67,8 +67,6 @@
 
 #include "gstrtspconnection.h"
 
-#include "gst/glib-compat-private.h"
-
 #ifdef IP_TOS
 union gst_sockaddr
 {
diff --git a/gst-libs/gst/video/convertframe.c b/gst-libs/gst/video/convertframe.c
index 1bffe4f..8e5ee10 100644
--- a/gst-libs/gst/video/convertframe.c
+++ b/gst-libs/gst/video/convertframe.c
@@ -22,8 +22,6 @@
 #include <string.h>
 #include "video.h"
 
-#include "gst/glib-compat-private.h"
-
 static gboolean
 caps_are_raw (const GstCaps * caps)
 {
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 146143c..9057044 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -99,8 +99,6 @@
 #include "gstplayback.h"
 #include "gstrawcaps.h"
 
-#include "gst/glib-compat-private.h"
-
 /* Also used by gsturidecodebin.c */
 gint _decode_bin_compare_factories_func (gconstpointer p1, gconstpointer p2);
 
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 738a372..4540150 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -236,7 +236,7 @@
 #include "gstplayback.h"
 #include "gstplaysink.h"
 #include "gstsubtitleoverlay.h"
-#include "gst/glib-compat-private.h"
+
 GST_DEBUG_CATEGORY_STATIC (gst_play_bin_debug);
 #define GST_CAT_DEFAULT gst_play_bin_debug
 
diff --git a/gst/playback/gstplaysinkconvertbin.c b/gst/playback/gstplaysinkconvertbin.c
index 81619dc..0b5c368 100644
--- a/gst/playback/gstplaysinkconvertbin.c
+++ b/gst/playback/gstplaysinkconvertbin.c
@@ -26,7 +26,6 @@
 
 #include <gst/pbutils/pbutils.h>
 #include <gst/gst-i18n-plugin.h>
-#include "gst/glib-compat-private.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_play_sink_convert_bin_debug);
 #define GST_CAT_DEFAULT gst_play_sink_convert_bin_debug
diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c
index 4d6e720..caf431d 100644
--- a/gst/playback/gstsubtitleoverlay.c
+++ b/gst/playback/gstsubtitleoverlay.c
@@ -44,8 +44,6 @@
 #include <gst/video/video.h>
 #include <string.h>
 
-#include "gst/glib-compat-private.h"
-
 GST_DEBUG_CATEGORY_STATIC (subtitle_overlay_debug);
 #define GST_CAT_DEFAULT subtitle_overlay_debug
 
diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c
index ceefd74..a28a566 100644
--- a/gst/playback/gsturidecodebin.c
+++ b/gst/playback/gsturidecodebin.c
@@ -42,8 +42,6 @@
 #include "gstrawcaps.h"
 #include "gstplayback.h"
 
-#include "gst/glib-compat-private.h"
-
 /* From gstdecodebin2.c */
 gint _decode_bin_compare_factories_func (gconstpointer p1, gconstpointer p2);
 
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 1540d96..376a6b2 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -115,8 +115,6 @@
 /* Debugging category */
 #include <gst/gstinfo.h>
 
-#include "gst/glib-compat-private.h"
-
 /* for XkbKeycodeToKeysym */
 #include <X11/XKBlib.h>
 
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index c766d25..3990bfa 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -130,8 +130,6 @@
 /* Debugging category */
 #include <gst/gstinfo.h>
 
-#include "gst/glib-compat-private.h"
-
 /* for XkbKeycodeToKeysym */
 #include <X11/XKBlib.h>