[rygel/wip/cablelabs-integration: 20/27] server: Rename method

[Jens Georg <jensgeorg src gnome org>]

commit 523588e98b1350c9515aa0b8926ab0839ee8a611
Author: Jens Georg <mail jensge org>
Date:   Wed Dec 3 18:00:07 2014 +0100

    server: Rename method
    
    It was handling objects anyway.
    
    Signed-off-by: Jens Georg <mail jensge org>

 src/librygel-server/rygel-http-server.vala       |   14 +++++++-------
 src/librygel-server/rygel-music-item.vala        |   10 +++++-----
 src/librygel-server/rygel-samsung-tv-hacks.vala  |    2 +-
 src/librygel-server/rygel-transcode-manager.vala |   10 +++++-----
 src/librygel-server/rygel-transcoder.vala        |   10 +++++-----
 src/librygel-server/rygel-video-item.vala        |   10 +++++-----
 src/librygel-server/rygel-visual-item.vala       |   10 +++++-----
 7 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/src/librygel-server/rygel-http-server.vala b/src/librygel-server/rygel-http-server.vala
index 76fa86d..369a13e 100644
--- a/src/librygel-server/rygel-http-server.vala
+++ b/src/librygel-server/rygel-http-server.vala
@@ -72,7 +72,7 @@ public class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
             return;
         }
 
-        var uri = this.create_uri_for_item (item, -1, -1, null, null);
+        var uri = this.create_uri_for_object (item, -1, -1, null, null);
 
         item.add_resource (didl_item, uri, this.get_protocol (), uri);
     }
@@ -104,12 +104,12 @@ public class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
         this.completed ();
     }
 
-    internal override string create_uri_for_item (MediaFileItem item,
-                                                  int           thumbnail_index,
-                                                  int           subtitle_index,
-                                                  string?       transcode_target,
-                                                  string?       playlist_target) {
-        var uri = new HTTPItemURI (item,
+    internal override string create_uri_for_object (MediaObject object,
+                                                    int         thumbnail_index,
+                                                    int         subtitle_index,
+                                                    string?     transcode_target,
+                                                    string?     playlist_target) {
+        var uri = new HTTPItemURI (object,
                                    this,
                                    thumbnail_index,
                                    subtitle_index,
diff --git a/src/librygel-server/rygel-music-item.vala b/src/librygel-server/rygel-music-item.vala
index 38edff5..9c48f5d 100644
--- a/src/librygel-server/rygel-music-item.vala
+++ b/src/librygel-server/rygel-music-item.vala
@@ -131,11 +131,11 @@ public class Rygel.MusicItem : AudioItem {
         if (!this.place_holder &&
             this.album_art != null &&
             server.need_proxy (this.album_art.uri)) {
-            didl_item.album_art = server.create_uri_for_item (this,
-                                                              0,
-                                                              -1,
-                                                              null,
-                                                              null);
+            didl_item.album_art = server.create_uri_for_object (this,
+                                                                0,
+                                                                -1,
+                                                                null,
+                                                                null);
         }
     }
 }
diff --git a/src/librygel-server/rygel-samsung-tv-hacks.vala b/src/librygel-server/rygel-samsung-tv-hacks.vala
index ef59d6c..5a4c3df 100644
--- a/src/librygel-server/rygel-samsung-tv-hacks.vala
+++ b/src/librygel-server/rygel-samsung-tv-hacks.vala
@@ -57,7 +57,7 @@ internal class Rygel.SamsungTVHacks : ClientHacks {
         if (request.msg.request_headers.get_one ("getCaptionInfo.sec") != null
             && (request.object is VideoItem)
             && (request.object as VideoItem).subtitles.size > 0) {
-                var caption_uri = request.http_server.create_uri_for_item
+                var caption_uri = request.http_server.create_uri_for_object
                                         (request.object as MediaItem,
                                          -1,
                                          0, // FIXME: offer first subtitle only?
diff --git a/src/librygel-server/rygel-transcode-manager.vala 
b/src/librygel-server/rygel-transcode-manager.vala
index 5367215..ddc45ff 100644
--- a/src/librygel-server/rygel-transcode-manager.vala
+++ b/src/librygel-server/rygel-transcode-manager.vala
@@ -41,11 +41,11 @@ public abstract class Rygel.TranscodeManager : GLib.Object {
 
     public TranscodeManager () { }
 
-    public abstract string create_uri_for_item (MediaFileItem  item,
-                                                int            thumbnail_index,
-                                                int            subtitle_index,
-                                                string?        transcode_target,
-                                                string?        playlist_target);
+    public abstract string create_uri_for_object (MediaObject  item,
+                                                  int          thumbnail_index,
+                                                  int          subtitle_index,
+                                                  string?      transcode_target,
+                                                  string?      playlist_target);
 
     public void add_resources (DIDLLiteItem didl_item, MediaFileItem item)
                                throws Error {
diff --git a/src/librygel-server/rygel-transcoder.vala b/src/librygel-server/rygel-transcoder.vala
index 45071e0..fb48fd3 100644
--- a/src/librygel-server/rygel-transcoder.vala
+++ b/src/librygel-server/rygel-transcoder.vala
@@ -79,11 +79,11 @@ public abstract class Rygel.Transcoder : GLib.Object {
         }
 
         var protocol = manager.get_protocol ();
-        var uri = manager.create_uri_for_item (item,
-                                               -1,
-                                               -1,
-                                               this.dlna_profile,
-                                               null);
+        var uri = manager.create_uri_for_object (item,
+                                                 -1,
+                                                 -1,
+                                                 this.dlna_profile,
+                                                 null);
         var res = item.add_resource (didl_item, uri, protocol);
         res.size = -1;
 
diff --git a/src/librygel-server/rygel-video-item.vala b/src/librygel-server/rygel-video-item.vala
index 379fe55..c9d3a16 100644
--- a/src/librygel-server/rygel-video-item.vala
+++ b/src/librygel-server/rygel-video-item.vala
@@ -191,11 +191,11 @@ public class Rygel.VideoItem : AudioItem, VisualItem {
                 var uri = subtitle.uri; // Save the original URI
                 var index = this.subtitles.index_of (subtitle);
 
-                subtitle.uri = server.create_uri_for_item (this,
-                                                           -1,
-                                                           index,
-                                                           null,
-                                                           null);
+                subtitle.uri = server.create_uri_for_object (this,
+                                                             -1,
+                                                             index,
+                                                             null,
+                                                             null);
                 subtitle.add_didl_node (didl_item);
 
                 if (main_subtitle == null) {
diff --git a/src/librygel-server/rygel-visual-item.vala b/src/librygel-server/rygel-visual-item.vala
index de2ae54..2ab8897 100644
--- a/src/librygel-server/rygel-visual-item.vala
+++ b/src/librygel-server/rygel-visual-item.vala
@@ -97,11 +97,11 @@ public interface Rygel.VisualItem : MediaFileItem {
                 var uri = thumbnail.uri; // Save the original URI
                 var index = this.thumbnails.index_of (thumbnail);
 
-                thumbnail.uri = server.create_uri_for_item (this,
-                                                            index,
-                                                            -1,
-                                                            null,
-                                                            null);
+                thumbnail.uri = server.create_uri_for_object (this,
+                                                              index,
+                                                              -1,
+                                                              null,
+                                                              null);
                 thumbnail.add_resource (didl_item, server.get_protocol ());
 
                 // Now restore the original URI