diff options
| author | 7illusions <z@7illusions.com> | 2014-05-03 22:53:52 +0200 |
|---|---|---|
| committer | 7illusions <z@7illusions.com> | 2014-05-03 22:53:52 +0200 |
| commit | 3fcf3cf43dcc6d0c4e96e756551fbd9f4371954d (patch) | |
| tree | 3ab806e49166d6cd2852d3ea3ee774a55139b96a | |
| parent | af819a6c61678b7525d94961384f9eb3e3cf7a13 (diff) | |
| parent | 78fc5afdc44090675215e0d54103f58d7e765cef (diff) | |
Merge pull request #1 from MediaBrowser/master
sync
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index ac0641655..69a812cbf 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1725,16 +1725,11 @@ namespace MediaBrowser.Api.Playback { var profile = state.DeviceProfile; - if (profile == null) - { - return; - } - var transferMode = GetHeader("transferMode.dlna.org"); responseHeaders["transferMode.dlna.org"] = string.IsNullOrEmpty(transferMode) ? "Streaming" : transferMode; responseHeaders["realTimeInfo.dlna.org"] = "DLNA.ORG_TLAG=*"; - if (state.RunTimeTicks.HasValue && !isStaticallyStreamed) + if (state.RunTimeTicks.HasValue && !isStaticallyStreamed && profile != null) { AddTimeSeekResponseHeaders(state, responseHeaders); } diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs index f3357dc5b..7e21e1ef2 100644 --- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs +++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs @@ -138,8 +138,8 @@ namespace MediaBrowser.Model.Dlna //flagValue = flagValue | DlnaFlags.DLNA_ORG_FLAG_TIME_BASED_SEEK; } - var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}000000000000000000000000", - Enum.Format(typeof(DlnaFlags), flagValue, "x")); + var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}", + FlagsToString(flagValue)); var mediaProfile = _profile.GetVideoMediaProfile(container, audioCodec, |