[rygel] core: Update value of 'SortCapabilities' state variable



commit 6d19192fe50161774e32fd754925e5e57a6b6f4c
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Jul 29 17:49:44 2010 +0300

    core: Update value of 'SortCapabilities' state variable

 src/rygel/rygel-content-directory.vala |    6 ++----
 src/rygel/rygel-media-objects.vala     |    3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/rygel/rygel-content-directory.vala b/src/rygel/rygel-content-directory.vala
index fc13591..adfb2e5 100644
--- a/src/rygel/rygel-content-directory.vala
+++ b/src/rygel/rygel-content-directory.vala
@@ -50,7 +50,6 @@ public class Rygel.ContentDirectory: Service {
     public const string DESCRIPTION_PATH = "xml/ContentDirectory.xml";
 
     protected string feature_list;
-    protected string sort_caps;
 
     internal HTTPServer http_server;
 
@@ -91,7 +90,6 @@ public class Rygel.ContentDirectory: Service {
             "xsi:schemaLocation=\"urn:schemas-upnp-org:av:avs" +
             "http://www.upnp.org/schemas/av/avs-v1-20060531.xsd\";>" +
             "</Features>";
-        this.sort_caps = "";
 
         this.action_invoked["Browse"].connect (this.browse_cb);
         this.action_invoked["Search"].connect (this.search_cb);
@@ -275,7 +273,7 @@ public class Rygel.ContentDirectory: Service {
     private void get_sort_capabilities_cb (Service             content_dir,
                                            owned ServiceAction action) {
         /* Set action return arguments */
-        action.set ("SortCaps", typeof (string), this.sort_caps);
+        action.set ("SortCaps", typeof (string), MediaObjects.SORT_CAPS);
 
         action.return ();
     }
@@ -286,7 +284,7 @@ public class Rygel.ContentDirectory: Service {
                                           ref GLib.Value value) {
         /* Set action return arguments */
         value.init (typeof (string));
-        value.set_string (this.sort_caps);
+        value.set_string (MediaObjects.SORT_CAPS);
     }
 
     /* action GetFeatureList implementation */
diff --git a/src/rygel/rygel-media-objects.vala b/src/rygel/rygel-media-objects.vala
index 204011f..88fa170 100644
--- a/src/rygel/rygel-media-objects.vala
+++ b/src/rygel/rygel-media-objects.vala
@@ -26,6 +26,9 @@ using Gee;
  * An array list that keeps media objects.
  */
 public class Rygel.MediaObjects : ArrayList<MediaObject> {
+    public const string SORT_CAPS = "@id,@parentID,dc:title,upnp:class," +
+                                    "dc:artist,dc:author,upnp:album,dc:date";
+
     public override Gee.List<MediaObject>? slice (int start, int stop) {
         var slice = base.slice (start, stop);
         var ret = new MediaObjects ();



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