[rygel/rygel-0-16] external: Use audio.music as specified in spec



commit a973c53619045068ccbd1f9718dd1e4845d06958
Author: Jens Georg <mail jensge org>
Date:   Fri Apr 27 20:36:52 2012 +0200

    external: Use audio.music as specified in spec
    
    We still keep "music" as everyone else seems to be using it now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=674738

 .../external/rygel-external-item-factory.vala      |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/external/rygel-external-item-factory.vala b/src/plugins/external/rygel-external-item-factory.vala
index 9a764a9..bdf11e8 100644
--- a/src/plugins/external/rygel-external-item-factory.vala
+++ b/src/plugins/external/rygel-external-item-factory.vala
@@ -38,17 +38,18 @@ public class Rygel.External.ItemFactory {
                                    throws IOError, DBusError {
         MediaItem item;
 
-        if (type.has_prefix ("audio")) {
-            item = new AudioItem (id, parent, title);
-
-            this.set_audio_metadata (item as AudioItem, props, service_name);
-        } else if (type.has_prefix ("music")) {
+        if (type.has_prefix ("music") ||
+            type.has_prefix ("audio.music")) {
             item = new MusicItem (id, parent, title);
 
             yield this.set_music_metadata (item as MusicItem,
                                            props,
                                            service_name);
-        } else if (type.has_prefix ("video")) {
+        } else if (type.has_prefix ("audio")) {
+            item = new AudioItem (id, parent, title);
+
+            this.set_audio_metadata (item as AudioItem, props, service_name);
+        } else  if (type.has_prefix ("video")) {
             item = new VideoItem (id, parent, title);
 
             yield this.set_video_metadata (item as VideoItem,



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