lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2014-04-06 14:50:16 -04:00
commit de24402277
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Dlna/PlayTo/DlnaController.cs
View File

@ -167,6 +167,10 @@ namespace MediaBrowser.Dlna.PlayTo
if (_currentItem == null || _device.IsStopped) if (_currentItem == null || _device.IsStopped)
return; return;
var playlistItem = Playlist.FirstOrDefault(p => p.PlayState == 1);
if (playlistItem != null)
{
if (!_playbackStarted) if (!_playbackStarted)
{ {
await _sessionManager.OnPlaybackStart(new PlaybackInfo await _sessionManager.OnPlaybackStart(new PlaybackInfo
@ -174,7 +178,10 @@ namespace MediaBrowser.Dlna.PlayTo
Item = _currentItem, Item = _currentItem,
SessionId = _session.Id, SessionId = _session.Id,
CanSeek = true, CanSeek = true,
QueueableMediaTypes = new List<string> { _currentItem.MediaType } QueueableMediaTypes = new List<string> { _currentItem.MediaType },
MediaSourceId = playlistItem.MediaSourceId,
AudioStreamIndex = playlistItem.AudioStreamIndex,
SubtitleStreamIndex = playlistItem.SubtitleStreamIndex
}).ConfigureAwait(false); }).ConfigureAwait(false);
@ -182,10 +189,6 @@ namespace MediaBrowser.Dlna.PlayTo
} }
if ((_device.IsPlaying || _device.IsPaused)) if ((_device.IsPlaying || _device.IsPaused))
{
var playlistItem = Playlist.FirstOrDefault(p => p.PlayState == 1);
if (playlistItem != null)
{ {
var ticks = _device.Position.Ticks; var ticks = _device.Position.Ticks;