rygel r77 - in trunk: . src

[zeeshanak svn gnome org]

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

Log:
Put the actual "album" in the DIDL when available.

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

Modified: trunk/src/gupnp-media-tracker.vala
==============================================================================
--- trunk/src/gupnp-media-tracker.vala	(original)
+++ trunk/src/gupnp-media-tracker.vala	Tue Oct 28 20:59:44 2008
@@ -397,6 +397,7 @@
                        values[1],
                        title,
                        values[3],
+                       "",
                        parent.child_class,
                        width,
                        height,
@@ -413,7 +414,8 @@
                                       "Image:Title",
                                       "Image:Creator",
                                       "Image:Width",
-                                      "Image:Height"};
+                                      "Image:Height",
+                                      "Image:Album"};
 
         string[] values = null;
 
@@ -449,6 +451,7 @@
                        values[1],
                        title,
                        values[3],
+                       values[6],
                        parent.child_class,
                        width,
                        height,
@@ -464,7 +467,8 @@
                                       "File:Mime",
                                       "Audio:Title",
                                       "Audio:Artist",
-                                      "Audio:TrackNo"};
+                                      "Audio:TrackNo",
+                                      "Audio:Album"};
 
         string[] values = null;
 
@@ -496,6 +500,7 @@
                        values[1],
                        title,
                        values[3],
+                       values[5],
                        parent.child_class,
                        -1,
                        -1,
@@ -510,6 +515,7 @@
                            string mime,
                            string title,
                            string author,
+                           string album,
                            string upnp_class,
                            int    width,
                            int    height,
@@ -558,10 +564,12 @@
                                       track_number);
         }
 
-        this.didl_writer.add_string ("album",
-                                     DIDLLiteWriter.NAMESPACE_UPNP,
-                                     null,
-                                     "Some album");
+        if (album != "") {
+            this.didl_writer.add_string ("album",
+                                         DIDLLiteWriter.NAMESPACE_UPNP,
+                                         null,
+                                         album);
+        }
 
         /* Add resource data */
         DIDLLiteResource res;