rygel r70 - in trunk: . src

[zeeshanak svn gnome org]

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

Log:
Include the title instead of filename in the DIDL when it's 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:35 2008
@@ -348,13 +348,18 @@
         string[] keys = new string[] {"File:Name",
                                       "File:Mime",
                                       null,
+                                      null,
                                       null};
         if (parent.child_class == VIDEO_CLASS) {
-            keys[2] = "Video:Width";
-            keys[3] = "Video:Height";
+            keys[2] = "Video:Title";
+            keys[3] = "Video:Width";
+            keys[4] = "Video:Height";
         } else if (parent.child_class == IMAGE_CLASS) {
-            keys[2] = "Image:Width";
-            keys[3] = "Image:Height";
+            keys[2] = "Image:Title";
+            keys[3] = "Image:Width";
+            keys[4] = "Image:Height";
+        } else if (parent.child_class == MUSIC_CLASS) {
+            keys[2] = "Audio:Title";
         }
 
         string[] values = null;
@@ -373,16 +378,23 @@
         int width = -1;
         int height = -1;
 
-        if (keys[2] != null && values[2] != null)
-            width = values[2].to_int ();
-
         if (keys[3] != null && values[3] != null)
-            height = values[3].to_int ();
+            width = values[3].to_int ();
+
+        if (keys[4] != null && values[4] != null)
+            height = values[4].to_int ();
+
+        string title;
+        if (values[2] != null && values[2] != "")
+            title = values[2];
+        else
+            /* If title wasn't provided, use filename instead */
+            title = values[0];
 
         this.add_item (path,
                        parent.id,
                        values[1],
-                       values[0],
+                       title,
                        parent.child_class,
                        width,
                        height,