GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING

gst/gstbufferpool.c

@@ -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

gst/gstelement.h

@@ -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

gst/gstevent.c

@@ -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.

gst/gstpad.c

@@ -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:
   {

gst/gstpad.h

@@ -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,

libs/gst/base/gstbasesink.c

@@ -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:
   {

libs/gst/base/gstbasesrc.c

@@ -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);
 

libs/gst/base/gstbasesrc.h

@@ -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
+ *    progress should be unblocked and should return GST_FLOW_FLUSHING. Any
- *    future @create<!-- -->() function call should also return GST_FLOW_WRONG_STATE
+ *    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.

libs/gst/base/gstcollectpads2.c

@@ -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:

plugins/elements/gstfdsink.c

@@ -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
 

plugins/elements/gstfdsrc.c

@@ -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:

plugins/elements/gstinputselector.c

@@ -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;
   }
 }

plugins/elements/gstmultiqueue.c

@@ -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,

plugins/elements/gstqueue.c

@@ -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);

plugins/elements/gstqueue2.c

@@ -434,8 +434,8 @@ gst_queue2_init (GstQueue2 * queue)
   queue->sink_tainted = TRUE;
   queue->src_tainted = TRUE;
 
-  queue->srcresult = GST_FLOW_WRONG_STATE;
+  queue->srcresult = GST_FLOW_FLUSHING;
-  queue->sinkresult = GST_FLOW_WRONG_STATE;
+  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->srcresult = GST_FLOW_FLUSHING;
-        queue->sinkresult = GST_FLOW_WRONG_STATE;
+        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->srcresult = GST_FLOW_FLUSHING;
-        queue->sinkresult = GST_FLOW_WRONG_STATE;
+        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->srcresult = GST_FLOW_FLUSHING;
-    queue->sinkresult = GST_FLOW_WRONG_STATE;
+    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->srcresult = GST_FLOW_FLUSHING;
-      queue->sinkresult = GST_FLOW_WRONG_STATE;
+      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->srcresult = GST_FLOW_FLUSHING;
-    queue->sinkresult = GST_FLOW_WRONG_STATE;
+    queue->sinkresult = GST_FLOW_FLUSHING;
     /* this will unlock getrange */
     GST_QUEUE2_SIGNAL_ADD (queue);
     result = TRUE;

tests/check/elements/fakesink.c

@@ -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. */

tests/check/elements/tee.c

@@ -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");

tests/check/gst/gstpad.c

@@ -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);
 }

win32/common/config.h

@@ -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
 
@@ -244,6 +241,9 @@
 /* Define to 1 if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H
 
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#undef HAVE_SYS_POLL_H
+
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 #undef HAVE_SYS_PRCTL_H
 
@@ -321,9 +321,6 @@
 /* Memory alignment by pagesize */
 #undef MEMORY_ALIGNMENT_PAGESIZE
 
-/* Define if you have no native inet_aton() function. */
-#undef NO_INET_ATON
-
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 

win32/common/gstenumtypes.c

@@ -63,7 +63,6 @@ gst_buffer_flags_get_type (void)
         "droppable"},
     {C_FLAGS (GST_BUFFER_FLAG_DELTA_UNIT), "GST_BUFFER_FLAG_DELTA_UNIT",
         "delta-unit"},
