rygel r44 - in trunk: . src

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Oct 28 20:59:00 2008
New Revision: 44
URL: http://svn.gnome.org/viewvc/rygel?rev=44&view=rev

Log:
Report the correct UPnP class of the items.

Modified:
   trunk/ChangeLog
   trunk/src/gupnp-media-tracker.c

Modified: trunk/src/gupnp-media-tracker.c
==============================================================================
--- trunk/src/gupnp-media-tracker.c	(original)
+++ trunk/src/gupnp-media-tracker.c	Tue Oct 28 20:59:00 2008
@@ -70,12 +70,14 @@
         char *id;
         char *title;
         char *tracker_category;
+
+        char *child_class; /* UPnP class of items under this container */
 } Container;
 
 static Container containers[] = {
-        { "13", "All Images", "Images" },
-        { "14", "All Music", "Music" },
-        { "15", "All Videos", "Videos" },
+        { "13", "All Images", "Images", "object.item.imageItem" },
+        { "14", "All Music", "Music", "object.item.audioItem.musicTrack" },
+        { "15", "All Videos", "Videos", "object.item.videoItem" },
         { NULL }
 };
 
@@ -482,6 +484,7 @@
           const char          *parent_id,
           const char          *mime,
           const char          *title,
+          const char          *upnp_class,
           const char          *path)
 {
         GUPnPDIDLLiteResource res;
@@ -505,7 +508,7 @@
                          "class",
                          GUPNP_DIDL_LITE_WRITER_NAMESPACE_UPNP,
                          NULL,
-                         "object.item.audioItem.musicTrack");
+                         upnp_class);
 
         gupnp_didl_lite_writer_add_string
                         (didl_writer,
@@ -583,6 +586,7 @@
                           parent->id,
                           values[1],
                           values[0],
+                          parent->child_class,
                           path);
         }