all: Refactoring of the MediaObject class hierarchy

Introduce a MediaFileItem class that represents a single file

Signed-off-by: Jens Georg <mail@jensge.org>

https://bugzilla.gnome.org/show_bug.cgi?id=720218

6 files changed, 32 insertions, 29 deletions

diff --git a/tests/rygel-http-byte-seek-test.vala b/tests/rygel-http-byte-seek-test.vala
index 087a6619..dd6329a8 100644
--- a/tests/rygel-http-byte-seek-test.vala
+++ b/tests/rygel-http-byte-seek-test.vala
@@ -31,7 +31,7 @@ public class Rygel.MediaObject : GLib.Object {
     public int64 size = 2048;
 }
 
-private class Rygel.MediaItem : MediaObject {
+private class Rygel.MediaFileItem : MediaObject {
 }
 
 private class Rygel.Thumbnail : GLib.Object {
@@ -67,7 +67,7 @@ private class Rygel.HTTPGet : GLib.Object {
 
     public HTTPGet (Thumbnail? thumbnail, Subtitle? subtitle) {
         this.msg = new Soup.Message ("HTTP", ITEM_URI);
-        this.object = new MediaItem ();
+        this.object = new MediaFileItem ();
         this.handler = new HTTPIdentityHandler ();
         this.thumbnail = thumbnail;
         this.subtitle = subtitle;
diff --git a/tests/rygel-http-get-test.vala b/tests/rygel-http-get-test.vala
index bd5e2bb3..0d04bc50 100644
--- a/tests/rygel-http-get-test.vala
+++ b/tests/rygel-http-get-test.vala
@@ -388,7 +388,7 @@ internal class Rygel.HTTPPlaylistHandler : Rygel.HTTPGetHandler {
     public static bool is_supported (string? arg) { return true; }
 }
 
-public abstract class Rygel.MediaItem : Rygel.MediaObject {
+public abstract class Rygel.MediaFileItem : Rygel.MediaObject {
     public long size = 1024;
     public ArrayList<string> uris = new ArrayList<string> ();
 
@@ -408,7 +408,7 @@ public abstract class Rygel.MediaItem : Rygel.MediaObject {
     }
 }
 
-private class Rygel.AudioItem : MediaItem {
+private class Rygel.AudioItem : MediaFileItem {
     public int64 duration = 2048;
 
     public AudioItem () {
@@ -416,7 +416,7 @@ private class Rygel.AudioItem : MediaItem {
     }
 }
 
-private interface Rygel.VisualItem : MediaItem {
+private interface Rygel.VisualItem : MediaFileItem {
     public abstract int width { get; set; }
     public abstract int height { get; set; }
     public abstract int color_depth { get; set; }
diff --git a/tests/rygel-http-item-uri-test.vala b/tests/rygel-http-item-uri-test.vala
index 1a15353b..6028325f 100644
--- a/tests/rygel-http-item-uri-test.vala
+++ b/tests/rygel-http-item-uri-test.vala
@@ -76,7 +76,7 @@ private class Rygel.MediaObject : GLib.Object {
     public string id;
 }
 
-private class Rygel.MediaItem : Rygel.MediaObject {
+private class Rygel.MediaFileItem : Rygel.MediaObject {
     public ArrayList<string> uris = new ArrayList<string> ();
     public string mime_type;
     public Gee.ArrayList<string> get_uris () { return this.uris; }
@@ -86,7 +86,7 @@ private class Rygel.Thumbnail {
     public string file_extension;
 }
 
-private class Rygel.VisualItem : MediaItem {
+private class Rygel.VisualItem : MediaFileItem {
     public ArrayList<Thumbnail> thumbnails = new ArrayList<Thumbnail> ();
 }
 
@@ -98,7 +98,7 @@ private class Rygel.VideoItem : VisualItem {
     public ArrayList<Subtitle> subtitles = new ArrayList<Subtitle> ();
 }
 
-private class Rygel.MusicItem : MediaItem {
+private class Rygel.MusicItem : MediaFileItem {
     public Thumbnail album_art;
 }
 
diff --git a/tests/rygel-http-post-test.vala b/tests/rygel-http-post-test.vala
index 34d35a26..25eff3c1 100644
--- a/tests/rygel-http-post-test.vala
+++ b/tests/rygel-http-post-test.vala
@@ -38,7 +38,7 @@ public class Rygel.ClientHacks {
         throw new ClientHacksError.NA ("");
     }
 
-    public void apply (MediaItem item) {
+    public void apply (MediaFileItem item) {
     }
 }
 
@@ -102,7 +102,7 @@ public class Rygel.HTTPPostTest : GLib.Object {
 
     public virtual void run () throws Error {
         // cleanup
-        var file = File.new_for_uri (MediaItem.URI);
+        var file = File.new_for_uri (MediaFileItem.URI);
         FileUtils.remove (file.get_path ());
 
         Timeout.add_seconds (10, this.on_timeout);
@@ -254,14 +254,14 @@ public class Rygel.HTTPServer : GLib.Object {
 
     public string uri {
         owned get {
-			var item = new MediaItem (MediaContainer.ITEM_ID, this.root_container);
+			var item = new MediaFileItem (MediaContainer.ITEM_ID, this.root_container);
 			var item_uri = new HTTPItemURI (item, this);
             return item_uri.to_string ();
         }
     }
 
     public string create_uri(string item_id) {
-        var item = new MediaItem (item_id, this.root_container);
+        var item = new MediaFileItem (item_id, this.root_container);
         var item_uri = new HTTPItemURI (item, this);
         return item_uri.to_string ();
     }
@@ -339,7 +339,7 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
 
     public signal void container_updated (MediaContainer container);
 
-    public MediaItem item;
+    public MediaFileItem item;
     private bool vanish;
     private bool error;
 
@@ -347,8 +347,8 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
     private FileMonitor monitor;
 
     public MediaContainer () {
-        this.file = File.new_for_uri (MediaItem.URI);
-        this.item = new MediaItem (ITEM_ID, this);
+        this.file = File.new_for_uri (MediaFileItem.URI);
+        this.item = new MediaFileItem (ITEM_ID, this);
         this.vanish = false;
         this.error = false;
         this.id = "TesContainer";
@@ -392,7 +392,7 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
         }
 
         if (item_id != this.item.id) {
-            this.item = new MediaItem (item_id, this);
+            this.item = new MediaFileItem (item_id, this);
         }
 
         return this.item;
@@ -416,7 +416,7 @@ public class Rygel.MediaContainer : Rygel.MediaObject {
     }
 }
 
-public class Rygel.MediaItem : Rygel.MediaObject {
+public class Rygel.MediaFileItem : Rygel.MediaObject {
     public const string URI = "file:///tmp/rygel-upload-test.wav";
 
     public long size = 1024;
@@ -428,9 +428,9 @@ public class Rygel.MediaItem : Rygel.MediaObject {
 
     public File file;
 
-    public MediaItem.for_visual_item () {}
+    public MediaFileItem.for_visual_item () {}
 
-    public MediaItem (string id, MediaContainer parent) {
+    public MediaFileItem (string id, MediaContainer parent) {
         this.id = id;
         this.parent = parent;
 
@@ -514,7 +514,7 @@ public class Rygel.Thumbnail : GLib.Object {
     public string file_extension;
 }
 
-public class Rygel.VisualItem : Rygel.MediaItem {
+public class Rygel.VisualItem : Rygel.MediaFileItem {
     public ArrayList<Thumbnail> thumbnails = new ArrayList<Thumbnail> ();
 
     public VisualItem () {
@@ -530,7 +530,7 @@ private class Rygel.VideoItem : Rygel.VisualItem {
     public ArrayList<Subtitle> subtitles = new ArrayList<Subtitle> ();
 }
 
-private class Rygel.MusicItem : MediaItem {
+private class Rygel.MusicItem : MediaFileItem {
     public Thumbnail album_art;
 
     public MusicItem (string id, MediaContainer parent) {
diff --git a/tests/rygel-http-time-seek-test.vala b/tests/rygel-http-time-seek-test.vala
index e916c686..47a6fb57 100644
--- a/tests/rygel-http-time-seek-test.vala
+++ b/tests/rygel-http-time-seek-test.vala
@@ -34,13 +34,13 @@ public class Rygel.MediaObject : GLib.Object {
 public class Rygel.MediaContainer : MediaObject {
 }
 
-private abstract class Rygel.MediaItem : MediaObject {
+private abstract class Rygel.MediaFileItem : MediaObject {
     public bool is_live_stream () {
         return true;
     }
 }
 
-private class Rygel.AudioItem : MediaItem {
+private class Rygel.AudioItem : MediaFileItem {
     public int64 duration = 2048;
 }
 
diff --git a/tests/rygel-object-creator-test.vala b/tests/rygel-object-creator-test.vala
index 99af3c84..08f4efb8 100644
--- a/tests/rygel-object-creator-test.vala
+++ b/tests/rygel-object-creator-test.vala
@@ -160,13 +160,16 @@ public interface Rygel.TrackableItem : Rygel.MediaItem {
 }
 
 public class Rygel.MediaItem : Rygel.MediaObject {
+}
+
+public class Rygel.MediaFileItem : Rygel.MediaItem {
     public string dlna_profile;
     public string mime_type;
     public long size;
     public bool place_holder;
     public string date;
 
-    public MediaItem (string id, MediaContainer parent, string title) {
+    public MediaFileItem (string id, MediaContainer parent, string title) {
         this.id = id;
         this.parent = parent;
         this.title = title;
@@ -182,7 +185,7 @@ public class Rygel.MusicItem : Rygel.AudioItem {
     }
 }
 
-public class Rygel.AudioItem : Rygel.MediaItem {
+public class Rygel.AudioItem : Rygel.MediaFileItem {
     public const string UPNP_CLASS = "object.item.audioItem";
     public string artist;
     public string album;
@@ -191,21 +194,21 @@ public class Rygel.AudioItem : Rygel.MediaItem {
         base (id, parent, title);
     }
 }
-public class Rygel.ImageItem : Rygel.MediaItem {
+public class Rygel.ImageItem : Rygel.MediaFileItem {
     public new const string UPNP_CLASS = "object.item.imageItem";
     public ImageItem (string id, MediaContainer parent, string title) {
         base (id, parent, title);
     }
 }
 
-public class Rygel.VideoItem : Rygel.MediaItem {
+public class Rygel.VideoItem : Rygel.MediaFileItem {
     public const string UPNP_CLASS = "object.item.videoItem";
     public VideoItem (string id, MediaContainer parent, string title) {
         base (id, parent, title);
     }
 }
 
-public class Rygel.PhotoItem : Rygel.MediaItem {
+public class Rygel.PhotoItem : Rygel.MediaFileItem {
     public const string UPNP_CLASS = "object.item.imageItem.photo";
     public string creator;
 
@@ -214,7 +217,7 @@ public class Rygel.PhotoItem : Rygel.MediaItem {
     }
 }
 
-public class Rygel.PlaylistItem : Rygel.MediaItem {
+public class Rygel.PlaylistItem : Rygel.MediaFileItem {
     public const string UPNP_CLASS = "object.item.playlistItem";
 
     public PlaylistItem (string id, MediaContainer parent, string title) {