aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-12-24 02:00:23 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-25 21:21:24 -0500
commit2e2929c77f720611e33661293ca50d78cc607f9d (patch)
treead5d76e900a7f7f21fb17e4f5a5ae685f9dc3924
parentee1e0c7fe383a099d0812e1a6ae9bfaea9216ae0 (diff)
fixes #1348 - [Feature Request] Option for single subtitle on DLNA config.
-rw-r--r--MediaBrowser.Dlna/Didl/DidlBuilder.cs13
-rw-r--r--MediaBrowser.Model/Dlna/DeviceProfile.cs3
2 files changed, 12 insertions, 4 deletions
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 5589a6e3ba..0a5b591ec5 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -175,19 +175,24 @@ namespace MediaBrowser.Dlna.Didl
{
if (subtitle.DeliveryMethod == SubtitleDeliveryMethod.External)
{
- AddSubtitleElement(container, subtitle);
+ var subtitleAdded = AddSubtitleElement(container, subtitle);
+
+ if (subtitleAdded && _profile.EnableSingleSubtitleLimit)
+ {
+ break;
+ }
}
}
}
- private void 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);
if (subtitleProfile == null)
{
- return;
+ return false;
}
var subtitleMode = subtitleProfile.DidlMode;
@@ -226,6 +231,8 @@ namespace MediaBrowser.Dlna.Didl
container.AppendChild(res);
}
+
+ return true;
}
private void AddVideoResource(XmlElement container, IHasMediaSources video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 6d4aa34a3c..5554c0623e 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -36,7 +36,8 @@ namespace MediaBrowser.Model.Dlna
public string SerialNumber { get; set; }
public bool EnableAlbumArtInDidl { get; set; }
- public bool EnableSingleAlbumArtLimit { get; set; }
+ public bool EnableSingleAlbumArtLimit { get; set; }
+ public bool EnableSingleSubtitleLimit { get; set; }
public string SupportedMediaTypes { get; set; }