summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-04-15 17:44:17 +0200
committerDave Robillard <dave@drobilla.net>2009-05-03 12:03:15 -0400
commit3463df485087223a0f6ac672dd430a98d96bf60a (patch)
tree890d10f2088c2e603ea00401013c6ee545f024fc /gst
parent3be7adf505349e4b375425daf007cab8076b95e5 (diff)
downloadgst-plugins-bad-3463df485087223a0f6ac672dd430a98d96bf60a.tar.gz
gst-plugins-bad-3463df485087223a0f6ac672dd430a98d96bf60a.tar.bz2
gst-plugins-bad-3463df485087223a0f6ac672dd430a98d96bf60a.zip
rtpbin: we should not provide a clock
There is no need to provide a clock.
Diffstat (limited to 'gst')
-rw-r--r--gst/rtpmanager/gstrtpbin.c15
-rw-r--r--gst/rtpmanager/gstrtpbin.h2
2 files changed, 0 insertions, 17 deletions
diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c
index 4322ee00..7d3b9823 100644
--- a/gst/rtpmanager/gstrtpbin.c
+++ b/gst/rtpmanager/gstrtpbin.c
@@ -1156,7 +1156,6 @@ static void gst_rtp_bin_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
/* GstElement vmethods */
-static GstClock *gst_rtp_bin_provide_clock (GstElement * element);
static GstStateChangeReturn gst_rtp_bin_change_state (GstElement * element,
GstStateChange transition);
static GstPad *gst_rtp_bin_request_new_pad (GstElement * element,
@@ -1438,8 +1437,6 @@ gst_rtp_bin_class_init (GstRtpBinClass * klass)
"Send an event downstream when a packet is lost", DEFAULT_DO_LOST,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- gstelement_class->provide_clock =
- GST_DEBUG_FUNCPTR (gst_rtp_bin_provide_clock);
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_rtp_bin_change_state);
gstelement_class->request_new_pad =
GST_DEBUG_FUNCPTR (gst_rtp_bin_request_new_pad);
@@ -1463,7 +1460,6 @@ gst_rtp_bin_init (GstRtpBin * rtpbin, GstRtpBinClass * klass)
rtpbin->priv = GST_RTP_BIN_GET_PRIVATE (rtpbin);
rtpbin->priv->bin_lock = g_mutex_new ();
rtpbin->priv->dyn_lock = g_mutex_new ();
- rtpbin->provided_clock = gst_system_clock_obtain ();
rtpbin->latency = DEFAULT_LATENCY_MS;
rtpbin->do_lost = DEFAULT_DO_LOST;
@@ -1509,7 +1505,6 @@ gst_rtp_bin_finalize (GObject * object)
g_mutex_free (rtpbin->priv->bin_lock);
g_mutex_free (rtpbin->priv->dyn_lock);
- gst_object_unref (rtpbin->provided_clock);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -1695,16 +1690,6 @@ gst_rtp_bin_get_property (GObject * object, guint prop_id,
}
}
-static GstClock *
-gst_rtp_bin_provide_clock (GstElement * element)
-{
- GstRtpBin *rtpbin;
-
- rtpbin = GST_RTP_BIN (element);
-
- return GST_CLOCK_CAST (gst_object_ref (rtpbin->provided_clock));
-}
-
static void
gst_rtp_bin_handle_message (GstBin * bin, GstMessage * message)
{
diff --git a/gst/rtpmanager/gstrtpbin.h b/gst/rtpmanager/gstrtpbin.h
index a984d4da..f47048e5 100644
--- a/gst/rtpmanager/gstrtpbin.h
+++ b/gst/rtpmanager/gstrtpbin.h
@@ -48,8 +48,6 @@ struct _GstRtpBin {
gboolean do_lost;
/* a list of session */
GSList *sessions;
- /* clock we provide */
- GstClock *provided_clock;
/* a list of clients, these are streams with the same CNAME */
GSList *clients;