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

rtsp-session: Only remove deprecated API if requested to do so, not just when disabling

Browse source 
gst_rtsp_session_is_expired() and gst_rtsp_session_next_timeout() were
affected.
This commit is contained in:
Sebastian Dröge 2017-01-12 19:04:23 +02:00
parent 2d9a5722fa
commit 6e145fadf9
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -672,7 +672,10 @@ gst_rtsp_session_next_timeout_usec (GstRTSPSession * session, gint64 now)
* Deprecated: Use gst_rtsp_session_next_timeout_usec() instead. * Deprecated: Use gst_rtsp_session_next_timeout_usec() instead.
*/ */
#ifndef GST_REMOVE_DEPRECATED #ifndef GST_REMOVE_DEPRECATED
#ifndef GST_DISABLE_DEPRECATED #ifdef GST_DISABLE_DEPRECATED
gint gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now);
#endif
gint gint
gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now) gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now)
{ {
@ -709,7 +712,6 @@ gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now)
return res; return res;
} }
#endif #endif
#endif
/** /**
* gst_rtsp_session_is_expired_usec: * gst_rtsp_session_is_expired_usec:
@ -745,7 +747,9 @@ gst_rtsp_session_is_expired_usec (GstRTSPSession * session, gint64 now)
* Deprecated: Use gst_rtsp_session_is_expired_usec() instead. * Deprecated: Use gst_rtsp_session_is_expired_usec() instead.
*/ */
#ifndef GST_REMOVE_DEPRECATED #ifndef GST_REMOVE_DEPRECATED
#ifndef GST_DISABLE_DEPRECATED #ifdef GST_DISABLE_DEPRECATED
gboolean gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now);
#endif
gboolean gboolean
gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now) gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now)
{ {
@ -756,4 +760,3 @@ gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now)
return res; return res;
} }
#endif #endif
#endif