core,plugins: Don't pass GUPnP.Context to MediaServer plugins

diff --git a/src/plugins/external/rygel-external-plugin.vala b/src/plugins/external/rygel-external-plugin.vala
index 78716fa..e37edf0 100644 (file)
--- a/src/plugins/external/rygel-external-plugin.vala
+++ b/src/plugins/external/rygel-external-plugin.vala
@@ -51,7 +51,7 @@ public class Rygel.External.Plugin : Rygel.MediaServerPlugin {
         }
     }
 
-    public override MediaContainer get_root_container (GUPnP.Context context) {
+    public override MediaContainer get_root_container () {
         Container root_container = null;
 
         try {

diff --git a/src/plugins/gst-launch/rygel-gst-launch-plugin.vala b/src/plugins/gst-launch/rygel-gst-launch-plugin.vala
index 967ffc8..c20aca6 100644 (file)
--- a/src/plugins/gst-launch/rygel-gst-launch-plugin.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-plugin.vala
@@ -34,7 +34,7 @@ public class Rygel.GstLaunch.Plugin : Rygel.MediaServerPlugin {
         base ("GstLaunch", "Gst Launch");
     }
 
-    public override MediaContainer get_root_container (GUPnP.Context context) {
+    public override MediaContainer get_root_container () {
         return new RootContainer (this.title);
     }
 }

diff --git a/src/plugins/media-export/rygel-media-export-plugin.vala b/src/plugins/media-export/rygel-media-export-plugin.vala
index f52ada4..1774b16 100644 (file)
--- a/src/plugins/media-export/rygel-media-export-plugin.vala
+++ b/src/plugins/media-export/rygel-media-export-plugin.vala
@@ -78,7 +78,7 @@ public class Rygel.MediaExport.Plugin : Rygel.MediaServerPlugin {
         base (OUR_PLUGIN, _("@REALNAME@'s media"));
     }
 
-    public override MediaContainer get_root_container (GUPnP.Context context) {
+    public override MediaContainer get_root_container () {
         try {
             return RootContainer.get_instance ();
         } catch (Error error) {

diff --git a/src/plugins/mediathek/rygel-mediathek-plugin.vala b/src/plugins/mediathek/rygel-mediathek-plugin.vala
index 3b500b4..691803d 100644 (file)
--- a/src/plugins/mediathek/rygel-mediathek-plugin.vala
+++ b/src/plugins/mediathek/rygel-mediathek-plugin.vala
@@ -34,7 +34,7 @@ public class Rygel.Mediathek.Plugin : Rygel.MediaServerPlugin {
         base ("ZDFMediathek", "ZDF Mediathek");
     }
 
-    public override MediaContainer get_root_container (GUPnP.Context context) {
+    public override MediaContainer get_root_container () {
         return RootContainer.get_instance ();
     }
 }

diff --git a/src/plugins/test/rygel-test-plugin.vala b/src/plugins/test/rygel-test-plugin.vala
index fe49074..bb5a7cd 100644 (file)
--- a/src/plugins/test/rygel-test-plugin.vala
+++ b/src/plugins/test/rygel-test-plugin.vala
@@ -36,7 +36,7 @@ public class Rygel.Test.Plugin : Rygel.MediaServerPlugin {
         base ("Test", "Test Streams");
     }
 
-    public override MediaContainer get_root_container (GUPnP.Context context) {
+    public override MediaContainer get_root_container () {
         return new RootContainer (this.title);
     }
 }

diff --git a/src/plugins/tracker/rygel-tracker-plugin.vala b/src/plugins/tracker/rygel-tracker-plugin.vala
index a2346c1..08d2ab3 100644 (file)
--- a/src/plugins/tracker/rygel-tracker-plugin.vala
+++ b/src/plugins/tracker/rygel-tracker-plugin.vala
@@ -32,7 +32,7 @@ public class Rygel.Tracker.Plugin : Rygel.MediaServerPlugin {
               _("@REALNAME@'s media"));
     }
 
-    public override MediaContainer get_root_container (GUPnP.Context context) {
+    public override MediaContainer get_root_container () {
         if (root_container == null) {
             root_container = new RootContainer (this.title);
         }

diff --git a/src/rygel/rygel-content-directory.vala b/src/rygel/rygel-content-directory.vala
index d5760d6..1466ac1 100644 (file)
--- a/src/rygel/rygel-content-directory.vala
+++ b/src/rygel/rygel-content-directory.vala
@@ -71,7 +71,7 @@ internal class Rygel.ContentDirectory: Service {
 
         var plugin = this.root_device.resource_factory as MediaServerPlugin;
 
-        this.root_container = plugin.get_root_container (this.context);
+        this.root_container = plugin.get_root_container ();
         this.http_server = new HTTPServer (this, plugin.name);
 
         this.updated_containers =  new ArrayList<MediaContainer> ();

diff --git a/src/rygel/rygel-media-server-plugin.vala b/src/rygel/rygel-media-server-plugin.vala
index 8c26063..b5e347f 100644 (file)
--- a/src/rygel/rygel-media-server-plugin.vala
+++ b/src/rygel/rygel-media-server-plugin.vala
@@ -51,6 +51,6 @@ public abstract class Rygel.MediaServerPlugin : Rygel.Plugin {
         this.add_resource (info);
     }
 
-    public abstract MediaContainer get_root_container (GUPnP.Context context);
+    public abstract MediaContainer get_root_container ();
 }