summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2015-04-28 16:02:27 +0100
committerTim-Philipp Müller <tim@centricular.com>2015-04-28 16:02:27 +0100
commitf0a9c246a37eaf7ba67338f5362ceddf9a74676d (patch)
tree6bfffa3554ab8e8d1b4022884e522fc273dff034 /gst
parentda113b5ad7976c001633c7f79a2b8b95935f8176 (diff)
downloadgstreamer-plugins-bad-f0a9c246a37eaf7ba67338f5362ceddf9a74676d.tar.gz
gst: remove some unnecessary glib version checks
We require 2.32, no need to check for anything older than that.
Diffstat (limited to 'gst')
-rw-r--r--gst/debugutils/fpsdisplaysink.c8
-rw-r--r--gst/inter/gstintertest.c5
-rw-r--r--gst/liveadder/liveadder.c4
3 files changed, 0 insertions, 17 deletions
diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c
index 1970baf4b..a2ee5832f 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 ee396f6c5..cff4f0dbd 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 af7fbbb96..f060cde99 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);