From 78f33715ff0c4821aec51d2a6445a5c98191c9a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 4 Dec 2010 14:45:58 +0000 Subject: [PATCH] libs: use GLib 2.22 API unconditionally --- gst-libs/gst/pbutils/gstdiscoverer.c | 3 +-- gst-libs/gst/tag/lang.c | 5 ----- gst-libs/gst/tag/mklangtables.c | 4 ---- gst-libs/gst/video/convertframe.c | 3 +-- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c index 0b632c8..61208ac 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.c +++ b/gst-libs/gst/pbutils/gstdiscoverer.c @@ -1198,9 +1198,8 @@ gst_discoverer_start (GstDiscoverer * discoverer) discoverer->priv->async = TRUE; discoverer->priv->running = TRUE; -#if GLIB_CHECK_VERSION(2, 22, 0) ctx = g_main_context_get_thread_default (); -#endif + /* Connect to bus signals */ if (ctx == NULL) ctx = g_main_context_default (); diff --git a/gst-libs/gst/tag/lang.c b/gst-libs/gst/tag/lang.c index eb5c036..3520383 100644 --- a/gst-libs/gst/tag/lang.c +++ b/gst-libs/gst/tag/lang.c @@ -51,11 +51,6 @@ #include "tag.h" #include "lang-tables.dat" -/* FIXME: remove once we depend on GLib >= 2.22 */ -#if !GLIB_CHECK_VERSION (2, 22, 0) -#define g_mapped_file_unref g_mapped_file_free -#endif - #ifndef GST_DISABLE_GST_DEBUG #define GST_CAT_DEFAULT ensure_debug_category() diff --git a/gst-libs/gst/tag/mklangtables.c b/gst-libs/gst/tag/mklangtables.c index 0f615ff..3a6156f 100644 --- a/gst-libs/gst/tag/mklangtables.c +++ b/gst-libs/gst/tag/mklangtables.c @@ -30,10 +30,6 @@ #include #include -#if !GLIB_CHECK_VERSION (2, 22, 0) -#define g_mapped_file_unref g_mapped_file_free -#endif - #define ISO_639_XML_PATH ISO_CODES_PREFIX "/share/xml/iso-codes/iso_639.xml" typedef struct diff --git a/gst-libs/gst/video/convertframe.c b/gst-libs/gst/video/convertframe.c index a969cc4..c04f2ca 100644 --- a/gst-libs/gst/video/convertframe.c +++ b/gst-libs/gst/video/convertframe.c @@ -615,9 +615,8 @@ gst_video_convert_frame_async (GstBuffer * buf, const GstCaps * to_caps, g_return_if_fail (GST_BUFFER_CAPS (buf) != NULL); g_return_if_fail (callback != NULL); -#if GLIB_CHECK_VERSION(2,22,0) context = g_main_context_get_thread_default (); -#endif + if (!context) context = g_main_context_default (); -- 2.7.4