server: Support all objects in HTTPRequest

4 files changed, 27 insertions, 17 deletions

diff --git a/tests/rygel-http-byte-seek-test.vala b/tests/rygel-http-byte-seek-test.vala
index c3706132..b64e09a9 100644
--- a/tests/rygel-http-byte-seek-test.vala
+++ b/tests/rygel-http-byte-seek-test.vala
@@ -27,10 +27,13 @@ private errordomain Rygel.TestError {
 
 private class Rygel.HTTPIdentityHandler : GLib.Object {}
 
-private class Rygel.MediaItem : GLib.Object {
+public class Rygel.MediaObject : GLib.Object {
     public int64 size = 2048;
 }
 
+private class Rygel.MediaItem : MediaObject {
+}
+
 private class Rygel.Thumbnail : GLib.Object {
     public int64 size = 1024;
 }
@@ -39,11 +42,14 @@ private class Rygel.Subtitle : GLib.Object {
     public int64 size = 512;
 }
 
+public class Rygel.MediaContainer : MediaObject {
+}
+
 private class Rygel.HTTPGet : GLib.Object {
     public const string ITEM_URI = "http://DoesntMatterWhatThisIs";
 
     public Soup.Message msg;
-    public MediaItem item;
+    public MediaObject object;
     public Thumbnail thumbnail;
     public Subtitle subtitle;
 
@@ -51,7 +57,7 @@ private class Rygel.HTTPGet : GLib.Object {
 
     public HTTPGet (Thumbnail? thumbnail, Subtitle? subtitle) {
         this.msg = new Soup.Message ("HTTP", ITEM_URI);
-        this.item = new MediaItem ();
+        this.object = new MediaItem ();
         this.handler = new HTTPIdentityHandler ();
         this.thumbnail = thumbnail;
         this.subtitle = subtitle;
@@ -155,7 +161,7 @@ private class Rygel.HTTPByteSeekTest : GLib.Object {
         } else if (request.subtitle != null) {
             size = request.subtitle.size;
         } else {
-            size = request.item.size;
+            size = request.object.size;
         }
 
         this.test_seek (request, 0, size - 1);
@@ -172,7 +178,7 @@ private class Rygel.HTTPByteSeekTest : GLib.Object {
         } else if (request.subtitle != null) {
             size = request.subtitle.size;
         } else {
-            size = request.item.size;
+            size = request.object.size;
         }
 
         this.test_seek (request, 128, size - 1);
@@ -214,7 +220,7 @@ private class Rygel.HTTPByteSeekTest : GLib.Object {
         } else if (request.subtitle != null) {
             assert (seek.total_length == request.subtitle.size);
         } else {
-            assert (seek.total_length == request.item.size);
+            assert (seek.total_length == request.object.size);
         }
 
         if (request.msg.request_headers.get_one ("Range") != null) {
diff --git a/tests/rygel-http-get-test.vala b/tests/rygel-http-get-test.vala
index 3eb9cdad..5a8e5bcb 100644
--- a/tests/rygel-http-get-test.vala
+++ b/tests/rygel-http-get-test.vala
@@ -217,7 +217,7 @@ public class Rygel.HTTPGetTest : GLib.Object {
 
             yield request.run ();
 
-            assert ((request as HTTPGet).item != null);
+            assert ((request as HTTPGet).object != null);
 
             debug ("status.code: %d", (int) msg.status_code);
             assert (msg.status_code == this.current_request.expected_code);
diff --git a/tests/rygel-http-post-test.vala b/tests/rygel-http-post-test.vala
index ffaf2993..80978407 100644
--- a/tests/rygel-http-post-test.vala
+++ b/tests/rygel-http-post-test.vala
@@ -339,7 +339,6 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
 
     public signal void container_updated (MediaContainer container);
 
-    public string id = "TesContainer";
     public MediaItem item;
     private bool vanish;
     private bool error;
@@ -352,6 +351,7 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
         this.item = new MediaItem (ITEM_ID, this);
         this.vanish = false;
         this.error = false;
+        this.id = "TesContainer";
 
         this.monitor = this.file.monitor_file (FileMonitorFlags.NONE);
         this.monitor.changed.connect (this.on_file_changed);
@@ -414,9 +414,6 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
 public class Rygel.MediaItem : Rygel.MediaObject {
     public const string URI = "file:///tmp/rygel-upload-test.wav";
 
-    public weak MediaContainer parent;
-
-    public string id;
     public long size = 1024;
     public long duration = 1024;
     public ArrayList<string> uris = new ArrayList<string> ();
@@ -502,6 +499,8 @@ public class Rygel.ItemRemovalQueue: GLib.Object {
 }
 
 public class Rygel.MediaObject : GLib.Object {
+    public string id;
+    public unowned MediaContainer parent;
     public string mime_type = "";
 }
 
diff --git a/tests/rygel-http-time-seek-test.vala b/tests/rygel-http-time-seek-test.vala
index 3e7283b3..c24c2ac8 100644
--- a/tests/rygel-http-time-seek-test.vala
+++ b/tests/rygel-http-time-seek-test.vala
@@ -27,9 +27,14 @@ private errordomain Rygel.TestError {
 
 private class Rygel.HTTPTranscodeHandler : GLib.Object {}
 
-private abstract class Rygel.MediaItem : GLib.Object {
+public class Rygel.MediaObject : GLib.Object {
     public int64 size = -1;
+}
+
+public class Rygel.MediaContainer : MediaObject {
+}
 
+private abstract class Rygel.MediaItem : MediaObject {
     public bool is_live_stream () {
         return true;
     }
@@ -46,7 +51,7 @@ private class Rygel.HTTPGet : GLib.Object {
     public const string ITEM_URI = "http://DoesntMatterWhatThisIs";
 
     public Soup.Message msg;
-    public MediaItem item;
+    public MediaObject object;
     public Thumbnail thumbnail;
     public Subtitle subtitle;
 
@@ -54,7 +59,7 @@ private class Rygel.HTTPGet : GLib.Object {
 
     public HTTPGet (Thumbnail? thumbnail, Subtitle? subtitle) {
         this.msg = new Soup.Message ("HTTP", ITEM_URI);
-        this.item = new AudioItem ();
+        this.object = new AudioItem ();
         this.handler = new HTTPTranscodeHandler ();
         this.thumbnail = thumbnail;
         this.subtitle = subtitle;
@@ -164,7 +169,7 @@ private class Rygel.HTTPTimeSeekTest : GLib.Object {
     private void test_no_seek (Thumbnail? thumbnail,
                                Subtitle?  subtitle) throws HTTPSeekError {
         var request = new HTTPGet (thumbnail, subtitle);
-        var audio_item = request.item as AudioItem;
+        var audio_item = request.object as AudioItem;
         this.test_seek (request,
                         0,
                         audio_item.duration * TimeSpan.SECOND - TimeSpan.MILLISECOND);
@@ -187,7 +192,7 @@ private class Rygel.HTTPTimeSeekTest : GLib.Object {
             break;
         }
 
-        var audio_item = request.item as AudioItem;
+        var audio_item = request.object as AudioItem;
         this.test_seek (request,
                         128 * TimeSpan.SECOND,
                         audio_item.duration * TimeSpan.SECOND - TimeSpan.MILLISECOND);
@@ -264,7 +269,7 @@ private class Rygel.HTTPTimeSeekTest : GLib.Object {
         assert (seek.stop == stop);
         assert (seek.length == seek.stop + TimeSpan.MILLISECOND - seek.start);
 
-        var audio_item = request.item as AudioItem;
+        var audio_item = request.object as AudioItem;
         assert (seek.total_length == audio_item.duration * TimeSpan.SECOND);
 
         var header = request.msg.response_headers.get_one