gst/gstqueue.c: Subtract current queue contents from position queries.

Original commit message from CVS:
* gst/gstqueue.c: (gst_queue_init), (gst_queue_handle_src_query):
Subtract current queue contents from position queries.

diff --git a/ChangeLog b/ChangeLog
index bca1c98..b0729bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * gst/gstqueue.c: (gst_queue_init), (gst_queue_handle_src_query):
+         Subtract current queue contents from position queries.
+
 2004-10-11  Johan Dahlin  <johan@gnome.org>
 
        * gst/gsturi.c (gst_uri_get_location): unescape string

diff --git a/gst/gstqueue.c b/gst/gstqueue.c
index 00d585a..6e54087 100644 (file)
--- a/gst/gstqueue.c
+++ b/gst/gstqueue.c
@@ -116,6 +116,8 @@ static void gst_queue_chain (GstPad * pad, GstData * data);
 static GstData *gst_queue_get (GstPad * pad);
 
 static gboolean gst_queue_handle_src_event (GstPad * pad, GstEvent * event);
+static gboolean gst_queue_handle_src_query (GstPad * pad,
+    GstQueryType type, GstFormat * fmt, gint64 * value);
 
 static GstCaps *gst_queue_getcaps (GstPad * pad);
 static GstPadLinkReturn gst_queue_link (GstPad * pad, const GstCaps * caps);
@@ -301,6 +303,8 @@ gst_queue_init (GstQueue * queue)
       GST_DEBUG_FUNCPTR (gst_queue_getcaps));
   gst_pad_set_event_function (queue->srcpad,
       GST_DEBUG_FUNCPTR (gst_queue_handle_src_event));
+  gst_pad_set_query_function (queue->srcpad,
+      GST_DEBUG_FUNCPTR (gst_queue_handle_src_query));
   gst_pad_set_active (queue->srcpad, TRUE);
 
   queue->cur_level.buffers = 0; /* no content */
@@ -903,6 +907,35 @@ handled:
 }
 
 static gboolean
+gst_queue_handle_src_query (GstPad * pad,
+    GstQueryType type, GstFormat * fmt, gint64 * value)
+{
+  GstQueue *queue = GST_QUEUE (gst_pad_get_parent (pad));
+  gboolean res;
+
+  res = gst_pad_query (GST_PAD_PEER (queue->sinkpad), type, fmt, value);
+  if (!res)
+    return FALSE;
+
+  if (type == GST_QUERY_POSITION) {
+    /* FIXME: this code assumes that there's no discont in the queue */
+    switch (*fmt) {
+      case GST_FORMAT_BYTES:
+        *value -= queue->cur_level.bytes;
+        break;
+      case GST_FORMAT_TIME:
+        *value -= queue->cur_level.time;
+        break;
+      default:
+        /* FIXME */
+        break;
+    }
+  }
+
+  return TRUE;
+}
+
+static gboolean
 gst_queue_release_locks (GstElement * element)
 {
   GstQueue *queue;

diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 00d585a..6e54087 100644 (file)
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -116,6 +116,8 @@ static void gst_queue_chain (GstPad * pad, GstData * data);
 static GstData *gst_queue_get (GstPad * pad);
 
 static gboolean gst_queue_handle_src_event (GstPad * pad, GstEvent * event);
+static gboolean gst_queue_handle_src_query (GstPad * pad,
+    GstQueryType type, GstFormat * fmt, gint64 * value);
 
 static GstCaps *gst_queue_getcaps (GstPad * pad);
 static GstPadLinkReturn gst_queue_link (GstPad * pad, const GstCaps * caps);
@@ -301,6 +303,8 @@ gst_queue_init (GstQueue * queue)
       GST_DEBUG_FUNCPTR (gst_queue_getcaps));
   gst_pad_set_event_function (queue->srcpad,
       GST_DEBUG_FUNCPTR (gst_queue_handle_src_event));
+  gst_pad_set_query_function (queue->srcpad,
+      GST_DEBUG_FUNCPTR (gst_queue_handle_src_query));
   gst_pad_set_active (queue->srcpad, TRUE);
 
   queue->cur_level.buffers = 0; /* no content */
@@ -903,6 +907,35 @@ handled:
 }
 
 static gboolean
+gst_queue_handle_src_query (GstPad * pad,
+    GstQueryType type, GstFormat * fmt, gint64 * value)
+{
+  GstQueue *queue = GST_QUEUE (gst_pad_get_parent (pad));
+  gboolean res;
+
+  res = gst_pad_query (GST_PAD_PEER (queue->sinkpad), type, fmt, value);
+  if (!res)
+    return FALSE;
+
+  if (type == GST_QUERY_POSITION) {
+    /* FIXME: this code assumes that there's no discont in the queue */
+    switch (*fmt) {
+      case GST_FORMAT_BYTES:
+        *value -= queue->cur_level.bytes;
+        break;
+      case GST_FORMAT_TIME:
+        *value -= queue->cur_level.time;
+        break;
+      default:
+        /* FIXME */
+        break;
+    }
+  }
+
+  return TRUE;
+}
+
+static gboolean
 gst_queue_release_locks (GstElement * element)
 {
   GstQueue *queue;