[gnome-dvb-daemon/gst-1.0] Adapted to API changes in gst-rtsp-server from master

[Sebastian Polsterl <sebp src gnome org>]

commit fdd917b70db39a71479550622d53d3f8781bd161
Author: Sebastian Pölsterl <sebp k-d-w org>
Date:   Sun Oct 13 00:33:55 2013 +0200

    Adapted to API changes in gst-rtsp-server from master

 Makefile.am                |    1 -
 src/Main.vala              |    8 ++++----
 src/rtsp/MediaMapping.vala |   34 ----------------------------------
 src/rtsp/Server.vala       |    9 +++++----
 4 files changed, 9 insertions(+), 43 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5e7f7d1..ea60bf4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,6 @@ gnome_dvb_daemon_SOURCES = \
        src/Timer.vala \
        src/Utils.vala \
        src/rtsp/MediaFactory.vala \
-       src/rtsp/MediaMapping.vala \
        src/rtsp/Server.vala \
        src/rygel/Interfaces2.vala \
        src/rygel/Services2.vala \
diff --git a/src/Main.vala b/src/Main.vala
index ec03b75..1c9a8ca 100644
--- a/src/Main.vala
+++ b/src/Main.vala
@@ -101,16 +101,16 @@ namespace Main {
 
     private static bool check_requirements () {
         bool val;
-        val = check_feature_version ("dvbsrc", 0, 10, 13);
+        val = check_feature_version ("dvbsrc", 1, 2, 0);
         if (!val) return false;
 
-        val = check_feature_version ("dvbbasebin", 0, 10, 13);
+        val = check_feature_version ("dvbbasebin", 1, 2, 0);
         if (!val) return false;
 
-        val = check_feature_version ("mpegtsparse", 0, 10, 13);
+        val = check_feature_version ("tsparse", 1, 2, 0);
         if (!val) return false;
 
-        val = check_feature_version ("rtpmp2tpay", 0, 10, 14);
+        val = check_feature_version ("rtpmp2tpay", 1, 0, 0);
         return val;
     }
 
diff --git a/src/rtsp/Server.vala b/src/rtsp/Server.vala
index f7616ab..73b427d 100644
--- a/src/rtsp/Server.vala
+++ b/src/rtsp/Server.vala
@@ -51,7 +51,7 @@ namespace DVB.RTSPServer {
         log = LogManager.getLogManager().getDefaultLogger();
         log.info ("Starting RTSP server");
         server = new Gst.RTSPServer ();
-        server.set_media_mapping (new MediaMapping ());
+        server.get_mount_points().add_factory("/", new MediaFactory());
         server.set_address (get_address ());
         server.attach (null);
         timeout_id = GLib.Timeout.add_seconds (2, (GLib.SourceFunc)timeout);
@@ -76,15 +76,16 @@ namespace DVB.RTSPServer {
     }
 
     private class StopChannelHelper {
-        private Gst.RTSP.Url url;
+        private string url;
 
         public StopChannelHelper (string url_str) {
-            Gst.RTSP.url_parse (url_str, out this.url);
+            this.url = url_str;
         }
 
         public Gst.RTSPFilterResult session_filter_func (Gst.RTSPSessionPool pool,
                 Gst.RTSPSession session) {
-            if (session.get_media (this.url) != null) {
+            int matched;
+            if (session.get_media (this.url, out matched) != null) {
                 return Gst.RTSPFilterResult.REMOVE;
             } else {
                 return Gst.RTSPFilterResult.KEEP;