diff options
| author | Jan Schmidt <jan@centricular.com> | 2014-04-30 23:23:42 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2014-04-30 23:23:42 +1000 |
| commit | 328916036e5faf44fe641a008cf72070b72e9998 (patch) | |
| tree | 13e3cb7a1a43d30613c71bcd9b3fbdb242129217 | |
| parent | 62acbd16cb0e0f5e1848352bec7bb8a7980f71cb (diff) | |
Fix RTSP server support.
The pkg-config file for RTSP server was renamed in 2012, so I
guess noone has built RTSP support since then. Fix the build for the
GstRTSPMediaMapping -> GstRTSPMountPoints renaming that happened
a while back too.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | gst-streaming-server/gss-rtsp.c | 9 | ||||
| -rw-r--r-- | gst-streaming-server/gss-rtsp.h | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 3657d75..95ecfe3 100644 --- a/configure.ac +++ b/configure.ac @@ -190,9 +190,9 @@ AG_GST_PKG_CHECK_MODULES(GST, AG_GST_PKG_CHECK_MODULES(GST_CHECK, gstreamer-check-$GST_API_VERSION, yes) AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") -GST_RTSP_SERVER_REQ=0.10.1 +GST_RTSP_SERVER_REQ=1.0.0 AG_GST_PKG_CHECK_MODULES(GST_RTSP_SERVER, - gst-rtsp-server-$GST_API_VERSION >= $GST_RTSP_SERVER_REQ) + gstreamer-rtsp-server-$GST_API_VERSION >= $GST_RTSP_SERVER_REQ) if test "$HAVE_GST_RTSP_SERVER" = yes ; then AC_DEFINE(ENABLE_RTSP, 1, [Enable RTSP]) fi diff --git a/gst-streaming-server/gss-rtsp.c b/gst-streaming-server/gss-rtsp.c index c183b8c..672ca9d 100644 --- a/gst-streaming-server/gss-rtsp.c +++ b/gst-streaming-server/gss-rtsp.c @@ -68,6 +68,7 @@ gss_rtsp_stream_free (GssRtspStream * rtsp_stream) void gss_rtsp_stream_start (GssRtspStream * rtsp_stream) { + GstRTSPMountPoints *mounts; GString *pipe_desc; int pipe_fds[2]; int ret; @@ -92,11 +93,9 @@ gss_rtsp_stream_start (GssRtspStream * rtsp_stream) gst_rtsp_media_factory_set_launch (rtsp_stream->factory, pipe_desc->str); g_string_free (pipe_desc, FALSE); - rtsp_stream->mapping = - gst_rtsp_server_get_media_mapping (rtsp_stream->server); - gst_rtsp_media_mapping_add_factory (rtsp_stream->mapping, "/stream", - rtsp_stream->factory); - g_object_unref (rtsp_stream->mapping); + mounts = gst_rtsp_server_get_mount_points (rtsp_stream->server); + gst_rtsp_mount_points_add_factory (mounts, "/stream", rtsp_stream->factory); + g_object_unref (mounts); g_signal_emit_by_name (rtsp_stream->stream->sink, "add", pipe_fds[1]); diff --git a/gst-streaming-server/gss-rtsp.h b/gst-streaming-server/gss-rtsp.h index 8dbcca5..71bfcb8 100644 --- a/gst-streaming-server/gss-rtsp.h +++ b/gst-streaming-server/gss-rtsp.h @@ -34,7 +34,6 @@ struct _GssRtspStream { GssStream *stream; GstRTSPServer *server; - GstRTSPMediaMapping *mapping; GstRTSPMediaFactory *factory; }; |