[rygel] media-export: Use fall-back search for @refID



commit 29dec46beb87c026457ba35fa7586e88a4b480e0
Author: Jens Georg <jensg openismus com>
Date:   Thu Aug 8 22:07:32 2013 +0200

    media-export: Use fall-back search for @refID
    
    Fixes DLNA TC 7.3.66.3,4
    
    https://bugzilla.gnome.org/show_bug.cgi?id=702253

 .../rygel-media-export-leaf-query-container.vala   |    2 +-
 .../rygel-media-export-media-cache.vala            |    3 ---
 .../rygel-media-export-query-container.vala        |    8 ++++++--
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-leaf-query-container.vala 
b/src/plugins/media-export/rygel-media-export-leaf-query-container.vala
index 083d8e9..7d97c5b 100644
--- a/src/plugins/media-export/rygel-media-export-leaf-query-container.vala
+++ b/src/plugins/media-export/rygel-media-export-leaf-query-container.vala
@@ -47,7 +47,7 @@ internal class Rygel.MediaExport.LeafQueryContainer : QueryContainer {
                                this.id.replace (QueryContainer.PREFIX, "");
             child.ref_id = child.id;
             child.id = container_id + ":" + child.ref_id;
-            child.parent = this;
+            child.parent_ref = this;
         }
 
         return children;
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala 
b/src/plugins/media-export/rygel-media-export-media-cache.vala
index 48f3005..853c97a 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -1004,9 +1004,6 @@ public class Rygel.MediaExport.MediaCache : Object {
             case "res duration":
                 column = "m.duration";
                 break;
-            case "@refID":
-                column = "o.reference_id";
-                break;
             case "@id":
                 column = "o.upnp_id";
                 break;
diff --git a/src/plugins/media-export/rygel-media-export-query-container.vala 
b/src/plugins/media-export/rygel-media-export-query-container.vala
index 38d49ea..520cdc0 100644
--- a/src/plugins/media-export/rygel-media-export-query-container.vala
+++ b/src/plugins/media-export/rygel-media-export-query-container.vala
@@ -72,8 +72,12 @@ internal abstract class Rygel.MediaExport.QueryContainer : DBContainer {
                                          out total_matches);
         } catch (MediaCacheError error) {
             if (error is MediaCacheError.UNSUPPORTED_SEARCH) {
-                children = new MediaObjects ();
-                total_matches = 0;
+                return yield this.simple_search (expression,
+                                                 offset,
+                                                 max_count,
+                                                 out total_matches,
+                                                 sort_criteria,
+                                                 cancellable);
             } else {
                 throw error;
             }


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