Merge remote-tracking branch 'upstream/api-migration' into api-subtitles

1 files changed, 17 insertions, 17 deletions

diff --git a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
index 52348f802..cce508809 100644
--- a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -7,21 +8,6 @@ namespace MediaBrowser.Model.MediaInfo
 {
     public class LiveStreamRequest
     {
-        public string OpenToken { get; set; }
-        public Guid UserId { get; set; }
-        public string PlaySessionId { get; set; }
-        public long? MaxStreamingBitrate { get; set; }
-        public long? StartTimeTicks { get; set; }
-        public int? AudioStreamIndex { get; set; }
-        public int? SubtitleStreamIndex { get; set; }
-        public int? MaxAudioChannels { get; set; }
-        public Guid ItemId { get; set; }
-        public DeviceProfile DeviceProfile { get; set; }
-
-        public bool EnableDirectPlay { get; set; }
-        public bool EnableDirectStream { get; set; }
-        public MediaProtocol[] DirectPlayProtocols { get; set; }
-
         public LiveStreamRequest()
         {
             EnableDirectPlay = true;
@@ -38,12 +24,26 @@ namespace MediaBrowser.Model.MediaInfo
 
             DirectPlayProtocols = new MediaProtocol[] { MediaProtocol.Http };
 
-            var videoOptions = options as VideoOptions;
-            if (videoOptions != null)
+            if (options is VideoOptions videoOptions)
             {
                 AudioStreamIndex = videoOptions.AudioStreamIndex;
                 SubtitleStreamIndex = videoOptions.SubtitleStreamIndex;
             }
         }
+
+        public string OpenToken { get; set; }
+        public Guid UserId { get; set; }
+        public string PlaySessionId { get; set; }
+        public long? MaxStreamingBitrate { get; set; }
+        public long? StartTimeTicks { get; set; }
+        public int? AudioStreamIndex { get; set; }
+        public int? SubtitleStreamIndex { get; set; }
+        public int? MaxAudioChannels { get; set; }
+        public Guid ItemId { get; set; }
+        public DeviceProfile DeviceProfile { get; set; }
+
+        public bool EnableDirectPlay { get; set; }
+        public bool EnableDirectStream { get; set; }
+        public MediaProtocol[] DirectPlayProtocols { get; set; }
     }
 }