multiqueue: small cleanups

Remove unused variable to avoid confusion
Fix some typo
This commit is contained in:
Wim Taymans 2009-10-22 15:21:39 +01:00 committed by Wim Taymans
parent 6082b0bc89
commit c6b0d4a43d

View file

@ -148,7 +148,6 @@ struct _GstSingleQueue
GstDataQueueSize max_size, extra_size; GstDataQueueSize max_size, extra_size;
GstClockTime cur_time; GstClockTime cur_time;
gboolean is_eos; gboolean is_eos;
gboolean inextra; /* TRUE if the queue is currently in extradata mode */
/* Protected by global lock */ /* Protected by global lock */
guint32 nextid; /* ID of the next object waiting to be pushed */ guint32 nextid; /* ID of the next object waiting to be pushed */
@ -617,7 +616,6 @@ gst_single_queue_flush (GstMultiQueue * mq, GstSingleQueue * sq, gboolean flush)
sq->cur_time = 0; sq->cur_time = 0;
sq->max_size.visible = mq->max_size.visible; sq->max_size.visible = mq->max_size.visible;
sq->is_eos = FALSE; sq->is_eos = FALSE;
sq->inextra = FALSE;
sq->nextid = 0; sq->nextid = 0;
sq->oldid = 0; sq->oldid = 0;
gst_data_queue_set_flushing (sq->queue, FALSE); gst_data_queue_set_flushing (sq->queue, FALSE);
@ -775,7 +773,7 @@ gst_single_queue_push_one (GstMultiQueue * mq, GstSingleQueue * sq,
"SingleQueue %d : Pushing buffer %p with ts %" GST_TIME_FORMAT, "SingleQueue %d : Pushing buffer %p with ts %" GST_TIME_FORMAT,
sq->id, buffer, GST_TIME_ARGS (timestamp)); sq->id, buffer, GST_TIME_ARGS (timestamp));
/* Set caps on pad before pushing, this avoids core calling the accpetcaps /* Set caps on pad before pushing, this avoids core calling the acceptcaps
* function on the srcpad, which will call acceptcaps upstream, which might * function on the srcpad, which will call acceptcaps upstream, which might
* not accept these caps (anymore). */ * not accept these caps (anymore). */
if (caps && caps != GST_PAD_CAPS (sq->srcpad)) if (caps && caps != GST_PAD_CAPS (sq->srcpad))