summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@collabora.com>2013-05-05 11:24:45 +0100
committerThibault Saunier <thibault.saunier@collabora.com>2013-05-16 00:22:38 -0400
commit3627065c8ec01fa744bec3187423344c2179fac3 (patch)
tree62bbe38d7d740642e25e4fcdea6aaa3da0e9c723
parent126e24d46646fb7da0b9731fd1ae9e54c1178d84 (diff)
Remove useless GLib version checks
-rw-r--r--gnl/gnlcomposition.c28
-rw-r--r--gnl/gnlobject.c12
2 files changed, 0 insertions, 40 deletions
diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c
index 55d1285..3a73b63 100644
--- a/gnl/gnlcomposition.c
+++ b/gnl/gnlcomposition.c
@@ -1847,33 +1847,21 @@ update_start_stop_duration (GnlComposition * comp)
if (cobj->start) {
cobj->start = 0;
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (cobj),
gnlobject_properties[GNLOBJECT_PROP_START]);
-#else
- g_object_notify (G_OBJECT (cobj), "start");
-#endif
}
if (cobj->duration) {
cobj->duration = 0;
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (cobj),
gnlobject_properties[GNLOBJECT_PROP_DURATION]);
-#else
- g_object_notify (G_OBJECT (cobj), "duration");
-#endif
signal_duration_change (comp);
}
if (cobj->stop) {
cobj->stop = 0;
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (cobj),
gnlobject_properties[GNLOBJECT_PROP_STOP]);
-#else
- g_object_notify (G_OBJECT (cobj), "stop");
-#endif
}
return;
@@ -1886,12 +1874,8 @@ update_start_stop_duration (GnlComposition * comp)
if (cobj->start != 0) {
cobj->start = 0;
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (cobj),
gnlobject_properties[GNLOBJECT_PROP_START]);
-#else
- g_object_notify (G_OBJECT (cobj), "start");
-#endif
}
} else {
@@ -1903,12 +1887,8 @@ update_start_stop_duration (GnlComposition * comp)
GST_LOG_OBJECT (obj, "setting start from %s to %" GST_TIME_FORMAT,
GST_OBJECT_NAME (obj), GST_TIME_ARGS (obj->start));
cobj->start = obj->start;
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (cobj),
gnlobject_properties[GNLOBJECT_PROP_START]);
-#else
- g_object_notify (G_OBJECT (cobj), "start");
-#endif
}
}
@@ -1930,22 +1910,14 @@ update_start_stop_duration (GnlComposition * comp)
priv->segment->stop = obj->stop;
cobj->stop = obj->stop;
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (cobj),
gnlobject_properties[GNLOBJECT_PROP_STOP]);
-#else
- g_object_notify (G_OBJECT (cobj), "stop");
-#endif
}
if ((cobj->stop - cobj->start) != cobj->duration) {
cobj->duration = cobj->stop - cobj->start;
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (cobj),
gnlobject_properties[GNLOBJECT_PROP_DURATION]);
-#else
- g_object_notify (G_OBJECT (cobj), "duration");
-#endif
signal_duration_change (comp);
}
diff --git a/gnl/gnlobject.c b/gnl/gnlobject.c
index 08679e2..2c70a5d 100644
--- a/gnl/gnlobject.c
+++ b/gnl/gnlobject.c
@@ -480,11 +480,7 @@ update_values (GnlObject * object)
"Updating stop value : %" GST_TIME_FORMAT " [start:%" GST_TIME_FORMAT
", duration:%" GST_TIME_FORMAT "]", GST_TIME_ARGS (object->stop),
GST_TIME_ARGS (object->start), GST_TIME_ARGS (object->duration));
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_STOP]);
-#else
- g_object_notify (G_OBJECT (object), "stop");
-#endif
}
/* check if media start/duration has changed */
@@ -497,11 +493,7 @@ update_values (GnlObject * object)
GST_TIME_ARGS (object->media_stop),
GST_TIME_ARGS (object->media_start),
GST_TIME_ARGS (object->media_duration));
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_MEDIA_STOP]);
-#else
- g_object_notify (G_OBJECT (object), "media_stop");
-#endif
}
/* check if rate has changed */
@@ -518,11 +510,7 @@ update_values (GnlObject * object)
GST_TIME_FORMAT "] rate_1:%d", object->rate,
GST_TIME_ARGS (object->media_duration),
GST_TIME_ARGS (object->duration), object->rate_1);
-#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_RATE]);
-#else
- g_object_notify (G_OBJECT (object), "rate");
-#endif
}
}