configure.ac: Require GLib 2.12.

Original commit message from CVS:
* configure.ac:
Require GLib 2.12.
* gst/glib-compat-private.h:
* gst/gstcaps.c: (gst_caps_new_empty), (_gst_caps_free):
* gst/gstclock.c: (gst_clock_entry_new), (_gst_clock_id_free):
Unconditionally use GSlice for allocation.
* gst/gstpoll.c: (gst_poll_new), (gst_poll_free):
* gst/gstsegment.c: (gst_segment_new), (gst_segment_free):
* gst/gststructure.c: (gst_structure_id_empty_new_with_size),
(gst_structure_free):
Use GSlice for allocation.

diff --git a/ChangeLog b/ChangeLog
index 55718c0523a23409998209859b3db9279591057f..9d2a4f33ed4e996878ffb5acbae7fd6d7ba27fcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-04-01  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * configure.ac:
+       Require GLib 2.12.
+
+       * gst/glib-compat-private.h:
+       * gst/gstcaps.c: (gst_caps_new_empty), (_gst_caps_free):
+       * gst/gstclock.c: (gst_clock_entry_new), (_gst_clock_id_free):
+       Unconditionally use GSlice for allocation.
+
+       * gst/gstpoll.c: (gst_poll_new), (gst_poll_free):
+       * gst/gstsegment.c: (gst_segment_new), (gst_segment_free):
+       * gst/gststructure.c: (gst_structure_id_empty_new_with_size),
+       (gst_structure_free):
+       Use GSlice for allocation.
+
 2008-04-01  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * gst/parse/Makefile.am:

diff --git a/configure.ac b/configure.ac
index 8869be6f72a159336329f2bad56887af434cb6fb..3f356a0f8efff5436028de66f03a5ec6155b11f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -471,8 +471,9 @@ LIBS="$save_libs"
 dnl *** checks for dependency libraries ***
 
 dnl GLib
+GLIB_REQ=2.12
 
-AG_GST_GLIB_CHECK([2.8])
+AG_GST_GLIB_CHECK([$GLIB_REQ])
 
 dnl FIXME: 0.11: Guess we need to keep this around until 0.11
 GST_HAVE_GLIB_2_8_DEFINE="#define GST_HAVE_GLIB_2_8 1"

diff --git a/gst/glib-compat-private.h b/gst/glib-compat-private.h
index 2b9a963d2b30b80abda737b78bb09a060477bf4f..75e71087669b2cd79a17bda0e67e387dffaa255b 100644 (file)
--- a/gst/glib-compat-private.h
+++ b/gst/glib-compat-private.h
@@ -14,9 +14,4 @@ G_BEGIN_DECLS
 
 /* adaptations */
 
-/* FIXME: remove once we depend on GLib 2.10 */
-#if (!GLIB_CHECK_VERSION (2, 10, 0))
-#define g_intern_string(s) g_quark_to_string(g_quark_from_string(s))
-#endif
-
 G_END_DECLS

diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index 501530c65dc6c62026ad5a5d578d80dad037bbb8..3d2fd60df5c0aa7a470fe331dbf0459a91aaf7d3 100644 (file)
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -91,14 +91,6 @@
 #define IS_WRITABLE(caps) \
   (g_atomic_int_get (&(caps)->refcount) == 1)
 
-#if GLIB_CHECK_VERSION (2, 10, 0)
-#define ALLOC_CAPS()    g_slice_new (GstCaps)
-#define FREE_CAPS(caps) g_slice_free (GstCaps, caps)
-#else
-#define ALLOC_CAPS()    g_new (GstCaps, 1)
-#define FREE_CAPS(caps) g_free (caps)
-#endif
-
 /* lock to protect multiple invocations of static caps to caps conversion */
 G_LOCK_DEFINE_STATIC (static_caps_lock);
 
