aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-12-24 02:00:23 -0500
committerLuke <luke.pulverenti@gmail.com>2015-12-24 02:00:23 -0500
commit575ca7683ce65ff476b5923526b077e04e41b94d (patch)
tree01ad184361b8ecb3bfd032f62861b841e82b10aa
parentab921727207e1cc6f48c87ee281cb80fc4933fb3 (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 571898733..40507db0c 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 6d4aa34a3..5554c0623 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; }