From 2c603f2269b77077d71d5f3c2ae92cdd1207b1c8 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 27 Aug 2016 14:39:48 -0400 Subject: [PATCH 1/2] update subtitles in dlna profiles --- MediaBrowser.Dlna/Profiles/DefaultProfile.cs | 9 +++++++++ MediaBrowser.Dlna/Profiles/LgTvProfile.cs | 5 +++++ MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs | 5 +++++ MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs | 5 +++++ MediaBrowser.Dlna/Profiles/Xml/Default.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml | 1 + MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml | 1 + MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml | 1 + MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml | 4 +++- MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml | 4 +++- 25 files changed, 81 insertions(+), 18 deletions(-) diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs index 5f60e8306..48325d0d7 100644 --- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs +++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs @@ -77,6 +77,15 @@ namespace MediaBrowser.Dlna.Profiles } }; + SubtitleProfiles = new[] + { + new SubtitleProfile + { + Format = "srt", + Method = SubtitleDeliveryMethod.Embed + } + }; + ResponseProfiles = new[] { new ResponseProfile diff --git a/MediaBrowser.Dlna/Profiles/LgTvProfile.cs b/MediaBrowser.Dlna/Profiles/LgTvProfile.cs index af81fabe4..c98dd0465 100644 --- a/MediaBrowser.Dlna/Profiles/LgTvProfile.cs +++ b/MediaBrowser.Dlna/Profiles/LgTvProfile.cs @@ -192,6 +192,11 @@ namespace MediaBrowser.Dlna.Profiles SubtitleProfiles = new[] { + new SubtitleProfile + { + Format = "srt", + Method = SubtitleDeliveryMethod.Embed + }, new SubtitleProfile { Format = "srt", diff --git a/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs b/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs index 473640c15..7b0f18fa6 100644 --- a/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs +++ b/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs @@ -188,6 +188,11 @@ namespace MediaBrowser.Dlna.Profiles SubtitleProfiles = new[] { + new SubtitleProfile + { + Format = "srt", + Method = SubtitleDeliveryMethod.Embed + }, new SubtitleProfile { Format = "srt", diff --git a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs index 1cfd96f36..63fcf60ec 100644 --- a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs @@ -340,6 +340,11 @@ namespace MediaBrowser.Dlna.Profiles SubtitleProfiles = new[] { + new SubtitleProfile + { + Format = "srt", + Method = SubtitleDeliveryMethod.Embed + }, new SubtitleProfile { Format = "srt", diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml index 40d046988..c13224f37 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml @@ -44,5 +44,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml index a4d8004dc..ea6736d4c 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml @@ -44,5 +44,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml index de5bc9727..b5dde8d5c 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml @@ -61,5 +61,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml index 9c14743e4..daf34b89b 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml @@ -86,5 +86,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml index 172886f27..945383bdc 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml @@ -81,6 +81,7 @@ + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml index a17044e15..195863668 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -44,5 +44,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml index d6a807b57..9518fc4b0 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml @@ -50,5 +50,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml index a85bdd2d5..865449cb6 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -78,6 +78,7 @@ + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml index 2ba70646a..68fea1733 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml @@ -82,5 +82,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index f8e5f1b69..77fa928cc 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -119,6 +119,7 @@ + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index 65541942c..08266d943 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -106,5 +106,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml index d2ecc7c61..e633f1a89 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml @@ -127,5 +127,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml index 04a9e0944..07379c8d5 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml @@ -130,5 +130,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml index 1bb7619d2..61870d7e7 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml @@ -106,5 +106,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml index debb86729..21fc0ff56 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml @@ -105,5 +105,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml index ac0261c07..bfa304b09 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml @@ -105,5 +105,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml index 9445fb86d..295f6fddb 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -99,5 +99,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml index 8d848833d..8f05e8eac 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml @@ -99,5 +99,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml index c47cdce29..cd6968bd0 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml @@ -110,5 +110,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml index ceb0fe244..f442e3d66 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml @@ -117,5 +117,7 @@ - + + + \ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml index 245293af1..53187db6d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml @@ -50,5 +50,7 @@ - + + + \ No newline at end of file From 92d8e9f5641ec9297df4290b9bfccfea93ca8548 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 27 Aug 2016 15:35:19 -0400 Subject: [PATCH 2/2] remove test code --- MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index a022c83d8..4af564a5a 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -989,8 +989,6 @@ namespace MediaBrowser.Api.Playback } } - arg += string.Format(" -ss {0}", MediaEncoder.GetTimeParameter(TimeSpan.FromSeconds(1).Ticks)); - return arg.Trim(); }