alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-27 01:50:53 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update stream closing

Browse Source
This commit is contained in:
Luke Pulverenti
2015-03-23 13:19:21 -04:00
parent 30a507eca8
commit e3a573ea97
8 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@@ -69,6 +69,8 @@ namespace MediaBrowser.Model.Dlna
public SubtitleDeliveryMethod SubtitleDeliveryMethod { get; set; }
public string SubtitleFormat { get; set; }
public LiveMediaInfoResult PlaybackInfo { get; set; }
public string MediaSourceId
{
get
@@ -262,7 +264,7 @@ namespace MediaBrowser.Model.Dlna
private SubtitleStreamInfo GetSubtitleStreamInfo(MediaStream stream)
{
SubtitleProfile subtitleProfile = StreamBuilder.GetSubtitleProfile(stream, DeviceProfile, Context);
SubtitleProfile subtitleProfile = StreamBuilder.GetSubtitleProfile(stream, DeviceProfile.SubtitleProfiles, Context);
if (subtitleProfile.Method != SubtitleDeliveryMethod.External)
{
@@ -288,17 +290,7 @@ namespace MediaBrowser.Model.Dlna
{
if (MediaSource != null)
{
if (AudioStreamIndex.HasValue)
{
foreach (MediaStream i in MediaSource.MediaStreams)
{
if (i.Index == AudioStreamIndex.Value && i.Type == MediaStreamType.Audio)
return i;
}
return null;
}
return MediaSource.DefaultAudioStream;
return MediaSource.GetDefaultAudioStream(AudioStreamIndex);
}
return null;