build,core,plugins: Require & adapt to gupnp-av 0.5.5

diff --git a/configure.ac b/configure.ac
index ca81ee2..44b3bf9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_FUNC_MMAP
 
 VALA_REQUIRED=0.8.0
 GUPNP_REQUIRED=0.13.3
-GUPNP_AV_REQUIRED=0.5.2
+GUPNP_AV_REQUIRED=0.5.5
 GUPNP_VALA_REQUIRED=0.6.5
 DBUS_GLIB_REQUIRED=0.74
 GSTREAMER_REQUIRED=0.10.23

diff --git a/src/plugins/external/rygel-external-container.vala b/src/plugins/external/rygel-external-container.vala
index 3617606..7b85dfa 100644 (file)
--- a/src/plugins/external/rygel-external-container.vala
+++ b/src/plugins/external/rygel-external-container.vala
@@ -182,7 +182,7 @@ public class Rygel.ExternalContainer : Rygel.MediaContainer {
         }
 
         this.child_count = this.containers.size +
-                           this.actual_container.item_count;
+                           (int) this.actual_container.item_count;
     }
 
     private void on_updated (ExternalMediaContainer actual_container) {

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 2a7ceae..be27036 100644 (file)
--- a/src/plugins/media-export/rygel-media-export-query-container.vala
+++ b/src/plugins/media-export/rygel-media-export-query-container.vala
@@ -115,7 +115,7 @@ internal class Rygel.MediaExportQueryContainer : Rygel.MediaDBContainer {
         debug ("We have %u children", this.child_count);
     }
 
-    private uint count_children () {
+    private int count_children () {
         try {
             if (this.pattern == "") {
                 var children = this.media_db.get_objects_by_search_expression (
@@ -123,9 +123,9 @@ internal class Rygel.MediaExportQueryContainer : Rygel.MediaDBContainer {
                                         "0",
                                         0,
                                         -1);
-                return (uint) children.size;
+                return children.size;
             } else {
-                uint retval = 0;
+                int retval = 0;
                 var data = this.media_db.get_object_attribute_by_search_expression (
                                         this.attribute,
                                         this.expression,

diff --git a/src/rygel/rygel-media-container.vala b/src/rygel/rygel-media-container.vala
index 1576717..ad06251 100644 (file)
--- a/src/rygel/rygel-media-container.vala
+++ b/src/rygel/rygel-media-container.vala
@@ -37,13 +37,13 @@ public abstract class Rygel.MediaContainer : MediaObject {
      */
     public signal void container_updated (MediaContainer container);
 
-    public uint child_count;
+    public int child_count;
     public uint32 update_id;
 
     public MediaContainer (string          id,
                            MediaContainer? parent,
                            string          title,
-                           uint            child_count) {
+                           int             child_count) {
         this.id = id;
         this.parent = parent;
         this.title = title;
@@ -55,7 +55,7 @@ public abstract class Rygel.MediaContainer : MediaObject {
     }
 
     public MediaContainer.root (string title,
-                                uint   child_count) {
+                                int    child_count) {
         this ("0", null, title, child_count);
     }