Browse Source

Merge pull request #1 from MediaBrowser/master

sync
7illusions 11 years ago
parent
commit
3fcf3cf43d

+ 1 - 6
MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -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);
             }
             }

+ 2 - 2
MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs

@@ -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",
-             Enum.Format(typeof(DlnaFlags), flagValue, "x"));
+            var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
+             FlagsToString(flagValue));
 
 
             var mediaProfile = _profile.GetVideoMediaProfile(container,
             var mediaProfile = _profile.GetVideoMediaProfile(container,
                 audioCodec,
                 audioCodec,