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

Merge pull request #2111 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-08-27 15:36:29 -04:00 committed by GitHub
commit 0bea5725d3
26 changed files with 81 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -989,8 +989,6 @@ namespace MediaBrowser.Api.Playback
} }
} }
arg += string.Format(" -ss {0}", MediaEncoder.GetTimeParameter(TimeSpan.FromSeconds(1).Ticks));
return arg.Trim(); return arg.Trim();
} }

9
MediaBrowser.Dlna/Profiles/DefaultProfile.cs
View File

@ -77,6 +77,15 @@ namespace MediaBrowser.Dlna.Profiles
} }
}; };
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
}
};
ResponseProfiles = new[] ResponseProfiles = new[]
{ {
new ResponseProfile new ResponseProfile

5
MediaBrowser.Dlna/Profiles/LgTvProfile.cs
View File

@ -192,6 +192,11 @@ namespace MediaBrowser.Dlna.Profiles
SubtitleProfiles = new[] SubtitleProfiles = new[]
{ {
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
},
new SubtitleProfile new SubtitleProfile
{ {
Format = "srt", Format = "srt",

5
MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs
View File

@ -188,6 +188,11 @@ namespace MediaBrowser.Dlna.Profiles
SubtitleProfiles = new[] SubtitleProfiles = new[]
{ {
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
},
new SubtitleProfile new SubtitleProfile
{ {
Format = "srt", Format = "srt",

5
MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs
View File

@ -340,6 +340,11 @@ namespace MediaBrowser.Dlna.Profiles
SubtitleProfiles = new[] SubtitleProfiles = new[]
{ {
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
},
new SubtitleProfile new SubtitleProfile
{ {
Format = "srt", Format = "srt",

4
MediaBrowser.Dlna/Profiles/Xml/Default.xml
View File

@ -44,5 +44,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
View File

@ -44,5 +44,7 @@
<ContainerProfiles /> <ContainerProfiles />
<CodecProfiles /> <CodecProfiles />
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
View File

@ -61,5 +61,7 @@
</CodecProfile> </CodecProfile>
</CodecProfiles> </CodecProfiles>
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
View File

@ -86,5 +86,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

1
MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
View File

@ -81,6 +81,7 @@
</CodecProfiles> </CodecProfiles>
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
<SubtitleProfile format="srt" method="External" /> <SubtitleProfile format="srt" method="External" />
</SubtitleProfiles> </SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
View File

@ -44,5 +44,7 @@
<ContainerProfiles /> <ContainerProfiles />
<CodecProfiles /> <CodecProfiles />
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
View File

@ -50,5 +50,7 @@
<ContainerProfiles /> <ContainerProfiles />
<CodecProfiles /> <CodecProfiles />
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

1
MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
View File

@ -78,6 +78,7 @@
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
<SubtitleProfile format="srt" method="External" /> <SubtitleProfile format="srt" method="External" />
</SubtitleProfiles> </SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml
View File

@ -82,5 +82,7 @@
</CodecProfile> </CodecProfile>
</CodecProfiles> </CodecProfiles>
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

1
MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
View File

@ -119,6 +119,7 @@
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
<SubtitleProfile format="srt" method="External" didlMode="CaptionInfoEx" /> <SubtitleProfile format="srt" method="External" didlMode="CaptionInfoEx" />
</SubtitleProfiles> </SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
View File

@ -106,5 +106,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
View File

@ -127,5 +127,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
View File

@ -130,5 +130,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
View File

@ -106,5 +106,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
View File

@ -105,5 +105,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml
View File

@ -105,5 +105,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
View File

@ -99,5 +99,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml
View File

@ -99,5 +99,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
View File

@ -110,5 +110,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
View File

@ -117,5 +117,7 @@
<Conditions /> <Conditions />
</ResponseProfile> </ResponseProfile>
</ResponseProfiles> </ResponseProfiles>
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>

4
MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
View File

@ -50,5 +50,7 @@
<ContainerProfiles /> <ContainerProfiles />
<CodecProfiles /> <CodecProfiles />
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile> </Profile>