mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

media: disconnect from signal handlers in unprepare()

Browse source 
We connected to the pad-added and no-more-pads signals in prepare() so
we need to disconnect from them in unprepare().

See https://bugzilla.gnome.org/show_bug.cgi?id=698376
This commit is contained in:
Ognyan Tonchev 2013-04-22 16:40:48 +02:00 committed by Wim Taymans
parent 9b31fcc7f8
commit a26b06cc69
1 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gst/rtsp-server/rtsp-media.c
View file

@ -1406,6 +1406,14 @@ no_more_pads_cb (GstElement * element, GstRTSPMedia * media)
} }
} }
typedef struct _DynPaySignalHandlers DynPaySignalHandlers;
struct _DynPaySignalHandlers
{
gulong pad_added_handler;
gulong no_more_pads_handler;
};
/** /**
* gst_rtsp_media_prepare: * gst_rtsp_media_prepare:
* @media: a #GstRTSPMedia * @media: a #GstRTSPMedia
@ -1490,11 +1498,16 @@ gst_rtsp_media_prepare (GstRTSPMedia * media)
for (walk = priv->dynamic; walk; walk = g_list_next (walk)) { for (walk = priv->dynamic; walk; walk = g_list_next (walk)) {
GstElement *elem = walk->data; GstElement *elem = walk->data;
DynPaySignalHandlers *handlers = g_slice_new (DynPaySignalHandlers);
GST_INFO ("adding callbacks for dynamic element %p", elem); GST_INFO ("adding callbacks for dynamic element %p", elem);
g_signal_connect (elem, "pad-added", (GCallback) pad_added_cb, media); handlers->pad_added_handler = g_signal_connect (elem, "pad-added",
g_signal_connect (elem, "no-more-pads", (GCallback) no_more_pads_cb, media); (GCallback) pad_added_cb, media);
handlers->no_more_pads_handler = g_signal_connect (elem, "no-more-pads",
(GCallback) no_more_pads_cb, media);
g_object_set_data (G_OBJECT (elem), "gst-rtsp-dynpay-handlers", handlers);
/* we add a fakesink here in order to make the state change async. We remove /* we add a fakesink here in order to make the state change async. We remove
* the fakesink again in the no-more-pads callback. */ * the fakesink again in the no-more-pads callback. */
@ -1590,6 +1603,7 @@ finish_unprepare (GstRTSPMedia * media)
{ {
GstRTSPMediaPrivate *priv = media->priv; GstRTSPMediaPrivate *priv = media->priv;
gint i; gint i;
GList *walk;
GST_DEBUG ("shutting down"); GST_DEBUG ("shutting down");
@ -1605,6 +1619,21 @@ finish_unprepare (GstRTSPMedia * media)
gst_rtsp_stream_leave_bin (stream, GST_BIN (priv->pipeline), priv->rtpbin); gst_rtsp_stream_leave_bin (stream, GST_BIN (priv->pipeline), priv->rtpbin);
} }
/* remove the pad signal handlers */
for (walk = priv->dynamic; walk; walk = g_list_next (walk)) {
GstElement *elem = walk->data;
DynPaySignalHandlers *handlers;
handlers = g_object_steal_data (G_OBJECT (elem), "gst-rtsp-dypay-handlers");
g_assert (handlers != NULL);
g_signal_handler_disconnect (G_OBJECT (elem), handlers->pad_added_handler);
g_signal_handler_disconnect (G_OBJECT (elem),
handlers->no_more_pads_handler);
g_slice_free (DynPaySignalHandlers, handlers);
}
gst_bin_remove (GST_BIN (priv->pipeline), priv->rtpbin); gst_bin_remove (GST_BIN (priv->pipeline), priv->rtpbin);
priv->rtpbin = NULL; priv->rtpbin = NULL;