mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 10:11:08 +00:00
*.*: Ran scripts/update-macros. Oh yes.
Original commit message from CVS: 2005-11-21 Andy Wingo <wingo@pobox.com> * *.h: * *.c: Ran scripts/update-macros. Oh yes.
This commit is contained in:
parent
39c85079c4
commit
d779ee9077
5 changed files with 22 additions and 17 deletions
|
@ -1,3 +1,8 @@
|
|||
2005-11-21 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* *.h:
|
||||
* *.c: Ran scripts/update-macros. Oh yes.
|
||||
|
||||
2005-11-21 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_process_event):
|
||||
|
|
|
@ -615,9 +615,9 @@ gst_a52dec_set_property (GObject * object, guint prop_id, const GValue * value,
|
|||
|
||||
switch (prop_id) {
|
||||
case ARG_DRC:
|
||||
GST_LOCK (src);
|
||||
GST_OBJECT_LOCK (src);
|
||||
src->dynamic_range_compression = g_value_get_boolean (value);
|
||||
GST_UNLOCK (src);
|
||||
GST_OBJECT_UNLOCK (src);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
|
@ -633,9 +633,9 @@ gst_a52dec_get_property (GObject * object, guint prop_id, GValue * value,
|
|||
|
||||
switch (prop_id) {
|
||||
case ARG_DRC:
|
||||
GST_LOCK (src);
|
||||
GST_OBJECT_LOCK (src);
|
||||
g_value_set_boolean (value, src->dynamic_range_compression);
|
||||
GST_UNLOCK (src);
|
||||
GST_OBJECT_UNLOCK (src);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
|
|
|
@ -459,9 +459,9 @@ gst_amrnbparse_sink_activate (GstPad * sinkpad)
|
|||
|
||||
amrnbparse = GST_AMRNBPARSE (GST_OBJECT_PARENT (sinkpad));
|
||||
|
||||
GST_LOCK (sinkpad);
|
||||
GST_OBJECT_LOCK (sinkpad);
|
||||
mode = GST_PAD_ACTIVATE_MODE (sinkpad);
|
||||
GST_UNLOCK (sinkpad);
|
||||
GST_OBJECT_UNLOCK (sinkpad);
|
||||
|
||||
switch (mode) {
|
||||
case GST_ACTIVATE_PUSH:
|
||||
|
|
|
@ -932,11 +932,11 @@ gst_mpeg2dec_src_getcaps (GstPad * pad)
|
|||
{
|
||||
GstCaps *caps;
|
||||
|
||||
GST_LOCK (pad);
|
||||
GST_OBJECT_LOCK (pad);
|
||||
if (!(caps = GST_PAD_CAPS (pad)))
|
||||
caps = (GstCaps *) gst_pad_get_pad_template_caps (pad);
|
||||
caps = gst_caps_ref (caps);
|
||||
GST_UNLOCK (pad);
|
||||
GST_OBJECT_UNLOCK (pad);
|
||||
|
||||
return caps;
|
||||
}
|
||||
|
|
|
@ -316,7 +316,7 @@ gst_rmdemux_src_event (GstPad * pad, GstEvent * event)
|
|||
goto done_unref;
|
||||
}
|
||||
|
||||
GST_LOCK (rmdemux);
|
||||
GST_OBJECT_LOCK (rmdemux);
|
||||
|
||||
if (cur_type == GST_SEEK_TYPE_SET)
|
||||
rmdemux->segment_start = cur;
|
||||
|
@ -334,7 +334,7 @@ gst_rmdemux_src_event (GstPad * pad, GstEvent * event)
|
|||
|
||||
/* Now do a sanity-check */
|
||||
if (rmdemux->segment_stop < rmdemux->segment_start) {
|
||||
GST_UNLOCK (rmdemux);
|
||||
GST_OBJECT_UNLOCK (rmdemux);
|
||||
ret = FALSE;
|
||||
GST_DEBUG_OBJECT (rmdemux, "Seek had stop " G_GUINT64_FORMAT " < start "
|
||||
G_GUINT64_FORMAT ", cannot perform seek",
|
||||
|
@ -352,7 +352,7 @@ gst_rmdemux_src_event (GstPad * pad, GstEvent * event)
|
|||
|
||||
/* check if we can do the seek now */
|
||||
running = rmdemux->running;
|
||||
GST_UNLOCK (rmdemux);
|
||||
GST_OBJECT_UNLOCK (rmdemux);
|
||||
|
||||
/* now do the seek */
|
||||
if (running) {
|
||||
|
@ -684,9 +684,9 @@ gst_rmdemux_change_state (GstElement * element, GstStateChange transition)
|
|||
break;
|
||||
case GST_STATE_CHANGE_PAUSED_TO_READY:
|
||||
gst_adapter_clear (rmdemux->adapter);
|
||||
GST_LOCK (rmdemux);
|
||||
GST_OBJECT_LOCK (rmdemux);
|
||||
rmdemux->running = FALSE;
|
||||
GST_UNLOCK (rmdemux);
|
||||
GST_OBJECT_UNLOCK (rmdemux);
|
||||
break;
|
||||
case GST_STATE_CHANGE_READY_TO_NULL:
|
||||
break;
|
||||
|
@ -810,10 +810,10 @@ gst_rmdemux_loop (GstPad * pad)
|
|||
/* The index isn't available so forget about it */
|
||||
rmdemux->loop_state = RMDEMUX_LOOP_STATE_DATA;
|
||||
rmdemux->offset = rmdemux->data_offset;
|
||||
GST_LOCK (rmdemux);
|
||||
GST_OBJECT_LOCK (rmdemux);
|
||||
rmdemux->running = TRUE;
|
||||
rmdemux->seekable = FALSE;
|
||||
GST_UNLOCK (rmdemux);
|
||||
GST_OBJECT_UNLOCK (rmdemux);
|
||||
return;
|
||||
} else {
|
||||
GST_DEBUG_OBJECT (rmdemux,
|
||||
|
@ -848,9 +848,9 @@ gst_rmdemux_loop (GstPad * pad)
|
|||
/* We've read the last index */
|
||||
rmdemux->loop_state = RMDEMUX_LOOP_STATE_DATA;
|
||||
rmdemux->offset = rmdemux->data_offset;
|
||||
GST_LOCK (rmdemux);
|
||||
GST_OBJECT_LOCK (rmdemux);
|
||||
rmdemux->running = TRUE;
|
||||
GST_UNLOCK (rmdemux);
|
||||
GST_OBJECT_UNLOCK (rmdemux);
|
||||
} else {
|
||||
/* Get the next index */
|
||||
rmdemux->offset = rmdemux->index_offset;
|
||||
|
|
Loading…
Reference in a new issue