mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 13:08:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-server: add missing GST_EXPORT and export deprecated funcs

Browse source
This commit is contained in:
Tim-Philipp Müller 2017-11-26 12:47:08 +00:00
parent bad6f5690a
commit 58aa58f049
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/rtsp-server/rtsp-media.h
View file

@ -362,6 +362,8 @@ GstRTSPStream * gst_rtsp_media_find_stream (GstRTSPMedia *media, cons
GST_EXPORT
gboolean gst_rtsp_media_seek (GstRTSPMedia *media, GstRTSPTimeRange *range);
GST_EXPORT
gboolean gst_rtsp_media_seek_full (GstRTSPMedia *media,
GstRTSPTimeRange *range,
GstSeekFlags flags);

9
gst/rtsp-server/rtsp-server.h
View file

@ -24,6 +24,15 @@
G_BEGIN_DECLS
/* Do *not* use these defines outside of rtsp-server. Use G_DEPRECATED instead. */
#ifdef GST_DISABLE_DEPRECATED
#define GST_RTSP_SERVER_DEPRECATED GST_EXPORT
#define GST_RTSP_SERVER_DEPRECATED_FOR(f) GST_EXPORT
#else
#define GST_RTSP_SERVER_DEPRECATED G_DEPRECATED GST_EXPORT
#define GST_RTSP_SERVER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) GST_EXPORT
#endif
typedef struct _GstRTSPServer GstRTSPServer;
typedef struct _GstRTSPServerClass GstRTSPServerClass;
typedef struct _GstRTSPServerPrivate GstRTSPServerPrivate;

7
gst/rtsp-server/rtsp-session.c
View file

@ -681,10 +681,6 @@ gst_rtsp_session_next_timeout_usec (GstRTSPSession * session, gint64 now)
* Deprecated: Use gst_rtsp_session_next_timeout_usec() instead.
*/
#ifndef GST_REMOVE_DEPRECATED
#ifdef GST_DISABLE_DEPRECATED
gint gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now);
#endif
gint
gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now)
{
@ -756,9 +752,6 @@ gst_rtsp_session_is_expired_usec (GstRTSPSession * session, gint64 now)
* Deprecated: Use gst_rtsp_session_is_expired_usec() instead.
*/
#ifndef GST_REMOVE_DEPRECATED
#ifdef GST_DISABLE_DEPRECATED
gboolean gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now);
#endif
gboolean
gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now)
{

8
gst/rtsp-server/rtsp-session.h
View file

@ -20,6 +20,7 @@
#include <gst/gst.h>
#include <gst/rtsp/gstrtsptransport.h>
#include <gst/rtsp-server/rtsp-server.h> /* for GST_RTSP_SERVER_DEPRECATED_FOR */
#ifndef __GST_RTSP_SESSION_H__
#define __GST_RTSP_SESSION_H__
@ -115,13 +116,12 @@ gint gst_rtsp_session_next_timeout_usec (GstRTSPSession *se
GST_EXPORT
gboolean gst_rtsp_session_is_expired_usec (GstRTSPSession *session, gint64 now);
#ifndef GST_DISABLE_DEPRECATED
GST_EXPORT
GST_RTSP_SERVER_DEPRECATED_FOR(gst_rtsp_session_next_timeout_usec)
gint gst_rtsp_session_next_timeout (GstRTSPSession *session, GTimeVal *now);
GST_EXPORT
GST_RTSP_SERVER_DEPRECATED_FOR(gst_rtsp_session_is_expired_usec)
gboolean gst_rtsp_session_is_expired (GstRTSPSession *session, GTimeVal *now);
#endif
/* handle media in a session */