diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2005-11-21 18:09:02 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2005-11-21 18:09:02 +0000 |
| commit | 3cbd39e022c47cabd8dca1657ea79759bc6b4615 (patch) | |
| tree | 5faf3e4a96c908dae92513c9d9fadcaaaa8f7b45 /gst/matroska | |
| parent | e594bf3649ed2daab507a9f79080ef3aaa484b52 (diff) | |
Update for stream lock API changes: don't take stream log in sink event handlers any longer and change GST_STREAM_LOC...
Original commit message from CVS:
* ext/dv/gstdvdemux.c: (gst_dvdemux_handle_sink_event):
* ext/flac/gstflacdec.c: (gst_flacdec_loop),
(gst_flacdec_src_event):
* ext/flac/gstflacenc.c: (gst_flacenc_sink_event):
* ext/ladspa/gstsignalprocessor.c: (gst_signal_processor_event),
(gst_signal_processor_getrange), (gst_signal_processor_chain):
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_seek):
* gst/flx/gstflxdec.c: (gst_flxdec_src_event_handler),
(gst_flxdec_sink_event_handler):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_handle_seek_event):
* gst/wavparse/gstwavparse.c: (gst_wavparse_handle_seek):
Update for stream lock API changes: don't take stream log
in sink event handlers any longer and change GST_STREAM_LOCK
to GST_PAD_STREAM_LOCK. Don't leak references in flxdec event
functions.
Diffstat (limited to 'gst/matroska')
| -rw-r--r-- | gst/matroska/matroska-demux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 0b03e31e..a89587c1 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -1102,7 +1102,7 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux, /* now grab the stream lock so that streaming cannot continue, for * non flushing seeks when the element is in PAUSED this could block * forever. */ - GST_STREAM_LOCK (demux->sinkpad); + GST_PAD_STREAM_LOCK (demux->sinkpad); GST_OBJECT_LOCK (demux); @@ -1188,7 +1188,7 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux, demux->sinkpad); /* streaming can continue now */ - GST_STREAM_UNLOCK (demux->sinkpad); + GST_PAD_STREAM_UNLOCK (demux->sinkpad); return TRUE; @@ -1198,7 +1198,7 @@ seek_error: * function again so that things can continue from where they left off? */ GST_DEBUG ("Got a seek error"); GST_OBJECT_UNLOCK (demux); - GST_STREAM_UNLOCK (demux->sinkpad); + GST_PAD_STREAM_UNLOCK (demux->sinkpad); return FALSE; } |