--- a/gstreamer_core/libs/gst/base/gstbasesink.h Tue Aug 31 15:30:33 2010 +0300
+++ b/gstreamer_core/libs/gst/base/gstbasesink.h Wed Sep 01 12:16:41 2010 +0100
@@ -91,11 +91,10 @@
/*< private >*/
union {
struct {
- /* segment used for clipping incoming buffers */
+ /* segment used for clipping incomming buffers */
GstSegment *clip_segment;
/* max amount of time a buffer can be late, -1 no limit. */
gint64 max_lateness;
- gboolean running;
} ABI;
gpointer _gst_reserved[GST_PADDING_LARGE - 1];
} abidata;
@@ -121,8 +120,6 @@
* @preroll: Called to present the preroll buffer if desired
* @render: Called when a buffer should be presented or output, at the
* correct moment if the #GstBaseSink has been set to sync to the clock.
- * @render_list: Same as @render but used whith buffer lists instead of
- * buffers. Since: 0.10.24
* @async_play: Subclasses should override this when they need to perform
* special processing when changing to the PLAYING state asynchronously.
* Called with the OBJECT_LOCK held.
@@ -182,13 +179,10 @@
/* Clear a previously indicated unlock request not that unlocking is
* complete. Sub-classes should clear any command queue or indicator they
* set during unlock */
- gboolean (*unlock_stop) (GstBaseSink *sink);
-
- /* Render a BufferList */
- GstFlowReturn (*render_list) (GstBaseSink *sink, GstBufferList *buffer_list);
+ gboolean (*unlock_stop) (GstBaseSink *sink);
/*< private >*/
- gpointer _gst_reserved[GST_PADDING_LARGE-5];
+ gpointer _gst_reserved[GST_PADDING_LARGE-4];
};
#ifdef __SYMBIAN32__
IMPORT_C
@@ -201,11 +195,6 @@
#endif
-GstFlowReturn gst_base_sink_do_preroll (GstBaseSink *sink, GstMiniObject *obj);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
GstFlowReturn gst_base_sink_wait_preroll (GstBaseSink *sink);
/* synchronizing against the clock */
@@ -287,40 +276,10 @@
#endif
GstClockTime gst_base_sink_get_latency (GstBaseSink *sink);
-
-/* render delay */
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void gst_base_sink_set_render_delay (GstBaseSink *sink, GstClockTime delay);
#ifdef __SYMBIAN32__
IMPORT_C
#endif
-GstClockTime gst_base_sink_get_render_delay (GstBaseSink *sink);
-
-/* blocksize */
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-void gst_base_sink_set_blocksize (GstBaseSink *sink, guint blocksize);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-guint gst_base_sink_get_blocksize (GstBaseSink *sink);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
-
-GstClockReturn gst_base_sink_wait_clock (GstBaseSink *sink, GstClockTime time,
- GstClockTimeDiff * jitter);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
GstFlowReturn gst_base_sink_wait_eos (GstBaseSink *sink, GstClockTime time,
GstClockTimeDiff *jitter);