[rygel] server,media-export: Add missing seachClass nodes



commit 89d0e9d574cd44d1027a8b6fd2845ebff8dfd1c9
Author: Parthiban Balasubramanian <p balasubramanian cablelabs com>
Date:   Mon Jul 29 11:01:59 2013 -0600

    server,media-export: Add missing seachClass nodes
    
    Fix for adding searchClass element in the browse result when searchable
    attribute is set.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=702254

 src/librygel-server/rygel-media-container.vala     |    3 ++-
 .../rygel-media-export-db-container.vala           |   10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/src/librygel-server/rygel-media-container.vala b/src/librygel-server/rygel-media-container.vala
index 5cd4494..c6e0b13 100644
--- a/src/librygel-server/rygel-media-container.vala
+++ b/src/librygel-server/rygel-media-container.vala
@@ -297,7 +297,8 @@ public abstract class Rygel.MediaContainer : MediaObject {
                                         (uint) this.total_deleted_child_count;
         }
 
-        if (this.parent == null && (this is SearchableContainer)) {
+        // If the container is searchable then it must add search class parameters.
+        if (this is SearchableContainer) {
             (this as SearchableContainer).serialize_search_parameters
                                         (didl_container);
         }
diff --git a/src/plugins/media-export/rygel-media-export-db-container.vala 
b/src/plugins/media-export/rygel-media-export-db-container.vala
index 58c00e8..c9e2a1d 100644
--- a/src/plugins/media-export/rygel-media-export-db-container.vala
+++ b/src/plugins/media-export/rygel-media-export-db-container.vala
@@ -39,6 +39,16 @@ public class Rygel.MediaExport.DBContainer : MediaContainer,
 
         this.media_db = MediaCache.get_default ();
         this.search_classes = new ArrayList<string> ();
+        // Items
+        this.search_classes.add (Rygel.ImageItem.UPNP_CLASS);
+        this.search_classes.add (Rygel.PhotoItem.UPNP_CLASS);
+        this.search_classes.add (Rygel.VideoItem.UPNP_CLASS);
+        this.search_classes.add (Rygel.AudioItem.UPNP_CLASS);
+        this.search_classes.add (Rygel.MusicItem.UPNP_CLASS);
+        this.search_classes.add (Rygel.PlaylistItem.UPNP_CLASS);
+
+        // Containers
+        this.search_classes.add (Rygel.MediaContainer.UPNP_CLASS);
         this.container_updated.connect ( () => {
                 this.child_count = this.count_children ();
             });


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