Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-24 22:48:56 +02:00
Code Issues 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
parent 73ede8c4a1 92d8e9f564
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();
}

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[]
{
new ResponseProfile

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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