[rygel/wip/create-container: 13/14] wip



commit d749ffcbc3f5df819265637e26f11af1623e04dd
Author: Jens Georg <jensg openismus com>
Date:   Mon Feb 25 11:39:06 2013 +0100

    wip

 src/librygel-server/rygel-item-creator.vala |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/librygel-server/rygel-item-creator.vala b/src/librygel-server/rygel-item-creator.vala
index 00c6fd8..dd486e7 100644
--- a/src/librygel-server/rygel-item-creator.vala
+++ b/src/librygel-server/rygel-item-creator.vala
@@ -36,8 +36,10 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
     private string container_id;
     private string elements;
 
-    private DIDLLiteObject didl_item;
-    private MediaObject item;
+    private DIDLLiteObject didl_object;
+    private DIDLLiteItem didl_item;
+    private MediaObject object;
+    private MediaItem item;
 
     private ContentDirectory content_dir;
     private ServiceAction action;
@@ -139,6 +141,10 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
         // FIXME: This will take the last object in the DIDL-Lite, maybe we
         // should limit it to one somehow.
         this.didl_parser.object_available.connect ((didl_item) => {
+            this.didl_object = didl_item;
+        });
+
+        this.didl_parser.item_available.connect ((didl_item) => {
             this.didl_item = didl_item;
         });
 
@@ -341,7 +347,7 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
      */
     private async void create_item_from_didl (WritableContainer container)
                                                    throws Error {
-        this.item = this.create_item (this.didl_item.id,
+        this.object = this.create_item (this.didl_item.id,
                                       container,
                                       this.didl_item.title,
                                       this.didl_item.upnp_class);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]