summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Georg <mail@jensge.org>2016-02-27 18:19:34 +0100
committerJens Georg <mail@jensge.org>2016-02-27 18:19:34 +0100
commitdd9c79ab5f299869f9f495cc169407af88f9754d (patch)
tree31f3957f012aa0dd94a51f0256e306bd68ba1eb9
parent1192616d7aa13030e14cec21decfea5c9a372ee4 (diff)
downloadrygel-dd9c79ab5f299869f9f495cc169407af88f9754d.tar.gz
media-export: Properly set track for multi-title discs
Signed-off-by: Jens Georg <mail@jensge.org>
-rw-r--r--src/plugins/media-export/rygel-media-export-dvd-container.vala1
-rw-r--r--src/plugins/media-export/rygel-media-export-dvd-track.vala2
-rw-r--r--src/plugins/media-export/rygel-media-export-object-factory.vala2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/media-export/rygel-media-export-dvd-container.vala b/src/plugins/media-export/rygel-media-export-dvd-container.vala
index 058bbbf2..db2f35d2 100644
--- a/src/plugins/media-export/rygel-media-export-dvd-container.vala
+++ b/src/plugins/media-export/rygel-media-export-dvd-container.vala
@@ -130,6 +130,7 @@ internal class Rygel.MediaExport.DVDContainer : SimpleContainer, UpdatableObject
var item = new DVDTrack (this.get_track_id (track),
this,
_("Title %d").printf (track + 1),
+ track,
node);
item.parent_ref = this;
diff --git a/src/plugins/media-export/rygel-media-export-dvd-track.vala b/src/plugins/media-export/rygel-media-export-dvd-track.vala
index 04e843e4..f6ba5385 100644
--- a/src/plugins/media-export/rygel-media-export-dvd-track.vala
+++ b/src/plugins/media-export/rygel-media-export-dvd-track.vala
@@ -29,11 +29,13 @@ internal class Rygel.MediaExport.DVDTrack : VideoItem {
public DVDTrack (string id,
MediaContainer parent,
string title,
+ int track,
Xml.Node* node) {
Object (id : id,
parent : parent,
node : node,
title : title,
+ track : track,
upnp_class : Rygel.VideoItem.UPNP_CLASS);
}
diff --git a/src/plugins/media-export/rygel-media-export-object-factory.vala b/src/plugins/media-export/rygel-media-export-object-factory.vala
index a7a22ec8..cac21cf1 100644
--- a/src/plugins/media-export/rygel-media-export-object-factory.vala
+++ b/src/plugins/media-export/rygel-media-export-object-factory.vala
@@ -100,7 +100,7 @@ internal class Rygel.MediaExport.ObjectFactory : Object {
return new MusicItem (id, parent, title);
case Rygel.VideoItem.UPNP_CLASS:
if (id.has_prefix ("dvd-track")) {
- return new DVDTrack (id, parent, title, null);
+ return new DVDTrack (id, parent, title, 0, null);
}
return new VideoItem (id, parent, title);
case Rygel.PhotoItem.UPNP_CLASS: