wtay gstreamer: gstreamer/ gstreamer/libs/gst/base/

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Fri Jan 09 2009  15:43:31 UTC

Log message:
* libs/gst/base/gstbasesink.c: (gst_base_sink_commit_state),
(gst_base_sink_wait_clock):
* libs/gst/base/gstbasesink.h:
Fix documentation for the wait_clock method, rename basesink -> sink
for consistency.

Modified files:
    .               : ChangeLog
    libs/gst/base   : gstbasesink.c gstbasesink.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4218&r2=1.4219
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/base/gstbasesink.c.diff?r1=1.226&r2=1.227
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/base/gstbasesink.h.diff?r1=1.53&r2=1.54

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4218
retrieving revision 1.4219
diff -u -d -r1.4218 -r1.4219
--- ChangeLog	8 Jan 2009 13:41:17 -0000	1.4218
+++ ChangeLog	9 Jan 2009 15:43:14 -0000	1.4219
@@ -1,3 +1,11 @@
+2009-01-09  Wim Taymans  <[email protected]>
+
+	* libs/gst/base/gstbasesink.c: (gst_base_sink_commit_state),
+	(gst_base_sink_wait_clock):
+	* libs/gst/base/gstbasesink.h:
+	Fix documentation for the wait_clock method, rename basesink -> sink
+	for consistency.
 2009-01-08  Stefan Kost  <[email protected]>
 
 	* gst/gst.c:
Index: gstbasesink.c
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasesink.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- gstbasesink.c	5 Jan 2009 15:42:53 -0000	1.226
+++ gstbasesink.c	9 Jan 2009 15:43:17 -0000	1.227
@@ -1346,6 +1346,7 @@
       /* make sure we notify the subclass of async playing */
       if (bclass->async_play) {
+        GST_WARNING_OBJECT (basesink, "deprecated async_play");
         ret = bclass->async_play (basesink);
         if (ret == GST_STATE_CHANGE_FAILURE)
           goto async_failed;
@@ -1644,7 +1645,7 @@
  * Returns: #GstClockReturn
  */
 GstClockReturn
-gst_base_sink_wait_clock (GstBaseSink * basesink, GstClockTime time,
+gst_base_sink_wait_clock (GstBaseSink * sink, GstClockTime time,
     GstClockTimeDiff * jitter)
 {
   GstClockID id;
@@ -1654,51 +1655,51 @@
   if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (time)))
     goto invalid_time;
-  GST_OBJECT_LOCK (basesink);
-  if (G_UNLIKELY (!basesink->sync))
+  GST_OBJECT_LOCK (sink);
+  if (G_UNLIKELY (!sink->sync))
     goto no_sync;
-  if (G_UNLIKELY ((clock = GST_ELEMENT_CLOCK (basesink)) == NULL))
+  if (G_UNLIKELY ((clock = GST_ELEMENT_CLOCK (sink)) == NULL))
     goto no_clock;
   /* add base_time to running_time to get the time against the clock */
-  time += GST_ELEMENT_CAST (basesink)->base_time;
+  time += GST_ELEMENT_CAST (sink)->base_time;
   id = gst_clock_new_single_shot_id (clock, time);
-  GST_OBJECT_UNLOCK (basesink);
+  GST_OBJECT_UNLOCK (sink);
   /* A blocking wait is performed on the clock. We save the ClockID
    * so we can unlock the entry at any time. While we are blocking, we 
    * release the PREROLL_LOCK so that other threads can interrupt the
    * entry. */
-  basesink->clock_id = id;
+  sink->clock_id = id;
   /* release the preroll lock while waiting */
-  GST_PAD_PREROLL_UNLOCK (basesink->sinkpad);
+  GST_PAD_PREROLL_UNLOCK (sink->sinkpad);
   ret = gst_clock_id_wait (id, jitter);
-  GST_PAD_PREROLL_LOCK (basesink->sinkpad);
+  GST_PAD_PREROLL_LOCK (sink->sinkpad);
   gst_clock_id_unref (id);
-  basesink->clock_id = NULL;
+  sink->clock_id = NULL;
   return ret;
   /* no syncing needed */
 invalid_time:
   {
-    GST_DEBUG_OBJECT (basesink, "time not valid, no sync needed");
+    GST_DEBUG_OBJECT (sink, "time not valid, no sync needed");
     return GST_CLOCK_BADTIME;
   }
 no_sync:
-    GST_DEBUG_OBJECT (basesink, "sync disabled");
-    GST_OBJECT_UNLOCK (basesink);
+    GST_DEBUG_OBJECT (sink, "sync disabled");
+    GST_OBJECT_UNLOCK (sink);
 no_clock:
-    GST_DEBUG_OBJECT (basesink, "no clock, can't sync");
+    GST_DEBUG_OBJECT (sink, "no clock, can't sync");
 }
Index: gstbasesink.h
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasesink.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- gstbasesink.h	20 Oct 2008 15:18:14 -0000	1.53
+++ gstbasesink.h	9 Jan 2009 15:43:17 -0000	1.54
@@ -227,7 +227,7 @@
 void		gst_base_sink_set_blocksize     (GstBaseSink *sink, guint blocksize);
 guint           gst_base_sink_get_blocksize 	(GstBaseSink *sink);
-GstClockReturn  gst_base_sink_wait_clock        (GstBaseSink * basesink, GstClockTime time,
+GstClockReturn  gst_base_sink_wait_clock        (GstBaseSink *sink, GstClockTime time,
                                                  GstClockTimeDiff * jitter);
 GstFlowReturn   gst_base_sink_wait_eos          (GstBaseSink *sink, GstClockTime time,
                                                  GstClockTimeDiff *jitter);

------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB