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

fix samsung dlna subtitles

Browse Source
This commit is contained in:
Luke Pulverenti 2016-03-22 00:15:12 -04:00
parent 7a014affb2
commit 49c678037a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Dlna/Didl/DidlBuilder.cs
View File

@ -188,15 +188,15 @@ namespace MediaBrowser.Dlna.Didl
{
var subtitleAdded = AddSubtitleElement(container, subtitle);
if (subtitleAdded && _profile.EnableSingleSubtitleLimit)
{
break;
}
if (subtitleAdded && _profile.EnableSingleSubtitleLimit)
{
break;
}
}
}
}
private bool AddSubtitleElement(XmlElement container, SubtitleStreamInfo info)
private bool AddSubtitleElement(XmlElement container, SubtitleStreamInfo info)
{
var subtitleProfile = _profile.SubtitleProfiles
.FirstOrDefault(i => string.Equals(info.Format, i.Format, StringComparison.OrdinalIgnoreCase) && i.Method == SubtitleDeliveryMethod.External);
@ -213,13 +213,13 @@ namespace MediaBrowser.Dlna.Didl
// <sec:CaptionInfoEx sec:type="srt">http://192.168.1.3:9999/video.srt</sec:CaptionInfoEx>
// <sec:CaptionInfo sec:type="srt">http://192.168.1.3:9999/video.srt</sec:CaptionInfo>
//var res = container.OwnerDocument.CreateElement("SEC", "CaptionInfoEx");
var res = container.OwnerDocument.CreateElement("CaptionInfoEx", "sec");
//res.InnerText = info.Url;
res.InnerText = info.Url;
//// TODO: attribute needs SEC:
//res.SetAttribute("type", info.Format.ToLower());
//container.AppendChild(res);
res.SetAttribute("type", "sec", info.Format.ToLower());
container.AppendChild(res);
}
else if (string.Equals(subtitleMode, "smi", StringComparison.OrdinalIgnoreCase))
{
@ -243,7 +243,7 @@ namespace MediaBrowser.Dlna.Didl
container.AppendChild(res);
}
return true;
return true;
}
private void AddVideoResource(XmlElement container, IHasMediaSources video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)

2
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@ -604,7 +604,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
process.StandardError.BaseStream.CopyToAsync(logFileStream);
var ranToCompletion = process.WaitForExit(120000);
var ranToCompletion = process.WaitForExit(300000);
if (!ranToCompletion)
{