summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-12-17 22:35:25 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-12-17 22:35:25 +0000
commitc231ca28a832061bdeb78175127a7c6995018f34 (patch)
tree59722a447041a7a3d05023881a6b668562d97603
parent79b91f8327fb9edea4b3300b3db7cf0858c3c0fb (diff)
Remove need for calling set_active(FALSE)+set_active(TRUE) before calling handle_discont(). I didn't really understan...CAPS-MERGE-3
Original commit message from CVS: Remove need for calling set_active(FALSE)+set_active(TRUE) before calling handle_discont(). I didn't really understand this part but I'm assuming that "hey, it works!" is good enough this time...
-rw-r--r--gst/gstclock.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/gst/gstclock.c b/gst/gstclock.c
index 20b6daf19..180c7526d 100644
--- a/gst/gstclock.c
+++ b/gst/gstclock.c
@@ -600,6 +600,7 @@ gboolean
gst_clock_handle_discont (GstClock *clock, guint64 time)
{
GstClockTime itime = G_GINT64_CONSTANT (0);
+ GstClockClass *cclass = GST_CLOCK_GET_CLASS (clock);;
GST_CAT_DEBUG (GST_CAT_CLOCK, "clock discont %" G_GUINT64_FORMAT
" %" G_GUINT64_FORMAT " %d",
@@ -609,21 +610,8 @@ gst_clock_handle_discont (GstClock *clock, guint64 time)
return TRUE;
GST_LOCK (clock);
- if (clock->accept_discont) {
- GstClockClass *cclass;
-
- cclass = GST_CLOCK_GET_CLASS (clock);
-
- if (cclass->get_internal_time) {
- itime = cclass->get_internal_time (clock);
- }
- }
- else {
- GST_UNLOCK (clock);
- GST_CAT_DEBUG (GST_CAT_CLOCK, "clock discont refused %" G_GUINT64_FORMAT
- " %" G_GUINT64_FORMAT,
- time, clock->start_time);
- return FALSE;
+ if (cclass->get_internal_time) {
+ itime = cclass->get_internal_time (clock);
}
clock->start_time = itime - time;