Commit 7ab1d62c authored by Wim Taymans's avatar Wim Taymans

GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING

parent 9f207791
......@@ -302,7 +302,7 @@ do_stop (GstBufferPool * pool)
* @active: the new active state
*
* Control the active state of @pool. When the pool is active, new calls to
* gst_buffer_pool_acquire_buffer() will return with GST_FLOW_WRONG_STATE.
* gst_buffer_pool_acquire_buffer() will return with GST_FLOW_FLUSHING.
*
* Activating the bufferpool will preallocate all resources in the pool based on
* the configuration of the pool.
......@@ -830,7 +830,7 @@ default_acquire_buffer (GstBufferPool * pool, GstBuffer ** buffer,
flushing:
{
GST_DEBUG_OBJECT (pool, "we are flushing");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
}
......@@ -887,7 +887,7 @@ default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer,
*
* @params can be NULL or contain optional parameters to influence the allocation.
*
* Returns: a #GstFlowReturn such as GST_FLOW_WRONG_STATE when the pool is
* Returns: a #GstFlowReturn such as GST_FLOW_FLUSHING when the pool is
* inactive.
*/
GstFlowReturn
......
......@@ -274,7 +274,7 @@ typedef enum {
* Elements unblock any waits on devices
* </para></listitem>
* <listitem><para>
* Chain or get_range functions return %GST_FLOW_WRONG_STATE.
* Chain or get_range functions return %GST_FLOW_FLUSHING.
* </para></listitem>
* <listitem><para>
* The element pads are deactivated so that streaming becomes impossible and
......
......@@ -468,7 +468,7 @@ gst_event_set_seqnum (GstEvent * event, guint32 seqnum)
* upstream and downstream and travels out-of-bounds with the dataflow.
*
* It marks pads as being flushing and will make them return
* #GST_FLOW_WRONG_STATE when used for data flow with gst_pad_push(),
* #GST_FLOW_FLUSHING when used for data flow with gst_pad_push(),
* gst_pad_chain(), gst_pad_alloc_buffer(), gst_pad_get_range() and
* gst_pad_pull_range(). Any event (except a #GST_EVENT_FLUSH_STOP) received
* on a flushing pad will return %FALSE immediately.
......
......@@ -170,7 +170,7 @@ static GstFlowQuarks flow_quarks[] = {
{GST_FLOW_CUSTOM_SUCCESS, "custom-success", 0},
{GST_FLOW_OK, "ok", 0},
{GST_FLOW_NOT_LINKED, "not-linked", 0},
{GST_FLOW_WRONG_STATE, "wrong-state", 0},
{GST_FLOW_FLUSHING, "flushing", 0},
{GST_FLOW_EOS, "eos", 0},
{GST_FLOW_NOT_NEGOTIATED, "not-negotiated", 0},
{GST_FLOW_ERROR, "error", 0},
......@@ -3018,7 +3018,7 @@ again:
flushing:
{
GST_DEBUG_OBJECT (pad, "pad is flushing");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
dropped:
{
......@@ -3364,7 +3364,7 @@ flushing:
GST_OBJECT_UNLOCK (pad);
GST_PAD_STREAM_UNLOCK (pad);
gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
wrong_mode:
{
......@@ -3412,7 +3412,7 @@ no_function:
*
* Chain a buffer to @pad.
*
* The function returns #GST_FLOW_WRONG_STATE if the pad was flushing.
* The function returns #GST_FLOW_FLUSHING if the pad was flushing.
*
* If the buffer type is not acceptable for @pad (as negotiated with a
* preceeding GST_EVENT_CAPS event), this function returns
......@@ -3476,7 +3476,7 @@ gst_pad_chain_list_default (GstPad * pad, GstObject * parent,
*
* Chain a bufferlist to @pad.
*
* The function returns #GST_FLOW_WRONG_STATE if the pad was flushing.
* The function returns #GST_FLOW_FLUSHING if the pad was flushing.
*
* If @pad was not negotiated properly with a CAPS event, this function
* returns #GST_FLOW_NOT_NEGOTIATED.
......@@ -3567,7 +3567,7 @@ flushing:
"pushing, but pad was flushing");
GST_OBJECT_UNLOCK (pad);
gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
wrong_mode:
{
......@@ -3751,7 +3751,7 @@ flushing:
"getrange, but pad was flushing");
GST_OBJECT_UNLOCK (pad);
GST_PAD_STREAM_UNLOCK (pad);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
wrong_mode:
{
......@@ -3774,7 +3774,7 @@ no_parent:
GST_DEBUG_OBJECT (pad, "no parent");
GST_OBJECT_UNLOCK (pad);
GST_PAD_STREAM_UNLOCK (pad);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
no_function:
{
......@@ -3822,7 +3822,7 @@ get_range_failed:
* @buffer: (out callee-allocates): a pointer to hold the #GstBuffer,
* returns #GST_FLOW_ERROR if %NULL.
*
* When @pad is flushing this function returns #GST_FLOW_WRONG_STATE
* When @pad is flushing this function returns #GST_FLOW_FLUSHING
* immediately and @buffer is %NULL.
*
* Calls the getrange function of @pad, see #GstPadGetRangeFunction for a
......@@ -3932,7 +3932,7 @@ flushing:
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"pullrange, but pad was flushing");
GST_OBJECT_UNLOCK (pad);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
wrong_mode:
{
......@@ -4168,7 +4168,7 @@ flushed:
GST_DEBUG_OBJECT (pad, "We're flushing");
GST_OBJECT_UNLOCK (pad);
gst_event_unref (event);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
probe_stopped:
{
......@@ -4438,7 +4438,7 @@ flushing:
GST_CAT_INFO_OBJECT (GST_CAT_EVENT, pad,
"Received event on flushing pad. Discarding");
gst_event_unref (event);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
probe_stopped:
{
......@@ -4475,7 +4475,7 @@ no_parent:
if (need_unlock)
GST_PAD_STREAM_UNLOCK (pad);
gst_event_unref (event);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
precheck_failed:
{
......
......@@ -127,7 +127,7 @@ typedef enum {
* GstFlowReturn:
* @GST_FLOW_OK: Data passing was ok.
* @GST_FLOW_NOT_LINKED: Pad is not linked.
* @GST_FLOW_WRONG_STATE: Pad is in wrong state.
* @GST_FLOW_FLUSHING: Pad is flushing.
* @GST_FLOW_EOS: Pad is EOS.
* @GST_FLOW_NOT_NEGOTIATED: Pad is not negotiated.
* @GST_FLOW_ERROR: Some (fatal) error occured. Element generating
......@@ -165,7 +165,7 @@ typedef enum {
GST_FLOW_OK = 0,
/* expected failures */
GST_FLOW_NOT_LINKED = -1,
GST_FLOW_WRONG_STATE = -2,
GST_FLOW_FLUSHING = -2,
/* error cases */
GST_FLOW_EOS = -3,
GST_FLOW_NOT_NEGOTIATED = -4,
......
......@@ -2061,7 +2061,7 @@ no_clock:
* This function will block until a state change to PLAYING happens (in which
* case this function returns #GST_FLOW_OK) or the processing must be stopped due
* to a state change to READY or a FLUSH event (in which case this function
* returns #GST_FLOW_WRONG_STATE).
* returns #GST_FLOW_FLUSHING).
*
* This function should only be called with the PREROLL_LOCK held, like in the
* render function.
......@@ -2091,7 +2091,7 @@ gst_base_sink_wait_preroll (GstBaseSink * sink)
stopping:
{
GST_DEBUG_OBJECT (sink, "preroll interrupted because of flush");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
step_unlocked:
{
......@@ -2181,7 +2181,7 @@ preroll_canceled:
stopping:
{
GST_DEBUG_OBJECT (sink, "stopping while commiting state");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
preroll_failed:
{
......@@ -2262,7 +2262,7 @@ gst_base_sink_wait_eos (GstBaseSink * sink, GstClockTime time,
flushing:
{
GST_DEBUG_OBJECT (sink, "we are flushing");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
}
......@@ -2442,7 +2442,7 @@ qos_dropped:
flushing:
{
GST_DEBUG_OBJECT (basesink, "we are flushing");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
preroll_failed:
{
......@@ -3203,7 +3203,7 @@ flushing:
{
GST_DEBUG_OBJECT (basesink, "sink is flushing");
gst_mini_object_unref (GST_MINI_OBJECT_CAST (obj));
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
was_eos:
{
......
......@@ -438,7 +438,7 @@ gst_base_src_init (GstBaseSrc * basesrc, gpointer g_class)
basesrc->priv->do_timestamp = DEFAULT_DO_TIMESTAMP;
g_atomic_int_set (&basesrc->priv->have_events, FALSE);
basesrc->priv->start_result = GST_FLOW_WRONG_STATE;
basesrc->priv->start_result = GST_FLOW_FLUSHING;
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_FLAG_STARTED);
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_FLAG_STARTING);
GST_OBJECT_FLAG_SET (basesrc, GST_ELEMENT_FLAG_SOURCE);
......@@ -480,7 +480,7 @@ gst_base_src_finalize (GObject * object)
* This function will block until a state change to PLAYING happens (in which
* case this function returns #GST_FLOW_OK) or the processing must be stopped due
* to a state change to READY or a FLUSH event (in which case this function
* returns #GST_FLOW_WRONG_STATE).
* returns #GST_FLOW_FLUSHING).
*
* Since: 0.10.12
*
......@@ -507,7 +507,7 @@ gst_base_src_wait_playing (GstBaseSrc * src)
flushing:
{
GST_DEBUG_OBJECT (src, "we are flushing");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
}
......@@ -2334,7 +2334,7 @@ again:
* get rid of the produced buffer. */
GST_DEBUG_OBJECT (src,
"clock was unscheduled (%d), returning WRONG_STATE", status);
ret = GST_FLOW_WRONG_STATE;
ret = GST_FLOW_FLUSHING;
} else {
/* If we are running when this happens, we quickly switched between
* pause and playing. We try to produce a new buffer */
......@@ -2371,7 +2371,7 @@ not_ok:
not_started:
{
GST_DEBUG_OBJECT (src, "getrange but not started");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
no_function:
{
......@@ -2394,7 +2394,7 @@ flushing:
GST_DEBUG_OBJECT (src, "we are flushing");
gst_buffer_unref (*buf);
*buf = NULL;
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
eos:
{
......@@ -2427,7 +2427,7 @@ done:
flushing:
{
GST_DEBUG_OBJECT (src, "we are flushing");
res = GST_FLOW_WRONG_STATE;
res = GST_FLOW_FLUSHING;
goto done;
}
}
......@@ -2642,7 +2642,7 @@ flushing:
{
GST_DEBUG_OBJECT (src, "we are flushing");
GST_LIVE_UNLOCK (src);
ret = GST_FLOW_WRONG_STATE;
ret = GST_FLOW_FLUSHING;
goto pause;
}
pause:
......@@ -2942,7 +2942,7 @@ gst_base_src_start (GstBaseSrc * basesrc)
if (GST_BASE_SRC_IS_STARTED (basesrc))
goto was_started;
basesrc->priv->start_result = GST_FLOW_WRONG_STATE;
basesrc->priv->start_result = GST_FLOW_FLUSHING;
GST_OBJECT_FLAG_SET (basesrc, GST_BASE_SRC_FLAG_STARTING);
basesrc->num_buffers_left = basesrc->num_buffers;
basesrc->running = FALSE;
......@@ -3148,7 +3148,7 @@ flushing:
{
GST_DEBUG_OBJECT (basesrc, "we are flushing");
GST_LIVE_UNLOCK (basesrc);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
}
......@@ -3171,7 +3171,7 @@ gst_base_src_stop (GstBaseSrc * basesrc)
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_FLAG_STARTING);
GST_OBJECT_FLAG_UNSET (basesrc, GST_BASE_SRC_FLAG_STARTED);
basesrc->priv->start_result = GST_FLOW_WRONG_STATE;
basesrc->priv->start_result = GST_FLOW_FLUSHING;
GST_LIVE_SIGNAL (basesrc);
GST_LIVE_UNLOCK (basesrc);
......
......@@ -138,8 +138,8 @@ struct _GstBaseSrc {
* @do_seek: Perform seeking on the resource to the indicated segment.
* @unlock: Unlock any pending access to the resource. Subclasses should
* unblock any blocked function ASAP. In particular, any create() function in
* progress should be unblocked and should return GST_FLOW_WRONG_STATE. Any
* future @create<!-- -->() function call should also return GST_FLOW_WRONG_STATE
* progress should be unblocked and should return GST_FLOW_FLUSHING. Any
* future @create<!-- -->() function call should also return GST_FLOW_FLUSHING
* until the @unlock_stop<!-- -->() function has been called.
* @unlock_stop: Clear the previous unlock request. Subclasses should clear
* any state they set during unlock(), such as clearing command queues.
......
......@@ -2001,14 +2001,14 @@ not_started:
{
GST_DEBUG ("not started");
gst_collect_pads2_clear (pads, data);
ret = GST_FLOW_WRONG_STATE;
ret = GST_FLOW_FLUSHING;
goto unlock_done;
}
flushing:
{
GST_DEBUG ("pad %s:%s is flushing", GST_DEBUG_PAD_NAME (pad));
gst_collect_pads2_clear (pads, data);
ret = GST_FLOW_WRONG_STATE;
ret = GST_FLOW_FLUSHING;
goto unlock_done;
}
eos:
......
......@@ -299,7 +299,7 @@ stopped:
{
GST_DEBUG_OBJECT (fdsink, "Select stopped");
gst_buffer_unmap (buffer, &info);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
#endif
......
......@@ -484,7 +484,7 @@ poll_error:
stopped:
{
GST_DEBUG_OBJECT (psrc, "Poll stopped");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
#endif
alloc_failed:
......
......@@ -721,7 +721,7 @@ flushing:
GST_DEBUG_OBJECT (pad, "We are flushing, discard buffer %p", buf);
GST_INPUT_SELECTOR_UNLOCK (sel);
gst_buffer_unref (buf);
res = GST_FLOW_WRONG_STATE;
res = GST_FLOW_FLUSHING;
goto done;
}
}
......
......@@ -740,7 +740,7 @@ gst_single_queue_flush (GstMultiQueue * mq, GstSingleQueue * sq, gboolean flush)
sq->id);
if (flush) {
sq->srcresult = GST_FLOW_WRONG_STATE;
sq->srcresult = GST_FLOW_FLUSHING;
gst_data_queue_set_flushing (sq->queue, TRUE);
sq->flushing = TRUE;
......@@ -1397,7 +1397,7 @@ gst_multi_queue_sink_activate_mode (GstPad * pad, GstObject * parent,
/* All pads start off linked until they push one buffer */
sq->srcresult = GST_FLOW_OK;
} else {
sq->srcresult = GST_FLOW_WRONG_STATE;
sq->srcresult = GST_FLOW_FLUSHING;
gst_data_queue_flush (sq->queue);
}
res = TRUE;
......@@ -1885,7 +1885,7 @@ gst_single_queue_new (GstMultiQueue * mqueue, guint id)
GST_DEBUG_OBJECT (mqueue, "Creating GstSingleQueue id:%d", sq->id);
sq->mqueue = mqueue;
sq->srcresult = GST_FLOW_WRONG_STATE;
sq->srcresult = GST_FLOW_FLUSHING;
sq->queue = gst_data_queue_new_full ((GstDataQueueCheckFullFunction)
single_queue_check_full,
(GstDataQueueFullCallback) single_queue_overrun_cb,
......
......@@ -420,7 +420,7 @@ gst_queue_init (GstQueue * queue)
queue->head_needs_discont = queue->tail_needs_discont = FALSE;
queue->leaky = GST_QUEUE_NO_LEAK;
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
g_mutex_init (&queue->qlock);
g_cond_init (&queue->item_add);
......@@ -749,7 +749,7 @@ gst_queue_handle_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* now unblock the chain function */
GST_QUEUE_MUTEX_LOCK (queue);
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
/* unblock the loop and chain functions */
GST_QUEUE_SIGNAL_ADD (queue);
GST_QUEUE_SIGNAL_DEL (queue);
......@@ -1131,7 +1131,7 @@ no_item:
out_flushing:
{
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "exit because we are flushing");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
}
......@@ -1305,7 +1305,7 @@ gst_queue_sink_activate_mode (GstPad * pad, GstObject * parent, GstPadMode mode,
} else {
/* step 1, unblock chain function */
GST_QUEUE_MUTEX_LOCK (queue);
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
gst_queue_locked_flush (queue);
GST_QUEUE_MUTEX_UNLOCK (queue);
}
......@@ -1346,7 +1346,7 @@ gst_queue_src_activate_mode (GstPad * pad, GstObject * parent, GstPadMode mode,
} else {
/* step 1, unblock loop function */
GST_QUEUE_MUTEX_LOCK (queue);
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
/* the item add signal will unblock */
g_cond_signal (&queue->item_add);
GST_QUEUE_MUTEX_UNLOCK (queue);
......
......@@ -434,8 +434,8 @@ gst_queue2_init (GstQueue2 * queue)
queue->sink_tainted = TRUE;
queue->src_tainted = TRUE;
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
queue->sinkresult = GST_FLOW_FLUSHING;
queue->is_eos = FALSE;
queue->in_timer = g_timer_new ();
queue->out_timer = g_timer_new ();
......@@ -1298,7 +1298,7 @@ out_flushing:
GST_DEBUG_OBJECT (queue, "we are flushing");
gst_buffer_unmap (buf, &info);
gst_buffer_unref (buf);
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
read_error:
{
......@@ -2085,8 +2085,8 @@ gst_queue2_handle_sink_event (GstPad * pad, GstObject * parent,
/* now unblock the chain function */
GST_QUEUE2_MUTEX_LOCK (queue);
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
queue->sinkresult = GST_FLOW_FLUSHING;
/* unblock the loop and chain functions */
GST_QUEUE2_SIGNAL_ADD (queue);
GST_QUEUE2_SIGNAL_DEL (queue);
......@@ -2099,7 +2099,7 @@ gst_queue2_handle_sink_event (GstPad * pad, GstObject * parent,
} else {
GST_QUEUE2_MUTEX_LOCK (queue);
/* flush the sink pad */
queue->sinkresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_FLUSHING;
GST_QUEUE2_SIGNAL_DEL (queue);
GST_QUEUE2_MUTEX_UNLOCK (queue);
......@@ -2480,7 +2480,7 @@ no_item:
out_flushing:
{
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "exit because we are flushing");
return GST_FLOW_WRONG_STATE;
return GST_FLOW_FLUSHING;
}
}
......@@ -2570,7 +2570,7 @@ gst_queue2_handle_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* now unblock the getrange function */
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "flushing");
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
GST_QUEUE2_SIGNAL_ADD (queue);
GST_QUEUE2_MUTEX_UNLOCK (queue);
......@@ -2913,8 +2913,8 @@ gst_queue2_sink_activate_mode (GstPad * pad, GstObject * parent,
/* unblock chain function */
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "deactivating push mode");
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
queue->sinkresult = GST_FLOW_FLUSHING;
gst_queue2_locked_flush (queue);
GST_QUEUE2_MUTEX_UNLOCK (queue);
}
......@@ -2950,8 +2950,8 @@ gst_queue2_src_activate_push (GstPad * pad, GstObject * parent, gboolean active)
/* unblock loop function */
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "deactivating push mode");
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
queue->sinkresult = GST_FLOW_FLUSHING;
/* the item add signal will unblock */
GST_QUEUE2_SIGNAL_ADD (queue);
GST_QUEUE2_MUTEX_UNLOCK (queue);
......@@ -2996,16 +2996,16 @@ gst_queue2_src_activate_pull (GstPad * pad, GstObject * parent, gboolean active)
GST_DEBUG_OBJECT (queue, "no temp file, cannot activate pull mode");
/* this is not allowed, we cannot operate in pull mode without a temp
* file. */
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
queue->sinkresult = GST_FLOW_FLUSHING;
result = FALSE;
}
GST_QUEUE2_MUTEX_UNLOCK (queue);
} else {
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "deactivating pull mode");
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE;
queue->srcresult = GST_FLOW_FLUSHING;
queue->sinkresult = GST_FLOW_FLUSHING;
/* this will unlock getrange */
GST_QUEUE2_SIGNAL_ADD (queue);
result = TRUE;
......
......@@ -343,7 +343,7 @@ GST_START_TEST (test_preroll_sync)
/* should be wrong state now */
fret = chain_async_return (data);
fail_if (fret != GST_FLOW_WRONG_STATE);
fail_if (fret != GST_FLOW_FLUSHING);
}
gst_element_set_state (pipeline, GST_STATE_NULL);
gst_element_get_state (pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
......@@ -696,7 +696,7 @@ GST_START_TEST (test_position)
/* preroll buffer is flushed out */
fret = chain_async_return (data);
fail_unless (fret == GST_FLOW_WRONG_STATE);
fail_unless (fret == GST_FLOW_FLUSHING);
/* do position query, this should succeed with the time value from the
* segment before the flush. */
......
......@@ -511,19 +511,19 @@ GST_START_TEST (test_flow_aggregation)
GST_DEBUG ("Trying to push with mysink2 disabled");
gst_pad_set_active (mysink2, FALSE);
fail_unless (gst_pad_push (mysrc,
gst_buffer_ref (buffer)) == GST_FLOW_WRONG_STATE);
gst_buffer_ref (buffer)) == GST_FLOW_FLUSHING);
GST_DEBUG ("Trying to push with mysink2 disabled");
gst_pad_set_active (mysink1, FALSE);
gst_pad_set_active (mysink2, TRUE);
gst_pad_set_caps (mysink2, caps);
fail_unless (gst_pad_push (mysrc,
gst_buffer_ref (buffer)) == GST_FLOW_WRONG_STATE);
gst_buffer_ref (buffer)) == GST_FLOW_FLUSHING);
GST_DEBUG ("Trying to push with mysink2 and mysink1 disabled");
gst_pad_set_active (mysink2, FALSE);
fail_unless (gst_pad_push (mysrc,
gst_buffer_ref (buffer)) == GST_FLOW_WRONG_STATE);
gst_buffer_ref (buffer)) == GST_FLOW_FLUSHING);
/* Test if everything still works in normal state */
GST_DEBUG ("Reactivate both pads and try pushing");
......
......@@ -488,7 +488,7 @@ GST_START_TEST (test_push_unlinked)
GST_DEBUG ("push buffer inactive");
buffer = gst_buffer_new ();
gst_buffer_ref (buffer);
fail_unless (gst_pad_push (src, buffer) == GST_FLOW_WRONG_STATE);
fail_unless (gst_pad_push (src, buffer) == GST_FLOW_FLUSHING);
ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 1);
gst_buffer_unref (buffer);
......@@ -672,7 +672,7 @@ GST_START_TEST (test_push_linked_flushing)
/* pushing on a flushing pad will drop the buffer */
buffer = gst_buffer_new ();
gst_buffer_ref (buffer);
fail_unless (gst_pad_push (src, buffer) == GST_FLOW_WRONG_STATE);
fail_unless (gst_pad_push (src, buffer) == GST_FLOW_FLUSHING);
ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 1);
fail_unless_equals_int (g_list_length (buffers), 0);
gst_buffer_unref (buffer);
......@@ -698,7 +698,7 @@ GST_START_TEST (test_push_linked_flushing)
GINT_TO_POINTER (1), NULL);
buffer = gst_buffer_new ();
gst_buffer_ref (buffer);
fail_unless (gst_pad_push (src, buffer) == GST_FLOW_WRONG_STATE);
fail_unless (gst_pad_push (src, buffer) == GST_FLOW_FLUSHING);
ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 1);
fail_unless_equals_int (g_list_length (buffers), 0);
gst_buffer_unref (buffer);
......@@ -1053,7 +1053,7 @@ test_pad_blocking_with_type (GstPadProbeType type)
/* unflush now */
gst_pad_push_event (pad, gst_event_new_flush_stop (FALSE));
/* must be wrong state */
fail_unless (ret == GST_FLOW_WRONG_STATE);
fail_unless (ret == GST_FLOW_FLUSHING);
gst_object_unref (pad);
}
......
......@@ -19,6 +19,12 @@
/* gettext package name */
#define GETTEXT_PACKAGE "gstreamer-0.11"
/* The GIO library directory. */
#undef GIO_LIBDIR
/* The GIO modules directory. */
#undef GIO_MODULE_DIR
/* data dir */
#define GST_DATADIR PREFIX "\\share"
......@@ -56,7 +62,7 @@
#define GST_PACKAGE_ORIGIN "Unknown package origin"
/* GStreamer package release date/time for plugins as YYYY-MM-DD */
#define GST_PACKAGE_RELEASE_DATETIME "2011-09-29T14:59Z"
#define GST_PACKAGE_RELEASE_DATETIME "2012-02-08T13:54Z"
/* location of the installed gst-plugin-scanner */
#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner"
......@@ -163,15 +169,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL
/* Define to 1 if you have the `resolv' library (-lresolv). */
#undef HAVE_LIBRESOLV
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R