michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

update stream builder subtitles

Browse Source
This commit is contained in:
Luke Pulverenti 2015-07-30 22:34:15 -04:00
parent 901dab5760
commit 25395c5d82
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -735,7 +735,12 @@ namespace MediaBrowser.Model.Dlna
continue; continue;
} }
if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) if (profile.Method != SubtitleDeliveryMethod.Embed)
{
continue;
}
if (subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format) && StringHelper.EqualsIgnoreCase(profile.Format, subtitleStream.Codec))
{ {
return profile; return profile;
} }

4
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunDiscovery.cs
View File

@ -41,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
string location; string location;
if (e.Headers.TryGetValue("Location", out location)) if (e.Headers.TryGetValue("Location", out location))
{ {
_logger.Debug("HdHomerun found at {0}", location); //_logger.Debug("HdHomerun found at {0}", location);
// Just get the beginning of the url // Just get the beginning of the url
Uri uri; Uri uri;
@ -50,7 +50,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
var apiUrl = location.Replace(uri.LocalPath, String.Empty, StringComparison.OrdinalIgnoreCase) var apiUrl = location.Replace(uri.LocalPath, String.Empty, StringComparison.OrdinalIgnoreCase)
.TrimEnd('/'); .TrimEnd('/');
_logger.Debug("HdHomerun api url: {0}", apiUrl); //_logger.Debug("HdHomerun api url: {0}", apiUrl);
AddDevice(apiUrl); AddDevice(apiUrl);
} }
} }