Commit 06b169cc authored by Jonathan Matthew's avatar Jonathan Matthew 🥗
Browse files

xfade: don't hold stream lock while sending seeks

This inverts a lock order taken elsewhere, so it can deadlock
if you're unlucky.
parent 94594301
......@@ -1180,7 +1180,6 @@ perform_seek (RBXFadeStream *stream)
GstEvent *event;
rb_debug ("sending seek event..");
g_mutex_lock (&stream->lock);
event = gst_event_new_seek (1.0, GST_FORMAT_TIME,
GST_SEEK_FLAG_FLUSH,
......@@ -1188,6 +1187,7 @@ perform_seek (RBXFadeStream *stream)
GST_SEEK_TYPE_NONE, -1);
gst_pad_send_event (stream->src_pad, event);
g_mutex_lock (&stream->lock);
switch (stream->state) {
case SEEKING:
stream->state = PLAYING;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment