From 0834dc58c13b42e599c78e3898229ecc09120754 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Wed, 7 Dec 2022 18:06:04 +0100 Subject: [PATCH] Fix .Net 7 compatibility --- MediaBrowser.Model/Dlna/MediaOptions.cs | 15 +++++++-------- MediaBrowser.Model/Dlna/StreamBuilder.cs | 5 ++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/MediaBrowser.Model/Dlna/MediaOptions.cs b/MediaBrowser.Model/Dlna/MediaOptions.cs index 71ee1db05d..29aecf97fc 100644 --- a/MediaBrowser.Model/Dlna/MediaOptions.cs +++ b/MediaBrowser.Model/Dlna/MediaOptions.cs @@ -11,7 +11,7 @@ namespace MediaBrowser.Model.Dlna public class MediaOptions { /// - /// Creates a new instance of the class. + /// Initializes a new instance of the class. /// public MediaOptions() { @@ -22,32 +22,32 @@ namespace MediaBrowser.Model.Dlna } /// - /// Gets or sets a boolean to allow/forbid direct playback. + /// Gets or sets a value indicating whether direct playback is allowed. /// public bool EnableDirectPlay { get; set; } /// - /// Gets or sets a boolean to allow/forbid direct streaming. + /// Gets or sets a value indicating whether direct streaming is allowed. /// public bool EnableDirectStream { get; set; } /// - /// Gets or sets a boolean to force direct playback. + /// Gets or sets a value indicating whether direct playback is forced. /// public bool ForceDirectPlay { get; set; } /// - /// Gets or sets a boolean to force direct streaming. + /// Gets or sets a value indicating whether direct streaming is forced. /// public bool ForceDirectStream { get; set; } /// - /// Gets or sets a boolean to allow/forbid audio stream copy. + /// Gets or sets a value indicating whether audio stream copy is allowed. /// public bool AllowAudioStreamCopy { get; set; } /// - /// Gets or sets a boolean to allow/forbid video stream copy. + /// Gets or sets a value indicating whether video stream copy is allowed. /// public bool AllowVideoStreamCopy { get; set; } @@ -64,7 +64,6 @@ namespace MediaBrowser.Model.Dlna /// /// Gets or sets the device profile. /// - public DeviceProfile Profile { get; set; } /// diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index bb1e236bea..2f919b0451 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -1483,7 +1483,6 @@ namespace MediaBrowser.Model.Dlna return false; } - long requestedMaxBitrate = maxBitrate > 0 ? maxBitrate : 1000000; // If we don't know the bitrate, then force a transcode if requested max bitrate is under 40 mbps @@ -1501,7 +1500,7 @@ namespace MediaBrowser.Model.Dlna return false; } - private static void ValidateMediaOptions(MediaOptions options, Boolean IsMediaSource) + private static void ValidateMediaOptions(MediaOptions options, bool isMediaSource) { if (options.ItemId.Equals(default)) { @@ -1518,7 +1517,7 @@ namespace MediaBrowser.Model.Dlna throw new ArgumentException("MediaSources is required"); } - if (IsMediaSource) + if (isMediaSource) { if (options.AudioStreamIndex.HasValue && string.IsNullOrEmpty(options.MediaSourceId)) {