@@ -139,7 +131,7 @@ gst_caps_get_type (void)
 GstCaps *
 gst_caps_new_empty (void)
 {
-  GstCaps *caps = ALLOC_CAPS ();
+  GstCaps *caps = g_slice_new (GstCaps);
 
   caps->type = GST_TYPE_CAPS;
   caps->refcount = 1;
@@ -309,7 +301,7 @@ _gst_caps_free (GstCaps * caps)
 #ifdef DEBUG_REFCOUNT
   GST_CAT_LOG (GST_CAT_CAPS, "freeing caps %p", caps);
 #endif
-  FREE_CAPS (caps);
+  g_slice_free (GstCaps, caps);
 }
 
 /**

diff --git a/gst/gstclock.c b/gst/gstclock.c
index 7a9789ef7efc955600cdd4cb6390c99ebe720973..0e497a58557a7d6673213d05c8c7b4b4eedf50ef 100644 (file)
--- a/gst/gstclock.c
+++ b/gst/gstclock.c
@@ -116,14 +116,6 @@
 static GstAllocTrace *_gst_clock_entry_trace;
 #endif
 
-#if GLIB_CHECK_VERSION (2, 10, 0)
-#define ALLOC_ENTRY()     g_slice_new (GstClockEntry)
-#define FREE_ENTRY(entry) g_slice_free (GstClockEntry, entry)
-#else
-#define ALLOC_ENTRY()     g_new (GstClockEntry, 1)
-#define FREE_ENTRY(entry) g_free (entry)
-#endif
-
 /* #define DEBUGGING_ENABLED */
 
 #define DEFAULT_STATS                   FALSE
@@ -162,7 +154,7 @@ gst_clock_entry_new (GstClock * clock, GstClockTime time,
 {
   GstClockEntry *entry;
 
-  entry = ALLOC_ENTRY ();
+  entry = g_slice_new (GstClockEntry);
 #ifndef GST_DISABLE_TRACE
   gst_alloc_trace_new (_gst_clock_entry_trace, entry);
 #endif
@@ -211,7 +203,7 @@ _gst_clock_id_free (GstClockID id)
 #ifndef GST_DISABLE_TRACE
   gst_alloc_trace_free (_gst_clock_entry_trace, id);
 #endif
-  FREE_ENTRY (id);
+  g_slice_free (GstClockEntry, id);
 }
 
 /**

diff --git a/gst/gstpoll.c b/gst/gstpoll.c
index b58e403dec77a43150c0af7b7e85fc10e0c42535..658fcf68e2773b995b8537b931ff10606360f969 100644 (file)
--- a/gst/gstpoll.c
+++ b/gst/gstpoll.c
@@ -462,7 +462,7 @@ gst_poll_new (gboolean controllable)
 {
   GstPoll *nset;
 
-  nset = g_new0 (GstPoll, 1);
+  nset = g_slice_new0 (GstPoll);
   nset->lock = g_mutex_new ();
 #ifndef G_OS_WIN32
   nset->mode = GST_POLL_MODE_AUTO;
@@ -530,7 +530,7 @@ gst_poll_free (GstPoll * set)
   g_array_free (set->active_fds, TRUE);
   g_array_free (set->fds, TRUE);
   g_mutex_free (set->lock);
-  g_free (set);
+  g_slice_free (GstPoll, set);
 }
 
 /**

diff --git a/gst/gstsegment.c b/gst/gstsegment.c
index eef0a48c72616f9743095cb8da19171e7f074a44..dd589a47ec3d24f194e8d450e94b5cdbbc7f3726 100644 (file)
--- a/gst/gstsegment.c
+++ b/gst/gstsegment.c
@@ -121,7 +121,7 @@ gst_segment_new (void)
 {
   GstSegment *result;
 
-  result = g_new0 (GstSegment, 1);
+  result = g_slice_new0 (GstSegment);
   gst_segment_init (result, GST_FORMAT_UNDEFINED);
 
   return result;
@@ -136,7 +136,7 @@ gst_segment_new (void)
 void
 gst_segment_free (GstSegment * segment)
 {
-  g_free (segment);
+  g_slice_free (GstSegment, segment);
 }
 
 /**

diff --git a/gst/gststructure.c b/gst/gststructure.c
index 18c816e5c9d6a3ac202bd3ab0caf7a799eca1efb..673947c744c59b4fd06d563323602b29000ca7d6 100644 (file)
--- a/gst/gststructure.c
+++ b/gst/gststructure.c
@@ -113,7 +113,7 @@ gst_structure_id_empty_new_with_size (GQuark quark, guint prealloc)
 {
   GstStructure *structure;
 
-  structure = g_new0 (GstStructure, 1);
+  structure = g_slice_new0 (GstStructure);
   structure->type = gst_structure_get_type ();
   structure->name = quark;
   structure->fields =
@@ -330,7 +330,7 @@ gst_structure_free (GstStructure * structure)
 #ifdef USE_POISONING
   memset (structure, 0xff, sizeof (GstStructure));
 #endif
-  g_free (structure);
+  g_slice_free (GstStructure, structure);
 }
 
 /**