core: Drop now redundant custom DIDLLiteWriter class

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4e9f587..330ad7e 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -75,7 +75,6 @@ src/rygel/rygel-content-directory.vala
 src/rygel/rygel-av-transport.vala
 src/rygel/rygel-rendering-control.vala
 src/rygel/rygel-dbus-service.vala
-src/rygel/rygel-didl-lite-writer.vala
 src/rygel/rygel-gst-utils.vala
 src/rygel/rygel-http-byte-seek.vala
 src/rygel/rygel-http-get-handler.vala

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index c389cb3..48962cc 100644 (file)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -40,7 +40,6 @@ src/rygel/rygel-connection-manager.c
 src/rygel/rygel-content-directory.c
 src/rygel/rygel-av-transport.c
 src/rygel/rygel-rendering-control.c
-src/rygel/rygel-didl-lite-writer.c
 src/rygel/rygel-gst-utils.c
 src/rygel/rygel-http-byte-seek.c
 src/rygel/rygel-http-get.c

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 1c87ebc..fa89687 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -104,7 +104,6 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
                    rygel-relational-expression.vala \
                    rygel-logical-expression.vala \
                    rygel-search-criteria-parser.vala \
-                   rygel-didl-lite-writer.vala \
                    rygel-transcoder.vala \
                    rygel-mp2ts-transcoder.vala \
                    rygel-mp3-transcoder.vala \

diff --git a/src/rygel/rygel-didl-lite-writer.vala b/src/rygel/rygel-didl-lite-writer.vala
deleted file mode 100644 (file)
index 36be260..0000000
--- a/src/rygel/rygel-didl-lite-writer.vala
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2009 Nokia Corporation.
- *
- * Author: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
- *                               <zeeshan.ali@nokia.com>
- *
- * This file is part of Rygel.
- *
- * Rygel is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Rygel is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-using GUPnP;
-using Gee;
-
-internal errordomain Rygel.DIDLLiteWriterError {
-    UNSUPPORTED_OBJECT
-}
-
-/**
- * Responsible for serializing media objects.
- */
-internal class Rygel.DIDLLiteWriter : GUPnP.DIDLLiteWriter {
-    public Rygel.HTTPServer http_server;
-
-    public DIDLLiteWriter (HTTPServer http_server) {
-        this.http_server = http_server;
-    }
-
-    public void serialize (MediaObject media_object) throws Error {
-        media_object.serialize (this);
-    }
-}

diff --git a/src/rygel/rygel-item-creator.vala b/src/rygel/rygel-item-creator.vala
index 1d46be0..810303d 100644 (file)
--- a/src/rygel/rygel-item-creator.vala
+++ b/src/rygel/rygel-item-creator.vala
@@ -41,7 +41,7 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
 
     private ContentDirectory content_dir;
     private ServiceAction action;
-    private Rygel.DIDLLiteWriter didl_writer;
+    private DIDLLiteWriter didl_writer;
     private DIDLLiteParser didl_parser;
 
     public Cancellable cancellable { get; set; }
@@ -51,7 +51,7 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
         this.content_dir = content_dir;
         this.cancellable = content_dir.cancellable;
         this.action = (owned) action;
-        this.didl_writer = new Rygel.DIDLLiteWriter (content_dir.http_server);
+        this.didl_writer = new DIDLLiteWriter (null);
         this.didl_parser = new DIDLLiteParser ();
     }
 
@@ -98,7 +98,7 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
             this.item.place_holder = true;
 
             yield container.add_item (this.item, this.cancellable);
-            this.didl_writer.serialize (this.item);
+            this.item.serialize (didl_writer, this.content_dir.http_server);
 
             // Conclude the successful action
             this.conclude ();

diff --git a/src/rygel/rygel-media-container.vala b/src/rygel/rygel-media-container.vala
index 5cafed3..1fc2908 100644 (file)
--- a/src/rygel/rygel-media-container.vala
+++ b/src/rygel/rygel-media-container.vala
@@ -260,7 +260,8 @@ public abstract class Rygel.MediaContainer : MediaObject {
         }
     }
 
