mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pvsink: fix cleanup

Browse source
This commit is contained in:
Wim Taymans 2015-06-05 18:21:18 +02:00
parent 7e5fcf6771
commit 83223f0a83
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gst/gstpvsink.c
View file

@ -448,9 +448,6 @@ gst_pulsevideo_sink_close (GstPulsevideoSink * pvsink)
g_mutex_unlock (&pvsink->lock); g_mutex_unlock (&pvsink->lock);
} }
g_clear_object (&pvsink->stream);
g_clear_object (&pvsink->ctx);
return TRUE; return TRUE;
} }
@ -466,13 +463,13 @@ gst_pulsevideo_sink_change_state (GstElement * element, GstStateChange transitio
g_print ("context %p\n", this->context); g_print ("context %p\n", this->context);
this->loop = g_main_loop_new (this->context, FALSE); this->loop = g_main_loop_new (this->context, FALSE);
this->thread = g_thread_new ("pulsevideo", (GThreadFunc) handle_mainloop, this); this->thread = g_thread_new ("pulsevideo", (GThreadFunc) handle_mainloop, this);
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!gst_pulsevideo_sink_open (this)) { if (!gst_pulsevideo_sink_open (this)) {
ret = GST_STATE_CHANGE_FAILURE; ret = GST_STATE_CHANGE_FAILURE;
goto exit; goto exit;
} }
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
/* uncork and start recording */ /* uncork and start recording */
break; break;
@ -489,12 +486,14 @@ gst_pulsevideo_sink_change_state (GstElement * element, GstStateChange transitio
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_pulsevideo_sink_close (this);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_pulsevideo_sink_close (this);
g_main_loop_quit (this->loop); g_main_loop_quit (this->loop);
g_thread_join (this->thread); g_thread_join (this->thread);
g_main_loop_unref (this->loop); g_main_loop_unref (this->loop);
g_clear_object (&this->stream);
g_clear_object (&this->ctx);
g_main_context_unref (this->context); g_main_context_unref (this->context);
break; break;
default: default: