mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-06-13 11:39:31 +00:00
Merge branch 'gst-rtsp-server-feature/rtsp-fix-disonnect' into 'main'
rtsp-media-factory: fix typo gst_rtsp_media_factory_is_stop_on_disonnect See merge request gstreamer/gstreamer!989
This commit is contained in:
commit
e8fd5125c8
|
@ -441,7 +441,7 @@ gst_rtsp_media_factory_get_property (GObject * object, guint propid,
|
|||
break;
|
||||
case PROP_STOP_ON_DISCONNECT:
|
||||
g_value_set_boolean (value,
|
||||
gst_rtsp_media_factory_is_stop_on_disonnect (factory));
|
||||
gst_rtsp_media_factory_is_stop_on_disconnect (factory));
|
||||
break;
|
||||
case PROP_CLOCK:
|
||||
g_value_take_object (value, gst_rtsp_media_factory_get_clock (factory));
|
||||
|
@ -1318,6 +1318,27 @@ gst_rtsp_media_factory_set_stop_on_disconnect (GstRTSPMediaFactory * factory,
|
|||
GST_RTSP_MEDIA_FACTORY_UNLOCK (factory);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_rtsp_media_factory_is_stop_on_disonnect:
|
||||
* @factory: a #GstRTSPMediaFactory
|
||||
*
|
||||
* Get if media created from this factory should be stopped when a client
|
||||
* disconnects without sending TEARDOWN.
|
||||
*
|
||||
* Deprecated: Use gst_rtsp_media_factory_is_stop_on_disconnect() instead.
|
||||
*
|
||||
* Returns: %TRUE if the media will be stopped when a client disconnects
|
||||
* without sending TEARDOWN.
|
||||
*/
|
||||
#ifndef GST_REMOVE_DEPRECATED
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS gboolean
|
||||
gst_rtsp_media_factory_is_stop_on_disonnect (GstRTSPMediaFactory * factory)
|
||||
{
|
||||
return gst_rtsp_media_factory_is_stop_on_disconnect (factory);
|
||||
}
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
#endif
|
||||
|
||||
/**
|
||||
* gst_rtsp_media_factory_is_stop_on_disconnect:
|
||||
* @factory: a #GstRTSPMediaFactory
|
||||
|
@ -1325,11 +1346,13 @@ gst_rtsp_media_factory_set_stop_on_disconnect (GstRTSPMediaFactory * factory,
|
|||
* Get if media created from this factory should be stopped when a client
|
||||
* disconnects without sending TEARDOWN.
|
||||
*
|
||||
* Since: 1.20
|
||||
*
|
||||
* Returns: %TRUE if the media will be stopped when a client disconnects
|
||||
* without sending TEARDOWN.
|
||||
*/
|
||||
gboolean
|
||||
gst_rtsp_media_factory_is_stop_on_disonnect (GstRTSPMediaFactory * factory)
|
||||
gst_rtsp_media_factory_is_stop_on_disconnect (GstRTSPMediaFactory * factory)
|
||||
{
|
||||
GstRTSPMediaFactoryPrivate *priv;
|
||||
gboolean result;
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/rtsp/gstrtspurl.h>
|
||||
#include "rtsp-server-prelude.h" /* for GST_RTSP_SERVER_DEPRECATED_FOR */
|
||||
|
||||
#include "rtsp-media.h"
|
||||
#include "rtsp-permissions.h"
|
||||
|
@ -140,8 +141,13 @@ GST_RTSP_SERVER_API
|
|||
void gst_rtsp_media_factory_set_stop_on_disconnect (GstRTSPMediaFactory *factory,
|
||||
gboolean stop_on_disconnect);
|
||||
|
||||
GST_RTSP_SERVER_API
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
GST_RTSP_SERVER_DEPRECATED_FOR(gst_rtsp_media_factory_is_stop_on_disconnect)
|
||||
gboolean gst_rtsp_media_factory_is_stop_on_disonnect (GstRTSPMediaFactory *factory);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
|
||||
GST_RTSP_SERVER_API
|
||||
gboolean gst_rtsp_media_factory_is_stop_on_disconnect (GstRTSPMediaFactory *factory);
|
||||
|
||||
GST_RTSP_SERVER_API
|
||||
void gst_rtsp_media_factory_set_suspend_mode (GstRTSPMediaFactory *factory,
|
||||
|
|
Loading…
Reference in a new issue