-    {C_FLAGS (GST_BUFFER_FLAG_IN_CAPS), "GST_BUFFER_FLAG_IN_CAPS", "in-caps"},
     {C_FLAGS (GST_BUFFER_FLAG_LAST), "GST_BUFFER_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
@@ -85,6 +84,7 @@ gst_buffer_copy_flags_get_type (void)
     {C_FLAGS (GST_BUFFER_COPY_FLAGS), "GST_BUFFER_COPY_FLAGS", "flags"},
     {C_FLAGS (GST_BUFFER_COPY_TIMESTAMPS), "GST_BUFFER_COPY_TIMESTAMPS",
         "timestamps"},
+    {C_FLAGS (GST_BUFFER_COPY_META), "GST_BUFFER_COPY_META", "meta"},
     {C_FLAGS (GST_BUFFER_COPY_MEMORY), "GST_BUFFER_COPY_MEMORY", "memory"},
     {C_FLAGS (GST_BUFFER_COPY_MERGE), "GST_BUFFER_COPY_MERGE", "merge"},
     {0, NULL, NULL}
@@ -167,7 +167,7 @@ gst_caps_flags_get_type (void)
 {
   static gsize id = 0;
   static const GFlagsValue values[] = {
-    {C_FLAGS (GST_CAPS_FLAGS_ANY), "GST_CAPS_FLAGS_ANY", "any"},
+    {C_FLAGS (GST_CAPS_FLAG_ANY), "GST_CAPS_FLAG_ANY", "any"},
     {0, NULL, NULL}
   };
 
@@ -372,13 +372,19 @@ gst_element_flags_get_type (void)
 {
   static gsize id = 0;
   static const GFlagsValue values[] = {
-    {C_FLAGS (GST_ELEMENT_LOCKED_STATE), "GST_ELEMENT_LOCKED_STATE",
+    {C_FLAGS (GST_ELEMENT_FLAG_UNPARENTING), "GST_ELEMENT_FLAG_UNPARENTING",
-        "locked-state"},
-    {C_FLAGS (GST_ELEMENT_IS_SINK), "GST_ELEMENT_IS_SINK", "is-sink"},
-    {C_FLAGS (GST_ELEMENT_UNPARENTING), "GST_ELEMENT_UNPARENTING",
         "unparenting"},
-    {C_FLAGS (GST_ELEMENT_IS_SOURCE), "GST_ELEMENT_IS_SOURCE", "is-source"},
+    {C_FLAGS (GST_ELEMENT_FLAG_LOCKED_STATE), "GST_ELEMENT_FLAG_LOCKED_STATE",
-    {C_FLAGS (GST_ELEMENT_FLAG_LAST), "GST_ELEMENT_FLAG_LAST", "flag-last"},
+        "locked-state"},
+    {C_FLAGS (GST_ELEMENT_FLAG_SINK), "GST_ELEMENT_FLAG_SINK", "sink"},
+    {C_FLAGS (GST_ELEMENT_FLAG_SOURCE), "GST_ELEMENT_FLAG_SOURCE", "source"},
+    {C_FLAGS (GST_ELEMENT_FLAG_PROVIDE_CLOCK), "GST_ELEMENT_FLAG_PROVIDE_CLOCK",
+        "provide-clock"},
+    {C_FLAGS (GST_ELEMENT_FLAG_REQUIRE_CLOCK), "GST_ELEMENT_FLAG_REQUIRE_CLOCK",
+        "require-clock"},
+    {C_FLAGS (GST_ELEMENT_FLAG_INDEXABLE), "GST_ELEMENT_FLAG_INDEXABLE",
+        "indexable"},
+    {C_FLAGS (GST_ELEMENT_FLAG_LAST), "GST_ELEMENT_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
 
@@ -542,6 +548,8 @@ gst_event_type_flags_get_type (void)
     {C_FLAGS (GST_EVENT_TYPE_SERIALIZED), "GST_EVENT_TYPE_SERIALIZED",
         "serialized"},
     {C_FLAGS (GST_EVENT_TYPE_STICKY), "GST_EVENT_TYPE_STICKY", "sticky"},
+    {C_FLAGS (GST_EVENT_TYPE_STICKY_MULTI), "GST_EVENT_TYPE_STICKY_MULTI",
+        "sticky-multi"},
     {0, NULL, NULL}
   };
 
@@ -561,12 +569,17 @@ gst_event_type_get_type (void)
     {C_ENUM (GST_EVENT_UNKNOWN), "GST_EVENT_UNKNOWN", "unknown"},
     {C_ENUM (GST_EVENT_FLUSH_START), "GST_EVENT_FLUSH_START", "flush-start"},
     {C_ENUM (GST_EVENT_FLUSH_STOP), "GST_EVENT_FLUSH_STOP", "flush-stop"},
+    {C_ENUM (GST_EVENT_STREAM_START), "GST_EVENT_STREAM_START", "stream-start"},
     {C_ENUM (GST_EVENT_CAPS), "GST_EVENT_CAPS", "caps"},
+    {C_ENUM (GST_EVENT_STREAM_CONFIG), "GST_EVENT_STREAM_CONFIG",
+        "stream-config"},
     {C_ENUM (GST_EVENT_SEGMENT), "GST_EVENT_SEGMENT", "segment"},
     {C_ENUM (GST_EVENT_TAG), "GST_EVENT_TAG", "tag"},
     {C_ENUM (GST_EVENT_BUFFERSIZE), "GST_EVENT_BUFFERSIZE", "buffersize"},
     {C_ENUM (GST_EVENT_SINK_MESSAGE), "GST_EVENT_SINK_MESSAGE", "sink-message"},
     {C_ENUM (GST_EVENT_EOS), "GST_EVENT_EOS", "eos"},
+    {C_ENUM (GST_EVENT_SEGMENT_DONE), "GST_EVENT_SEGMENT_DONE", "segment-done"},
+    {C_ENUM (GST_EVENT_GAP), "GST_EVENT_GAP", "gap"},
     {C_ENUM (GST_EVENT_QOS), "GST_EVENT_QOS", "qos"},
     {C_ENUM (GST_EVENT_SEEK), "GST_EVENT_SEEK", "seek"},
     {C_ENUM (GST_EVENT_NAVIGATION), "GST_EVENT_NAVIGATION", "navigation"},
@@ -579,6 +592,8 @@ gst_event_type_get_type (void)
         "custom-downstream"},
     {C_ENUM (GST_EVENT_CUSTOM_DOWNSTREAM_OOB),
         "GST_EVENT_CUSTOM_DOWNSTREAM_OOB", "custom-downstream-oob"},
+    {C_ENUM (GST_EVENT_CUSTOM_DOWNSTREAM_STICKY),
+        "GST_EVENT_CUSTOM_DOWNSTREAM_STICKY", "custom-downstream-sticky"},
     {C_ENUM (GST_EVENT_CUSTOM_BOTH), "GST_EVENT_CUSTOM_BOTH", "custom-both"},
     {C_ENUM (GST_EVENT_CUSTOM_BOTH_OOB), "GST_EVENT_CUSTOM_BOTH_OOB",
         "custom-both-oob"},
@@ -612,6 +627,24 @@ gst_qos_type_get_type (void)
   return (GType) id;
 }
 
+GType
+gst_stream_config_flags_get_type (void)
+{
+  static gsize id = 0;
+  static const GEnumValue values[] = {
+    {C_ENUM (GST_STREAM_CONFIG_FLAG_NONE), "GST_STREAM_CONFIG_FLAG_NONE",
+        "none"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstStreamConfigFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 /* enumerations from "gstformat.h" */
 GType
 gst_format_get_type (void)
@@ -635,126 +668,6 @@ gst_format_get_type (void)
   return (GType) id;
 }
 
-/* enumerations from "gstindex.h" */
-GType
-gst_index_certainty_get_type (void)
-{
-  static gsize id = 0;
-  static const GEnumValue values[] = {
-    {C_ENUM (GST_INDEX_UNKNOWN), "GST_INDEX_UNKNOWN", "unknown"},
-    {C_ENUM (GST_INDEX_CERTAIN), "GST_INDEX_CERTAIN", "certain"},
-    {C_ENUM (GST_INDEX_FUZZY), "GST_INDEX_FUZZY", "fuzzy"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_enum_register_static ("GstIndexCertainty", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
-GType
-gst_index_entry_type_get_type (void)
-{
-  static gsize id = 0;
-  static const GEnumValue values[] = {
-    {C_ENUM (GST_INDEX_ENTRY_ID), "GST_INDEX_ENTRY_ID", "id"},
-    {C_ENUM (GST_INDEX_ENTRY_ASSOCIATION), "GST_INDEX_ENTRY_ASSOCIATION",
-        "association"},
-    {C_ENUM (GST_INDEX_ENTRY_OBJECT), "GST_INDEX_ENTRY_OBJECT", "object"},
-    {C_ENUM (GST_INDEX_ENTRY_FORMAT), "GST_INDEX_ENTRY_FORMAT", "format"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_enum_register_static ("GstIndexEntryType", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
-GType
-gst_index_lookup_method_get_type (void)
-{
-  static gsize id = 0;
-  static const GEnumValue values[] = {
-    {C_ENUM (GST_INDEX_LOOKUP_EXACT), "GST_INDEX_LOOKUP_EXACT", "exact"},
-    {C_ENUM (GST_INDEX_LOOKUP_BEFORE), "GST_INDEX_LOOKUP_BEFORE", "before"},
-    {C_ENUM (GST_INDEX_LOOKUP_AFTER), "GST_INDEX_LOOKUP_AFTER", "after"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_enum_register_static ("GstIndexLookupMethod", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
-GType
-gst_assoc_flags_get_type (void)
-{
-  static gsize id = 0;
-  static const GFlagsValue values[] = {
-    {C_FLAGS (GST_ASSOCIATION_FLAG_NONE), "GST_ASSOCIATION_FLAG_NONE", "none"},
-    {C_FLAGS (GST_ASSOCIATION_FLAG_KEY_UNIT), "GST_ASSOCIATION_FLAG_KEY_UNIT",
-        "key-unit"},
-    {C_FLAGS (GST_ASSOCIATION_FLAG_DELTA_UNIT),
-        "GST_ASSOCIATION_FLAG_DELTA_UNIT", "delta-unit"},
-    {C_FLAGS (GST_ASSOCIATION_FLAG_LAST), "GST_ASSOCIATION_FLAG_LAST", "last"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_flags_register_static ("GstAssocFlags", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
-GType
-gst_index_resolver_method_get_type (void)
-{
-  static gsize id = 0;
-  static const GEnumValue values[] = {
-    {C_ENUM (GST_INDEX_RESOLVER_CUSTOM), "GST_INDEX_RESOLVER_CUSTOM", "custom"},
-    {C_ENUM (GST_INDEX_RESOLVER_GTYPE), "GST_INDEX_RESOLVER_GTYPE", "gtype"},
-    {C_ENUM (GST_INDEX_RESOLVER_PATH), "GST_INDEX_RESOLVER_PATH", "path"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_enum_register_static ("GstIndexResolverMethod", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
-GType
-gst_index_flags_get_type (void)
-{
-  static gsize id = 0;
-  static const GFlagsValue values[] = {
-    {C_FLAGS (GST_INDEX_WRITABLE), "GST_INDEX_WRITABLE", "writable"},
-    {C_FLAGS (GST_INDEX_READABLE), "GST_INDEX_READABLE", "readable"},
-    {C_FLAGS (GST_INDEX_FLAG_LAST), "GST_INDEX_FLAG_LAST", "flag-last"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_flags_register_static ("GstIndexFlags", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
 /* enumerations from "gstinfo.h" */
 GType
 gst_debug_level_get_type (void)
@@ -764,10 +677,10 @@ gst_debug_level_get_type (void)
     {C_ENUM (GST_LEVEL_NONE), "GST_LEVEL_NONE", "none"},
     {C_ENUM (GST_LEVEL_ERROR), "GST_LEVEL_ERROR", "error"},
     {C_ENUM (GST_LEVEL_WARNING), "GST_LEVEL_WARNING", "warning"},
+    {C_ENUM (GST_LEVEL_FIXME), "GST_LEVEL_FIXME", "fixme"},
     {C_ENUM (GST_LEVEL_INFO), "GST_LEVEL_INFO", "info"},
     {C_ENUM (GST_LEVEL_DEBUG), "GST_LEVEL_DEBUG", "debug"},
     {C_ENUM (GST_LEVEL_LOG), "GST_LEVEL_LOG", "log"},
-    {C_ENUM (GST_LEVEL_FIXME), "GST_LEVEL_FIXME", "fixme"},
     {C_ENUM (GST_LEVEL_TRACE), "GST_LEVEL_TRACE", "trace"},
     {C_ENUM (GST_LEVEL_MEMDUMP), "GST_LEVEL_MEMDUMP", "memdump"},
     {C_ENUM (GST_LEVEL_COUNT), "GST_LEVEL_COUNT", "count"},
@@ -985,6 +898,27 @@ gst_progress_type_get_type (void)
   return (GType) id;
 }
 
+/* enumerations from "gstmeta.h" */
+GType
+gst_meta_flags_get_type (void)
+{
+  static gsize id = 0;
+  static const GFlagsValue values[] = {
+    {C_FLAGS (GST_META_FLAG_NONE), "GST_META_FLAG_NONE", "none"},
+    {C_FLAGS (GST_META_FLAG_READONLY), "GST_META_FLAG_READONLY", "readonly"},
+    {C_FLAGS (GST_META_FLAG_POOLED), "GST_META_FLAG_POOLED", "pooled"},
+    {C_FLAGS (GST_META_FLAG_LAST), "GST_META_FLAG_LAST", "last"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstMetaFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 /* enumerations from "gstmemory.h" */
 GType
 gst_memory_flags_get_type (void)
@@ -1014,6 +948,7 @@ gst_map_flags_get_type (void)
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_MAP_READ), "GST_MAP_READ", "read"},
     {C_FLAGS (GST_MAP_WRITE), "GST_MAP_WRITE", "write"},
+    {C_FLAGS (GST_MAP_FLAG_LAST), "GST_MAP_FLAG_LAST", "flag-last"},
     {0, NULL, NULL}
   };
 
@@ -1063,6 +998,25 @@ gst_pad_direction_get_type (void)
   return (GType) id;
 }
 
+GType
+gst_pad_mode_get_type (void)
+{
+  static gsize id = 0;
+  static const GEnumValue values[] = {
+    {C_ENUM (GST_PAD_MODE_NONE), "GST_PAD_MODE_NONE", "none"},
+    {C_ENUM (GST_PAD_MODE_PUSH), "GST_PAD_MODE_PUSH", "push"},
+    {C_ENUM (GST_PAD_MODE_PULL), "GST_PAD_MODE_PULL", "pull"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstPadMode", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 GType
 gst_pad_link_return_get_type (void)
 {
@@ -1099,11 +1053,10 @@ gst_flow_return_get_type (void)
         "custom-success-1"},
     {C_ENUM (GST_FLOW_CUSTOM_SUCCESS), "GST_FLOW_CUSTOM_SUCCESS",
         "custom-success"},
-    {C_ENUM (GST_FLOW_RESEND), "GST_FLOW_RESEND", "resend"},
     {C_ENUM (GST_FLOW_OK), "GST_FLOW_OK", "ok"},
     {C_ENUM (GST_FLOW_NOT_LINKED), "GST_FLOW_NOT_LINKED", "not-linked"},
-    {C_ENUM (GST_FLOW_WRONG_STATE), "GST_FLOW_WRONG_STATE", "wrong-state"},
+    {C_ENUM (GST_FLOW_FLUSHING), "GST_FLOW_FLUSHING", "wrong-state"},
-    {C_ENUM (GST_FLOW_UNEXPECTED), "GST_FLOW_UNEXPECTED", "unexpected"},
+    {C_ENUM (GST_FLOW_EOS), "GST_FLOW_EOS", "eos"},
     {C_ENUM (GST_FLOW_NOT_NEGOTIATED), "GST_FLOW_NOT_NEGOTIATED",
         "not-negotiated"},
     {C_ENUM (GST_FLOW_ERROR), "GST_FLOW_ERROR", "error"},
@@ -1149,26 +1102,7 @@ gst_pad_link_check_get_type (void)
 }
 
 GType
-gst_activate_mode_get_type (void)
+gst_pad_probe_type_get_type (void)
-{
-  static gsize id = 0;
-  static const GEnumValue values[] = {
-    {C_ENUM (GST_PAD_ACTIVATE_NONE), "GST_PAD_ACTIVATE_NONE", "none"},
-    {C_ENUM (GST_PAD_ACTIVATE_PUSH), "GST_PAD_ACTIVATE_PUSH", "push"},
-    {C_ENUM (GST_PAD_ACTIVATE_PULL), "GST_PAD_ACTIVATE_PULL", "pull"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_enum_register_static ("GstPadActivateMode", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
-GType
-gst_probe_type_get_type (void)
 {
   static gsize id = 0;
   static const GFlagsValue values[] = {
@@ -1180,7 +1114,16 @@ gst_probe_type_get_type (void)
         "buffer"},
     {C_FLAGS (GST_PAD_PROBE_TYPE_BUFFER_LIST), "GST_PAD_PROBE_TYPE_BUFFER_LIST",
         "buffer-list"},
-    {C_FLAGS (GST_PAD_PROBE_TYPE_EVENT), "GST_PAD_PROBE_TYPE_EVENT", "event"},
+    {C_FLAGS (GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM),
+        "GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM", "event-downstream"},
+    {C_FLAGS (GST_PAD_PROBE_TYPE_EVENT_UPSTREAM),
+        "GST_PAD_PROBE_TYPE_EVENT_UPSTREAM", "event-upstream"},
+    {C_FLAGS (GST_PAD_PROBE_TYPE_EVENT_FLUSH), "GST_PAD_PROBE_TYPE_EVENT_FLUSH",
+        "event-flush"},
+    {C_FLAGS (GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM),
+        "GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM", "query-downstream"},
+    {C_FLAGS (GST_PAD_PROBE_TYPE_QUERY_UPSTREAM),
+        "GST_PAD_PROBE_TYPE_QUERY_UPSTREAM", "query-upstream"},
     {C_FLAGS (GST_PAD_PROBE_TYPE_PUSH), "GST_PAD_PROBE_TYPE_PUSH", "push"},
     {C_FLAGS (GST_PAD_PROBE_TYPE_PULL), "GST_PAD_PROBE_TYPE_PULL", "pull"},
     {0, NULL, NULL}
@@ -1195,7 +1138,7 @@ gst_probe_type_get_type (void)
 }
 
 GType
-gst_probe_return_get_type (void)
+gst_pad_probe_return_get_type (void)
 {
   static gsize id = 0;
   static const GEnumValue values[] = {
@@ -1219,15 +1162,22 @@ gst_pad_flags_get_type (void)
 {
   static gsize id = 0;
   static const GFlagsValue values[] = {
-    {C_FLAGS (GST_PAD_BLOCKED), "GST_PAD_BLOCKED", "blocked"},
+    {C_FLAGS (GST_PAD_FLAG_BLOCKED), "GST_PAD_FLAG_BLOCKED", "blocked"},
-    {C_FLAGS (GST_PAD_FLUSHING), "GST_PAD_FLUSHING", "flushing"},
+    {C_FLAGS (GST_PAD_FLAG_FLUSHING), "GST_PAD_FLAG_FLUSHING", "flushing"},
-    {C_FLAGS (GST_PAD_IN_GETCAPS), "GST_PAD_IN_GETCAPS", "in-getcaps"},
+    {C_FLAGS (GST_PAD_FLAG_BLOCKING), "GST_PAD_FLAG_BLOCKING", "blocking"},
-    {C_FLAGS (GST_PAD_BLOCKING), "GST_PAD_BLOCKING", "blocking"},
+    {C_FLAGS (GST_PAD_FLAG_NEED_PARENT), "GST_PAD_FLAG_NEED_PARENT",
-    {C_FLAGS (GST_PAD_NEED_RECONFIGURE), "GST_PAD_NEED_RECONFIGURE",
+        "need-parent"},
+    {C_FLAGS (GST_PAD_FLAG_NEED_RECONFIGURE), "GST_PAD_FLAG_NEED_RECONFIGURE",
         "need-reconfigure"},
-    {C_FLAGS (GST_PAD_NEED_EVENTS), "GST_PAD_NEED_EVENTS", "need-events"},
+    {C_FLAGS (GST_PAD_FLAG_PENDING_EVENTS), "GST_PAD_FLAG_PENDING_EVENTS",
-    {C_FLAGS (GST_PAD_FIXED_CAPS), "GST_PAD_FIXED_CAPS", "fixed-caps"},
+        "pending-events"},
-    {C_FLAGS (GST_PAD_FLAG_LAST), "GST_PAD_FLAG_LAST", "flag-last"},
+    {C_FLAGS (GST_PAD_FLAG_FIXED_CAPS), "GST_PAD_FLAG_FIXED_CAPS",
+        "fixed-caps"},
+    {C_FLAGS (GST_PAD_FLAG_PROXY_CAPS), "GST_PAD_FLAG_PROXY_CAPS",
+        "proxy-caps"},
+    {C_FLAGS (GST_PAD_FLAG_PROXY_ALLOCATION), "GST_PAD_FLAG_PROXY_ALLOCATION",
+        "proxy-allocation"},
+    {C_FLAGS (GST_PAD_FLAG_LAST), "GST_PAD_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };
 
@@ -1406,6 +1356,8 @@ gst_query_type_get_type (void)
     {C_ENUM (GST_QUERY_URI), "GST_QUERY_URI", "uri"},
     {C_ENUM (GST_QUERY_ALLOCATION), "GST_QUERY_ALLOCATION", "allocation"},
     {C_ENUM (GST_QUERY_SCHEDULING), "GST_QUERY_SCHEDULING", "scheduling"},
+    {C_ENUM (GST_QUERY_ACCEPT_CAPS), "GST_QUERY_ACCEPT_CAPS", "accept-caps"},
+    {C_ENUM (GST_QUERY_CAPS), "GST_QUERY_CAPS", "caps"},
     {0, NULL, NULL}
   };
 
@@ -1437,6 +1389,26 @@ gst_buffering_mode_get_type (void)
   return (GType) id;
 }
 
+GType
+gst_scheduling_flags_get_type (void)
+{
+  static gsize id = 0;
+  static const GFlagsValue values[] = {
+    {C_FLAGS (GST_SCHEDULING_FLAG_SEEKABLE), "GST_SCHEDULING_FLAG_SEEKABLE",
+        "seekable"},
+    {C_FLAGS (GST_SCHEDULING_FLAG_SEQUENTIAL), "GST_SCHEDULING_FLAG_SEQUENTIAL",
+        "sequential"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_flags_register_static ("GstSchedulingFlags", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 /* enumerations from "gstsegment.h" */
 GType
 gst_seek_type_get_type (void)
@@ -1444,7 +1416,6 @@ gst_seek_type_get_type (void)
   static gsize id = 0;
   static const GEnumValue values[] = {
     {C_ENUM (GST_SEEK_TYPE_NONE), "GST_SEEK_TYPE_NONE", "none"},
-    {C_ENUM (GST_SEEK_TYPE_CUR), "GST_SEEK_TYPE_CUR", "cur"},
     {C_ENUM (GST_SEEK_TYPE_SET), "GST_SEEK_TYPE_SET", "set"},
     {C_ENUM (GST_SEEK_TYPE_END), "GST_SEEK_TYPE_END", "end"},
     {0, NULL, NULL}
@@ -1586,27 +1557,6 @@ gst_task_state_get_type (void)
   return (GType) id;
 }
 
-/* enumerations from "gsttrace.h" */
-GType
-gst_alloc_trace_flags_get_type (void)
-{
-  static gsize id = 0;
-  static const GFlagsValue values[] = {
-    {C_FLAGS (GST_ALLOC_TRACE_NONE), "GST_ALLOC_TRACE_NONE", "none"},
-    {C_FLAGS (GST_ALLOC_TRACE_LIVE), "GST_ALLOC_TRACE_LIVE", "live"},
-    {C_FLAGS (GST_ALLOC_TRACE_MEM_LIVE), "GST_ALLOC_TRACE_MEM_LIVE",
-        "mem-live"},
-    {0, NULL, NULL}
-  };
-
-  if (g_once_init_enter (&id)) {
-    GType tmp = g_flags_register_static ("GstAllocTraceFlags", values);
-    g_once_init_leave (&id, tmp);
-  }
-
-  return (GType) id;
-}
-
 /* enumerations from "gsttypefind.h" */
 GType
 gst_type_find_probability_get_type (void)
@@ -1632,6 +1582,28 @@ gst_type_find_probability_get_type (void)
 }
 
 /* enumerations from "gsturi.h" */
+GType
+gst_uri_error_get_type (void)
+{
+  static gsize id = 0;
+  static const GEnumValue values[] = {
+    {C_ENUM (GST_URI_ERROR_BAD_PROTOCOL), "GST_URI_ERROR_BAD_PROTOCOL",
+        "protocol"},
+    {C_ENUM (GST_URI_ERROR_BAD_URI), "GST_URI_ERROR_BAD_URI", "uri"},
+    {C_ENUM (GST_URI_ERROR_BAD_STATE), "GST_URI_ERROR_BAD_STATE", "state"},
+    {C_ENUM (GST_URI_ERROR_BAD_REFERENCE), "GST_URI_ERROR_BAD_REFERENCE",
+        "reference"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstURIError", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 GType
 gst_uri_type_get_type (void)
 {

win32/common/gstenumtypes.h

@@ -77,25 +77,13 @@ GType gst_event_type_get_type (void);
 #define GST_TYPE_EVENT_TYPE (gst_event_type_get_type())
 GType gst_qos_type_get_type (void);
 #define GST_TYPE_QOS_TYPE (gst_qos_type_get_type())
+GType gst_stream_config_flags_get_type (void);
+#define GST_TYPE_STREAM_CONFIG_FLAGS (gst_stream_config_flags_get_type())
 
 /* enumerations from "gstformat.h" */
 GType gst_format_get_type (void);
 #define GST_TYPE_FORMAT (gst_format_get_type())
 
-/* enumerations from "gstindex.h" */
-GType gst_index_certainty_get_type (void);
-#define GST_TYPE_INDEX_CERTAINTY (gst_index_certainty_get_type())
-GType gst_index_entry_type_get_type (void);
-#define GST_TYPE_INDEX_ENTRY_TYPE (gst_index_entry_type_get_type())
-GType gst_index_lookup_method_get_type (void);
-#define GST_TYPE_INDEX_LOOKUP_METHOD (gst_index_lookup_method_get_type())
-GType gst_assoc_flags_get_type (void);
-#define GST_TYPE_ASSOC_FLAGS (gst_assoc_flags_get_type())
-GType gst_index_resolver_method_get_type (void);
-#define GST_TYPE_INDEX_RESOLVER_METHOD (gst_index_resolver_method_get_type())
-GType gst_index_flags_get_type (void);
-#define GST_TYPE_INDEX_FLAGS (gst_index_flags_get_type())
-
 /* enumerations from "gstinfo.h" */
 GType gst_debug_level_get_type (void);
 #define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type())
@@ -118,6 +106,10 @@ GType gst_stream_status_type_get_type (void);
 GType gst_progress_type_get_type (void);
 #define GST_TYPE_PROGRESS_TYPE (gst_progress_type_get_type())
 
+/* enumerations from "gstmeta.h" */
+GType gst_meta_flags_get_type (void);
+#define GST_TYPE_META_FLAGS (gst_meta_flags_get_type())
+
 /* enumerations from "gstmemory.h" */
 GType gst_memory_flags_get_type (void);
 #define GST_TYPE_MEMORY_FLAGS (gst_memory_flags_get_type())
@@ -131,18 +123,18 @@ GType gst_mini_object_flags_get_type (void);
 /* enumerations from "gstpad.h" */
 GType gst_pad_direction_get_type (void);
 #define GST_TYPE_PAD_DIRECTION (gst_pad_direction_get_type())
+GType gst_pad_mode_get_type (void);
+#define GST_TYPE_PAD_MODE (gst_pad_mode_get_type())
 GType gst_pad_link_return_get_type (void);
 #define GST_TYPE_PAD_LINK_RETURN (gst_pad_link_return_get_type())
 GType gst_flow_return_get_type (void);
 #define GST_TYPE_FLOW_RETURN (gst_flow_return_get_type())
 GType gst_pad_link_check_get_type (void);
 #define GST_TYPE_PAD_LINK_CHECK (gst_pad_link_check_get_type())
-GType gst_activate_mode_get_type (void);
+GType gst_pad_probe_type_get_type (void);
-#define GST_TYPE_ACTIVATE_MODE (gst_activate_mode_get_type())
+#define GST_TYPE_PAD_PROBE_TYPE (gst_pad_probe_type_get_type())
-GType gst_probe_type_get_type (void);
+GType gst_pad_probe_return_get_type (void);
-#define GST_TYPE_PROBE_TYPE (gst_probe_type_get_type())
+#define GST_TYPE_PAD_PROBE_RETURN (gst_pad_probe_return_get_type())
-GType gst_probe_return_get_type (void);
-#define GST_TYPE_PROBE_RETURN (gst_probe_return_get_type())
 GType gst_pad_flags_get_type (void);
 #define GST_TYPE_PAD_FLAGS (gst_pad_flags_get_type())
 
@@ -173,6 +165,8 @@ GType gst_query_type_get_type (void);
 #define GST_TYPE_QUERY_TYPE (gst_query_type_get_type())
 GType gst_buffering_mode_get_type (void);
 #define GST_TYPE_BUFFERING_MODE (gst_buffering_mode_get_type())
+GType gst_scheduling_flags_get_type (void);
+#define GST_TYPE_SCHEDULING_FLAGS (gst_scheduling_flags_get_type())
 
 /* enumerations from "gstsegment.h" */
 GType gst_seek_type_get_type (void);
@@ -196,15 +190,13 @@ GType gst_tag_flag_get_type (void);
 GType gst_task_state_get_type (void);
 #define GST_TYPE_TASK_STATE (gst_task_state_get_type())
 
-/* enumerations from "gsttrace.h" */
-GType gst_alloc_trace_flags_get_type (void);
-#define GST_TYPE_ALLOC_TRACE_FLAGS (gst_alloc_trace_flags_get_type())
-
 /* enumerations from "gsttypefind.h" */
 GType gst_type_find_probability_get_type (void);
 #define GST_TYPE_TYPE_FIND_PROBABILITY (gst_type_find_probability_get_type())
 
 /* enumerations from "gsturi.h" */
+GType gst_uri_error_get_type (void);
+#define GST_TYPE_URI_ERROR (gst_uri_error_get_type())
 GType gst_uri_type_get_type (void);
 #define GST_TYPE_URI_TYPE (gst_uri_type_get_type())
 

win32/common/gstmarshal.c

@@ -7,7 +7,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
@@ -94,9 +94,7 @@ gst_marshal_VOID__BOXED_OBJECT (GClosure * closure,
       g_marshal_value_peek_object (param_values + 2), data2);
 }
 
-/* VOID:POINTER (./gstmarshal.list:7) */
+/* VOID:POINTER,OBJECT (./gstmarshal.list:7) */
-
-/* VOID:POINTER,OBJECT (./gstmarshal.list:8) */
 void
 gst_marshal_VOID__POINTER_OBJECT (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -128,9 +126,9 @@ gst_marshal_VOID__POINTER_OBJECT (GClosure * closure,
       g_marshal_value_peek_object (param_values + 2), data2);
 }
 
-/* VOID:OBJECT (./gstmarshal.list:9) */
+/* VOID:OBJECT (./gstmarshal.list:8) */
 
-/* VOID:OBJECT,OBJECT (./gstmarshal.list:10) */
+/* VOID:OBJECT,OBJECT (./gstmarshal.list:9) */
 void
 gst_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -162,7 +160,7 @@ gst_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
       g_marshal_value_peek_object (param_values + 2), data2);
 }
 
-/* VOID:OBJECT,PARAM (./gstmarshal.list:11) */
+/* VOID:OBJECT,PARAM (./gstmarshal.list:10) */
 void
 gst_marshal_VOID__OBJECT_PARAM (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -194,7 +192,7 @@ gst_marshal_VOID__OBJECT_PARAM (GClosure * closure,
       g_marshal_value_peek_param (param_values + 2), data2);
 }
 
-/* VOID:OBJECT,POINTER (./gstmarshal.list:12) */
+/* VOID:OBJECT,POINTER (./gstmarshal.list:11) */
 void
 gst_marshal_VOID__OBJECT_POINTER (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -226,7 +224,7 @@ gst_marshal_VOID__OBJECT_POINTER (GClosure * closure,
       g_marshal_value_peek_pointer (param_values + 2), data2);
 }
 
-/* VOID:OBJECT,BOXED (./gstmarshal.list:13) */
+/* VOID:OBJECT,BOXED (./gstmarshal.list:12) */
 void
 gst_marshal_VOID__OBJECT_BOXED (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -258,7 +256,7 @@ gst_marshal_VOID__OBJECT_BOXED (GClosure * closure,
       g_marshal_value_peek_boxed (param_values + 2), data2);
 }
 
-/* VOID:OBJECT,BOXED,STRING (./gstmarshal.list:14) */
+/* VOID:OBJECT,BOXED,STRING (./gstmarshal.list:13) */
 void
 gst_marshal_VOID__OBJECT_BOXED_STRING (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -291,7 +289,7 @@ gst_marshal_VOID__OBJECT_BOXED_STRING (GClosure * closure,
       g_marshal_value_peek_string (param_values + 3), data2);
 }
 
-/* VOID:OBJECT,OBJECT,STRING (./gstmarshal.list:15) */
+/* VOID:OBJECT,OBJECT,STRING (./gstmarshal.list:14) */
 void
 gst_marshal_VOID__OBJECT_OBJECT_STRING (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -324,7 +322,7 @@ gst_marshal_VOID__OBJECT_OBJECT_STRING (GClosure * closure,
       g_marshal_value_peek_string (param_values + 3), data2);
 }
 
-/* VOID:OBJECT,STRING (./gstmarshal.list:16) */
+/* VOID:OBJECT,STRING (./gstmarshal.list:15) */
 void
 gst_marshal_VOID__OBJECT_STRING (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -356,7 +354,7 @@ gst_marshal_VOID__OBJECT_STRING (GClosure * closure,
       g_marshal_value_peek_string (param_values + 2), data2);
 }
 
-/* VOID:INT,INT (./gstmarshal.list:17) */
+/* VOID:INT,INT (./gstmarshal.list:16) */
 void
 gst_marshal_VOID__INT_INT (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -387,7 +385,7 @@ gst_marshal_VOID__INT_INT (GClosure * closure,
       g_marshal_value_peek_int (param_values + 2), data2);
 }
 
-/* VOID:INT64 (./gstmarshal.list:18) */
+/* VOID:INT64 (./gstmarshal.list:17) */
 void
 gst_marshal_VOID__INT64 (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -416,7 +414,7 @@ gst_marshal_VOID__INT64 (GClosure * closure,
   callback (data1, g_marshal_value_peek_int64 (param_values + 1), data2);
 }
 
-/* VOID:UINT,BOXED (./gstmarshal.list:19) */
+/* VOID:UINT,BOXED (./gstmarshal.list:18) */
 void
 gst_marshal_VOID__UINT_BOXED (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -448,9 +446,9 @@ gst_marshal_VOID__UINT_BOXED (GClosure * closure,
       g_marshal_value_peek_boxed (param_values + 2), data2);
 }
 
-/* VOID:UINT,POINTER (./gstmarshal.list:20) */
+/* VOID:UINT,POINTER (./gstmarshal.list:19) */
 
-/* BOOLEAN:VOID (./gstmarshal.list:21) */
+/* BOOLEAN:VOID (./gstmarshal.list:20) */
 void
 gst_marshal_BOOLEAN__VOID (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -483,7 +481,7 @@ gst_marshal_BOOLEAN__VOID (GClosure * closure,
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:POINTER (./gstmarshal.list:22) */
+/* BOOLEAN:POINTER (./gstmarshal.list:21) */
 void
 gst_marshal_BOOLEAN__POINTER (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -518,7 +516,7 @@ gst_marshal_BOOLEAN__POINTER (GClosure * closure,
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:BOXED (./gstmarshal.list:23) */
+/* BOOLEAN:BOXED (./gstmarshal.list:22) */
 void
 gst_marshal_BOOLEAN__BOXED (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -553,7 +551,7 @@ gst_marshal_BOOLEAN__BOXED (GClosure * closure,
   g_value_set_boolean (return_value, v_return);
 }
 
-/* POINTER:POINTER (./gstmarshal.list:24) */
+/* POINTER:POINTER (./gstmarshal.list:23) */
 void
 gst_marshal_POINTER__POINTER (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,
@@ -588,7 +586,7 @@ gst_marshal_POINTER__POINTER (GClosure * closure,
   g_value_set_pointer (return_value, v_return);
 }
 
-/* BOXED:BOXED (./gstmarshal.list:25) */
+/* BOXED:BOXED (./gstmarshal.list:24) */
 void
 gst_marshal_BOXED__BOXED (GClosure * closure,
     GValue * return_value G_GNUC_UNUSED,

win32/common/gstmarshal.h

@@ -29,10 +29,7 @@ extern void gst_marshal_VOID__BOXED_OBJECT (GClosure     *closure,
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:POINTER (./gstmarshal.list:7) */
+/* VOID:POINTER,OBJECT (./gstmarshal.list:7) */
-#define gst_marshal_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-
-/* VOID:POINTER,OBJECT (./gstmarshal.list:8) */
 extern void gst_marshal_VOID__POINTER_OBJECT (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -40,10 +37,10 @@ extern void gst_marshal_VOID__POINTER_OBJECT (GClosure     *closure,
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:OBJECT (./gstmarshal.list:9) */
+/* VOID:OBJECT (./gstmarshal.list:8) */
 #define gst_marshal_VOID__OBJECT	g_cclosure_marshal_VOID__OBJECT
 
-/* VOID:OBJECT,OBJECT (./gstmarshal.list:10) */
+/* VOID:OBJECT,OBJECT (./gstmarshal.list:9) */
 extern void gst_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -51,7 +48,7 @@ extern void gst_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:OBJECT,PARAM (./gstmarshal.list:11) */
+/* VOID:OBJECT,PARAM (./gstmarshal.list:10) */
 extern void gst_marshal_VOID__OBJECT_PARAM (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -59,7 +56,7 @@ extern void gst_marshal_VOID__OBJECT_PARAM (GClosure     *closure,
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:OBJECT,POINTER (./gstmarshal.list:12) */
+/* VOID:OBJECT,POINTER (./gstmarshal.list:11) */
 extern void gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -67,7 +64,7 @@ extern void gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:OBJECT,BOXED (./gstmarshal.list:13) */
+/* VOID:OBJECT,BOXED (./gstmarshal.list:12) */
 extern void gst_marshal_VOID__OBJECT_BOXED (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -75,7 +72,7 @@ extern void gst_marshal_VOID__OBJECT_BOXED (GClosure     *closure,
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:OBJECT,BOXED,STRING (./gstmarshal.list:14) */
+/* VOID:OBJECT,BOXED,STRING (./gstmarshal.list:13) */
 extern void gst_marshal_VOID__OBJECT_BOXED_STRING (GClosure     *closure,
                                                    GValue       *return_value,
                                                    guint         n_param_values,
@@ -83,7 +80,7 @@ extern void gst_marshal_VOID__OBJECT_BOXED_STRING (GClosure     *closure,
                                                    gpointer      invocation_hint,
                                                    gpointer      marshal_data);
 
-/* VOID:OBJECT,OBJECT,STRING (./gstmarshal.list:15) */
+/* VOID:OBJECT,OBJECT,STRING (./gstmarshal.list:14) */
 extern void gst_marshal_VOID__OBJECT_OBJECT_STRING (GClosure     *closure,
                                                     GValue       *return_value,
                                                     guint         n_param_values,
@@ -91,7 +88,7 @@ extern void gst_marshal_VOID__OBJECT_OBJECT_STRING (GClosure     *closure,
                                                     gpointer      invocation_hint,
                                                     gpointer      marshal_data);
 
-/* VOID:OBJECT,STRING (./gstmarshal.list:16) */
+/* VOID:OBJECT,STRING (./gstmarshal.list:15) */
 extern void gst_marshal_VOID__OBJECT_STRING (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -99,7 +96,7 @@ extern void gst_marshal_VOID__OBJECT_STRING (GClosure     *closure,
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:INT,INT (./gstmarshal.list:17) */
+/* VOID:INT,INT (./gstmarshal.list:16) */
 extern void gst_marshal_VOID__INT_INT (GClosure     *closure,
                                        GValue       *return_value,
                                        guint         n_param_values,
@@ -107,7 +104,7 @@ extern void gst_marshal_VOID__INT_INT (GClosure     *closure,
                                        gpointer      invocation_hint,
                                        gpointer      marshal_data);
 
-/* VOID:INT64 (./gstmarshal.list:18) */
+/* VOID:INT64 (./gstmarshal.list:17) */
 extern void gst_marshal_VOID__INT64 (GClosure     *closure,
                                      GValue       *return_value,
                                      guint         n_param_values,
@@ -115,7 +112,7 @@ extern void gst_marshal_VOID__INT64 (GClosure     *closure,
                                      gpointer      invocation_hint,
                                      gpointer      marshal_data);
 
-/* VOID:UINT,BOXED (./gstmarshal.list:19) */
+/* VOID:UINT,BOXED (./gstmarshal.list:18) */
 extern void gst_marshal_VOID__UINT_BOXED (GClosure     *closure,
                                           GValue       *return_value,
                                           guint         n_param_values,
@@ -123,10 +120,10 @@ extern void gst_marshal_VOID__UINT_BOXED (GClosure     *closure,
                                           gpointer      invocation_hint,
                                           gpointer      marshal_data);
 
-/* VOID:UINT,POINTER (./gstmarshal.list:20) */
+/* VOID:UINT,POINTER (./gstmarshal.list:19) */
 #define gst_marshal_VOID__UINT_POINTER	g_cclosure_marshal_VOID__UINT_POINTER
 
-/* BOOLEAN:VOID (./gstmarshal.list:21) */
+/* BOOLEAN:VOID (./gstmarshal.list:20) */
 extern void gst_marshal_BOOLEAN__VOID (GClosure     *closure,
                                        GValue       *return_value,
                                        guint         n_param_values,
@@ -134,7 +131,7 @@ extern void gst_marshal_BOOLEAN__VOID (GClosure     *closure,
                                        gpointer      invocation_hint,
                                        gpointer      marshal_data);
 
-/* BOOLEAN:POINTER (./gstmarshal.list:22) */
+/* BOOLEAN:POINTER (./gstmarshal.list:21) */
 extern void gst_marshal_BOOLEAN__POINTER (GClosure     *closure,
                                           GValue       *return_value,
                                           guint         n_param_values,
@@ -142,7 +139,7 @@ extern void gst_marshal_BOOLEAN__POINTER (GClosure     *closure,
                                           gpointer      invocation_hint,
                                           gpointer      marshal_data);
 
-/* BOOLEAN:BOXED (./gstmarshal.list:23) */
+/* BOOLEAN:BOXED (./gstmarshal.list:22) */
 extern void gst_marshal_BOOLEAN__BOXED (GClosure     *closure,
                                         GValue       *return_value,
                                         guint         n_param_values,
@@ -150,7 +147,7 @@ extern void gst_marshal_BOOLEAN__BOXED (GClosure     *closure,
                                         gpointer      invocation_hint,
                                         gpointer      marshal_data);
 
-/* POINTER:POINTER (./gstmarshal.list:24) */
+/* POINTER:POINTER (./gstmarshal.list:23) */
 extern void gst_marshal_POINTER__POINTER (GClosure     *closure,
                                           GValue       *return_value,
                                           guint         n_param_values,
@@ -158,7 +155,7 @@ extern void gst_marshal_POINTER__POINTER (GClosure     *closure,
                                           gpointer      invocation_hint,
                                           gpointer      marshal_data);
 
-/* BOXED:BOXED (./gstmarshal.list:25) */
+/* BOXED:BOXED (./gstmarshal.list:24) */
 extern void gst_marshal_BOXED__BOXED (GClosure     *closure,
                                       GValue       *return_value,
                                       guint         n_param_values,