-    internal override DIDLLiteObject serialize (DIDLLiteWriter writer)
+    internal override DIDLLiteObject serialize (DIDLLiteWriter writer,
+                                                HTTPServer     http_server)
                                                 throws Error {
         var didl_container = writer.add_container ();
         if (this.parent != null) {

diff --git a/src/rygel/rygel-media-item.vala b/src/rygel/rygel-media-item.vala
index ff96434..1212531 100644 (file)
--- a/src/rygel/rygel-media-item.vala
+++ b/src/rygel/rygel-media-item.vala
@@ -141,7 +141,8 @@ public abstract class Rygel.MediaItem : MediaObject {
         }
     }
 
-    internal override DIDLLiteObject serialize (DIDLLiteWriter writer)
+    internal override DIDLLiteObject serialize (DIDLLiteWriter writer,
+                                                HTTPServer     http_server)
                                                 throws Error {
         var didl_item = writer.add_item ();
 
@@ -162,16 +163,15 @@ public abstract class Rygel.MediaItem : MediaObject {
          * can handle.
          */
         if (this.place_holder) {
-            this.add_proxy_resources (writer.http_server, didl_item);
+            this.add_proxy_resources (http_server, didl_item);
         } else {
             // Add the transcoded/proxy URIs first
-            this.add_proxy_resources (writer.http_server, didl_item);
+            this.add_proxy_resources (http_server, didl_item);
 
             // then original URIs
             bool internal_allowed;
-            internal_allowed = writer.http_server.context.interface == "lo" ||
-                               writer.http_server.context.host_ip ==
-                               "127.0.0.1";
+            internal_allowed = http_server.context.interface == "lo" ||
+                               http_server.context.host_ip == "127.0.0.1";
             this.add_resources (didl_item, internal_allowed);
         }
 

diff --git a/src/rygel/rygel-media-object.vala b/src/rygel/rygel-media-object.vala
index 9d1ec9d..f6cea25 100644 (file)
--- a/src/rygel/rygel-media-object.vala
+++ b/src/rygel/rygel-media-object.vala
@@ -122,7 +122,8 @@ public abstract class Rygel.MediaObject : GLib.Object {
         return null;
     }
 
-    internal abstract DIDLLiteObject serialize (DIDLLiteWriter writer)
+    internal abstract DIDLLiteObject serialize (DIDLLiteWriter writer,
+                                                HTTPServer     http_server)
                                                 throws Error;
 
     internal virtual int compare_by_property (MediaObject media_object,

diff --git a/src/rygel/rygel-media-query-action.vala b/src/rygel/rygel-media-query-action.vala
index 875239c..0ed6182 100644 (file)
--- a/src/rygel/rygel-media-query-action.vala
+++ b/src/rygel/rygel-media-query-action.vala
@@ -43,20 +43,22 @@ internal abstract class Rygel.MediaQueryAction : GLib.Object, StateMachine {
     public Cancellable cancellable { get; set; }
 
     protected MediaContainer root_container;
+    protected HTTPServer http_server;
     protected uint32 system_update_id;
     protected ServiceAction action;
-    protected Rygel.DIDLLiteWriter didl_writer;
+    protected DIDLLiteWriter didl_writer;
     protected XBoxHacks xbox_hacks;
     protected string object_id_arg;
 
     protected MediaQueryAction (ContentDirectory    content_dir,
                                 owned ServiceAction action) {
         this.root_container = content_dir.root_container;
+        this.http_server = content_dir.http_server;
         this.system_update_id = content_dir.system_update_id;
         this.cancellable = content_dir.cancellable;
         this.action = (owned) action;
 
-        this.didl_writer = new Rygel.DIDLLiteWriter (content_dir.http_server);
+        this.didl_writer = new DIDLLiteWriter (null);
 
         try {
             this.xbox_hacks = new XBoxHacks.for_action (this.action);
@@ -86,7 +88,7 @@ internal abstract class Rygel.MediaQueryAction : GLib.Object, StateMachine {
                     this.xbox_hacks.apply (result as MediaItem);
                 }
 
-                this.didl_writer.serialize (result);
+                result.serialize (this.didl_writer, this.http_server);
             }
 
             // Conclude the successful Browse/Search action

diff --git a/src/rygel/rygel-music-item.vala b/src/rygel/rygel-music-item.vala
index 6a69979..4cc71b5 100644 (file)
--- a/src/rygel/rygel-music-item.vala
+++ b/src/rygel/rygel-music-item.vala
@@ -90,9 +90,10 @@ public class Rygel.MusicItem : AudioItem {
         }
     }
 
-    internal override DIDLLiteObject serialize (DIDLLiteWriter writer)
+    internal override DIDLLiteObject serialize (DIDLLiteWriter writer,
+                                                HTTPServer     http_server)
                                                 throws Error {
-        var didl_item = base.serialize (writer);
+        var didl_item = base.serialize (writer, http_server);
 
         if (this.artist != null && this.artist != "") {
             var contributor = didl_item.add_artist ();

diff --git a/src/rygel/rygel-photo-item.vala b/src/rygel/rygel-photo-item.vala
index 93f722a..99dd0b3 100644 (file)
--- a/src/rygel/rygel-photo-item.vala
+++ b/src/rygel/rygel-photo-item.vala
@@ -57,9 +57,10 @@ public class Rygel.PhotoItem : ImageItem {
         }
     }
 
-    internal override DIDLLiteObject serialize (DIDLLiteWriter writer)
+    internal override DIDLLiteObject serialize (DIDLLiteWriter writer,
+                                                HTTPServer     http_server)
                                                 throws Error {
-        var didl_item = base.serialize (writer);
+        var didl_item = base.serialize (writer, http_server);
 
         if (this.creator != null && this.creator != "") {
             var contributor = didl_item.add_creator ();

diff --git a/src/rygel/rygel-video-item.vala b/src/rygel/rygel-video-item.vala
index 660dd37..0d9dc06 100644 (file)
--- a/src/rygel/rygel-video-item.vala
+++ b/src/rygel/rygel-video-item.vala
@@ -117,9 +117,10 @@ public class Rygel.VideoItem : AudioItem, VisualItem {
         }
     }
 
-    internal override DIDLLiteObject serialize (DIDLLiteWriter writer)
+    internal override DIDLLiteObject serialize (DIDLLiteWriter writer,
+                                                HTTPServer     http_server)
                                                 throws Error {
-        var didl_item = base.serialize (writer);
+        var didl_item = base.serialize (writer, http_server);
 
         if (this.author != null && this.author != "") {
             var contributor = didl_item.add_author ();