summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlba Mendez <me@alba.sh>2021-03-18 17:42:02 +0000
committerTim-Philipp Müller <tim@centricular.com>2021-03-25 14:59:27 +0000
commitdb27dc44f308387e4e06a08be75257cc16b7cd82 (patch)
tree82c1ed8505fdf16e71e3ae4a43a61d98c91d2753
parent6c6b7ef21baacadc0a2a3e818d8ebecc63224986 (diff)
downloadgstreamer-plugins-good-db27dc44f308387e4e06a08be75257cc16b7cd82.tar.gz
rtspsrc: Fix more signals
Behaviour change in GLib causes select-stream signal to discard the value returned by handlers. See !909 for more info. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/920>
-rw-r--r--docs/gst_plugins_cache.json2
-rw-r--r--gst/rtsp/gstrtspsrc.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/docs/gst_plugins_cache.json b/docs/gst_plugins_cache.json
index 2d794aae8..064f93ef3 100644
--- a/docs/gst_plugins_cache.json
+++ b/docs/gst_plugins_cache.json
@@ -20804,7 +20804,7 @@
}
],
"return-type": "gboolean",
- "when": "first"
+ "when": "last"
},
"set-parameter": {
"action": true,
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 9dc67f380..add286b53 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -1060,7 +1060,7 @@ gst_rtspsrc_class_init (GstRTSPSrcClass * klass)
*/
gst_rtspsrc_signals[SIGNAL_SELECT_STREAM] =
g_signal_new_class_handler ("select-stream", G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_CLEANUP,
+ G_SIGNAL_RUN_LAST,
(GCallback) default_select_stream, select_stream_accum, NULL, NULL,
G_TYPE_BOOLEAN, 2, G_TYPE_UINT, GST_TYPE_CAPS);
/**
@@ -1075,8 +1075,7 @@ gst_rtspsrc_class_init (GstRTSPSrcClass * klass)
*/
gst_rtspsrc_signals[SIGNAL_NEW_MANAGER] =
g_signal_new_class_handler ("new-manager", G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_CLEANUP, 0, NULL, NULL, NULL,
- G_TYPE_NONE, 1, GST_TYPE_ELEMENT);
+ 0, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT);
/**
* GstRTSPSrc::request-rtcp-key:
@@ -1091,7 +1090,7 @@ gst_rtspsrc_class_init (GstRTSPSrcClass * klass)
*/
gst_rtspsrc_signals[SIGNAL_REQUEST_RTCP_KEY] =
g_signal_new ("request-rtcp-key", G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, GST_TYPE_CAPS, 1, G_TYPE_UINT);
+ 0, 0, NULL, NULL, NULL, GST_TYPE_CAPS, 1, G_TYPE_UINT);
/**
* GstRTSPSrc::accept-certificate: