Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-06 11:34:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1 from MediaBrowser/master

Browse source 
sync
This commit is contained in:
7illusions 2014-05-03 22:53:52 +02:00
commit 3fcf3cf43d
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
MediaBrowser.Api/Playback/BaseStreamingService.cs
View file

@ -1725,16 +1725,11 @@ namespace MediaBrowser.Api.Playback
{ {
var profile = state.DeviceProfile; var profile = state.DeviceProfile;
if (profile == null)
{
return;
}
var transferMode = GetHeader("transferMode.dlna.org"); var transferMode = GetHeader("transferMode.dlna.org");
responseHeaders["transferMode.dlna.org"] = string.IsNullOrEmpty(transferMode) ? "Streaming" : transferMode; responseHeaders["transferMode.dlna.org"] = string.IsNullOrEmpty(transferMode) ? "Streaming" : transferMode;
responseHeaders["realTimeInfo.dlna.org"] = "DLNA.ORG_TLAG=*"; responseHeaders["realTimeInfo.dlna.org"] = "DLNA.ORG_TLAG=*";
if (state.RunTimeTicks.HasValue && !isStaticallyStreamed) if (state.RunTimeTicks.HasValue && !isStaticallyStreamed && profile != null)
{ {
AddTimeSeekResponseHeaders(state, responseHeaders); AddTimeSeekResponseHeaders(state, responseHeaders);
} }

4
MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
View file

@ -138,8 +138,8 @@ namespace MediaBrowser.Model.Dlna
//flagValue = flagValue | DlnaFlags.DLNA_ORG_FLAG_TIME_BASED_SEEK; //flagValue = flagValue | DlnaFlags.DLNA_ORG_FLAG_TIME_BASED_SEEK;
} }
var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}000000000000000000000000", var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
Enum.Format(typeof(DlnaFlags), flagValue, "x")); FlagsToString(flagValue));
var mediaProfile = _profile.GetVideoMediaProfile(container, var mediaProfile = _profile.GetVideoMediaProfile(container,
audioCodec, audioCodec,