[rygel/wip/cablelabs-integration: 11/18] server: Rename method
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel/wip/cablelabs-integration: 11/18] server: Rename method
- Date: Thu, 20 Nov 2014 20:38:39 +0000 (UTC)
commit 82bbe9ac826458c34ef79cd9c357df28d44b946f
Author: Jens Georg <mail jensge org>
Date: Sun Nov 16 15:28:46 2014 +0100
server: Rename method
It was handling objects anyway internally.
Signed-off-by: Jens Georg <mail jensge org>
src/librygel-server/rygel-http-server.vala | 14 +++++++-------
src/librygel-server/rygel-media-object.vala | 17 +++++++++++++++++
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 +++++-----
8 files changed, 50 insertions(+), 33 deletions(-)
---
diff --git a/src/librygel-server/rygel-http-server.vala b/src/librygel-server/rygel-http-server.vala
index aa1ec8c..2559d91 100644
--- a/src/librygel-server/rygel-http-server.vala
+++ b/src/librygel-server/rygel-http-server.vala
@@ -65,7 +65,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);
}
@@ -97,12 +97,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-media-object.vala b/src/librygel-server/rygel-media-object.vala
index 5235f96..2095a7c 100644
--- a/src/librygel-server/rygel-media-object.vala
+++ b/src/librygel-server/rygel-media-object.vala
@@ -228,6 +228,23 @@ public abstract class Rygel.MediaObject : GLib.Object {
HTTPServer http_server)
throws Error;
+ /**
+ * Serialize the resource list
+ *
+ * Any resource with an empty URIs will get a resource-based HTTP URI and have its protocol
+ * and delivery options adjusted to the HTTPServer.
+ *
+ * Internal (e.g. "file:") resources will only be included when the http server
+ * is on the local host.
+ *
+ * Resources will be serialized in list order.
+ */
+ public void serialize_resource_list (DIDLLiteObject didl_object,
+ HTTPServer http_server)
+ throws Error {
+ }
+
+
internal virtual void apply_didl_lite (DIDLLiteObject didl_object) {
this.title = didl_object.title;
this.artist = this.get_first (didl_object.get_artists ());
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
