diff --git a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs index 63bb0b52a28..5bfd377263c 100644 --- a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs +++ b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs @@ -232,6 +232,35 @@ namespace MediaBrowser.Dlna.Profiles } } }; + + SubtitleProfiles = new[] + { + new SubtitleProfile + { + Format = "srt", + Method = SubtitleDeliveryMethod.External + }, + new SubtitleProfile + { + Format = "srt", + Method = SubtitleDeliveryMethod.Embed + }, + new SubtitleProfile + { + Format = "sub", + Method = SubtitleDeliveryMethod.Embed + }, + new SubtitleProfile + { + Format = "subrip", + Method = SubtitleDeliveryMethod.Embed + }, + new SubtitleProfile + { + Format = "idx", + Method = SubtitleDeliveryMethod.Embed + } + }; } } } diff --git a/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml b/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml index a537cbfcf69..ca98f950b61 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml @@ -1,5 +1,5 @@ - + BubbleUPnp BubbleUPnp @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml index 72cad451360..58c37a42388 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml @@ -1,5 +1,5 @@ - + Generic Device Emby Emby @@ -10,6 +10,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml index bbaf23cc57e..86be2d18b34 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml @@ -1,5 +1,5 @@ - + Denon AVR Denon:\[AVR:.* @@ -15,6 +15,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml index 5de643b0267..c553f9a0699 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml @@ -1,5 +1,5 @@ - + DirecTV HD-DVR ^DIRECTV.*$ @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml index bf65212b9d2..bb14ea309dd 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml @@ -1,5 +1,5 @@ - + Dish Hopper-Joey Echostar Technologies LLC @@ -17,6 +17,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Kodi.xml b/MediaBrowser.Dlna/Profiles/Xml/Kodi.xml index 42a255a3779..5d30d141e0d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Kodi.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Kodi.xml @@ -1,5 +1,5 @@ - + Kodi Kodi @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml index 044baaa70bf..62da6dbf474 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml @@ -1,5 +1,5 @@ - + LG Smart TV LG.* @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml index ca64d36d4de..9d83164d818 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -1,5 +1,5 @@ - + Linksys DMA2100 DMA2100us @@ -14,6 +14,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml index 61e7fedf86b..b66ebfe9ec6 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml @@ -1,5 +1,5 @@ - + MediaMonkey MediaMonkey @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml index 147182b7ed8..329c97fbd8e 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -1,5 +1,5 @@ - + Panasonic Viera VIERA @@ -17,6 +17,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml index 1378341fb0d..a53e731cfbc 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml @@ -1,5 +1,5 @@ - + Popcorn Hour Emby Emby @@ -10,6 +10,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index c9f139eaa36..642395ac854 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -1,5 +1,5 @@ - + Samsung Smart TV samsung.com @@ -16,6 +16,7 @@ http://emby.media/ true false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml index 7eb9db7f6f2..afcce2b0726 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml @@ -1,5 +1,5 @@ - + Sony Blu-ray Player 2013 Blu-ray Disc Player @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index 013600f87a5..8dc221251a4 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -1,5 +1,5 @@ - + Sony Blu-ray Player Blu-ray Disc Player @@ -18,6 +18,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml index 65252f74988..69dae280653 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml @@ -1,5 +1,5 @@ - + Sony Bravia (2010) KDL-\d{2}[EHLNPB]X\d[01]\d.* @@ -17,6 +17,7 @@ http://www.microsoft.com/ true true + false Audio,Photo,Video JPEG_TN 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml index 5f7f0a2eee0..2292d634df3 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml @@ -1,5 +1,5 @@ - + Sony Bravia (2011) KDL-\d{2}([A-Z]X\d2\d|CX400).* @@ -17,6 +17,7 @@ http://www.microsoft.com/ true true + false Audio,Photo,Video JPEG_TN 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml index 0951d5e0eab..095fcb28e31 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml @@ -1,5 +1,5 @@ - + Sony Bravia (2012) KDL-\d{2}[A-Z]X\d5(\d|G).* @@ -17,6 +17,7 @@ http://www.microsoft.com/ true true + false Audio,Photo,Video JPEG_TN 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml index d3a7dbab916..c700c4bfbca 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml @@ -1,5 +1,5 @@ - + Sony Bravia (2013) KDL-\d{2}[WR][5689]\d{2}A.* @@ -17,6 +17,7 @@ http://www.microsoft.com/ true true + false Audio,Photo,Video JPEG_TN 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml index 2859743fb64..96fa2861dd8 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml @@ -1,5 +1,5 @@ - + Sony Bravia (2014) (KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).* @@ -17,6 +17,7 @@ http://www.microsoft.com/ true true + false Audio,Photo,Video JPEG_TN 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml index 33066d8ef91..5d6e7200006 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -1,5 +1,5 @@ - + Sony PlayStation 3 PLAYSTATION 3 @@ -17,6 +17,7 @@ http://emby.media/ false true + false Audio,Photo,Video JPEG_TN 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml index 3b372aec5c2..939c8a81391 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml @@ -1,5 +1,5 @@ - + Sony PlayStation 4 PLAYSTATION 4 @@ -17,6 +17,7 @@ http://emby.media/ false true + false Audio,Photo,Video JPEG_TN 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml b/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml index 6b341671ce3..82b806f1a0d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml @@ -1,5 +1,5 @@ - + Vlc Vlc @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml index 7f216a65c92..df2a746d099 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml @@ -1,5 +1,5 @@ - + WDTV Live WD TV @@ -17,6 +17,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 @@ -83,5 +84,11 @@ - + + + + + + + \ 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 1182243807b..bfe1fceea05 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml @@ -1,5 +1,5 @@ - + Xbox 360 Xbox 360 @@ -17,6 +17,7 @@ http://go.microsoft.com/fwlink/?LinkId=105926 false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml index 4c6287442b8..bd315ac6625 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml @@ -1,5 +1,5 @@ - + Xbox One Xbox One @@ -17,6 +17,7 @@ http://emby.media/ false false + false Audio,Photo,Video JPEG_SM 480 diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml index ca95ecde317..a282af6556c 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml @@ -1,5 +1,5 @@ - + foobar2000 foobar @@ -16,6 +16,7 @@ http://emby.media/ false false + false Audio JPEG_SM 480