From f0a9c246a37eaf7ba67338f5362ceddf9a74676d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 28 Apr 2015 16:02:27 +0100 Subject: [PATCH] gst: remove some unnecessary glib version checks We require 2.32, no need to check for anything older than that. --- gst/debugutils/fpsdisplaysink.c | 8 -------- gst/inter/gstintertest.c | 5 ----- gst/liveadder/liveadder.c | 4 ---- 3 files changed, 17 deletions(-) diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c index 1970baf..a2ee583 100644 --- a/gst/debugutils/fpsdisplaysink.c +++ b/gst/debugutils/fpsdisplaysink.c @@ -435,11 +435,7 @@ display_current_fps (gpointer data) g_free (self->last_message); self->last_message = g_strdup (fps_message); GST_OBJECT_UNLOCK (self); -#if !GLIB_CHECK_VERSION(2,26,0) - g_object_notify ((GObject *) self, "last-message"); -#else g_object_notify_by_pspec ((GObject *) self, pspec_last_message); -#endif } self->last_frames_rendered = frames_rendered; @@ -521,11 +517,7 @@ fps_display_sink_stop (GstFPSDisplaySink * self) g_free (self->last_message); self->last_message = str; GST_OBJECT_UNLOCK (self); -#if !GLIB_CHECK_VERSION(2,26,0) - g_object_notify ((GObject *) self, "last-message"); -#else g_object_notify_by_pspec ((GObject *) self, pspec_last_message); -#endif } GST_OBJECT_LOCK (self); diff --git a/gst/inter/gstintertest.c b/gst/inter/gstintertest.c index ee396f6..cff4f0d 100644 --- a/gst/inter/gstintertest.c +++ b/gst/inter/gstintertest.c @@ -80,11 +80,6 @@ main (int argc, char *argv[]) GstInterTest *intertest2; GMainLoop *main_loop; -#if !GLIB_CHECK_VERSION (2, 31, 0) - if (!g_thread_supported ()) - g_thread_init (NULL); -#endif - context = g_option_context_new ("- Internal src/sink test"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); g_option_context_add_group (context, gst_init_get_option_group ()); diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c index af7fbbb..f060cde 100644 --- a/gst/liveadder/liveadder.c +++ b/gst/liveadder/liveadder.c @@ -1354,11 +1354,7 @@ gst_live_adder_request_new_pad (GstElement * element, GstPadTemplate * templ, adder = GST_LIVE_ADDER (element); /* increment pad counter */ -#if GLIB_CHECK_VERSION(2,29,5) padcount = g_atomic_int_add (&adder->padcount, 1); -#else - padcount = g_atomic_int_exchange_and_add (&adder->padcount, 1); -#endif name = g_strdup_printf ("sink_%u", padcount); newpad = gst_pad_new_from_template (templ, name); -- 2.7.4