aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Dlna/PlayTo/PlayToController.cs
diff options
context:
space:
mode:
authorTavares André <tavares_and@hotmail.com>2015-04-30 18:20:10 +0200
committerTavares André <tavares_and@hotmail.com>2015-04-30 18:20:10 +0200
commitfcb2bc2c8e37e75ffbd324bf242eed5eb4372fb5 (patch)
treeb79635656f847f4920acdfa3c0910c2ce2c2c36c /MediaBrowser.Dlna/PlayTo/PlayToController.cs
parentadc52db15a497a003cbea77cf11d907390390e96 (diff)
parenta4e28a60a4de902ef58ecfef54cb56250c23e5e7 (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Dlna/PlayTo/PlayToController.cs')
-rw-r--r--MediaBrowser.Dlna/PlayTo/PlayToController.cs11
1 files changed, 2 insertions, 9 deletions
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
index 66cdc51af..5aa8c1f9c 100644
--- a/MediaBrowser.Dlna/PlayTo/PlayToController.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
@@ -310,12 +310,12 @@ namespace MediaBrowser.Dlna.PlayTo
{
if (isFirst && command.StartPositionTicks.HasValue)
{
- playlist.Add(CreatePlaylistItem(item, user, command.StartPositionTicks.Value));
+ playlist.Add(CreatePlaylistItem(item, user, command.StartPositionTicks.Value, null, null, null));
isFirst = false;
}
else
{
- playlist.Add(CreatePlaylistItem(item, user, 0));
+ playlist.Add(CreatePlaylistItem(item, user, 0, null, null, null));
}
}
@@ -456,11 +456,6 @@ namespace MediaBrowser.Dlna.PlayTo
}
}
- private PlaylistItem CreatePlaylistItem(BaseItem item, User user, long startPostionTicks)
- {
- return CreatePlaylistItem(item, user, startPostionTicks, null, null, null);
- }
-
private PlaylistItem CreatePlaylistItem(BaseItem item, User user, long startPostionTicks, string mediaSourceId, int? audioStreamIndex, int? subtitleStreamIndex)
{
var deviceInfo = _device.Properties;
@@ -514,8 +509,6 @@ namespace MediaBrowser.Dlna.PlayTo
streamInfo.TargetHeight,
streamInfo.TargetVideoBitDepth,
streamInfo.TargetVideoBitrate,
- streamInfo.TargetAudioChannels,
- streamInfo.TargetAudioBitrate,
streamInfo.TargetTimestamp,
streamInfo.IsDirectStream,
streamInfo.RunTimeTicks,