mirror of https://github.com/jellyfin/jellyfin.git
Fix some incompatible API deprecations
This commit is contained in:
parent
470a32c8f8
commit
be29b4a0c4
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Jellyfin.Data.Enums;
|
using Jellyfin.Data.Enums;
|
||||||
using Jellyfin.Extensions.Json.Converters;
|
using Jellyfin.Extensions.Json.Converters;
|
||||||
|
@ -50,6 +51,18 @@ public class ClientCapabilitiesDto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? IconUrl { get; set; }
|
public string? IconUrl { get; set; }
|
||||||
|
|
||||||
|
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
|
||||||
|
// TODO: Remove after 10.9
|
||||||
|
[Obsolete("Unused")]
|
||||||
|
[DefaultValue(false)]
|
||||||
|
public bool? SupportsContentUploading { get; set; }
|
||||||
|
|
||||||
|
// TODO: Remove after 10.9
|
||||||
|
[Obsolete("Unused")]
|
||||||
|
[DefaultValue(false)]
|
||||||
|
public bool? SupportsSync { get; set; }
|
||||||
|
#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Convert the dto to the full <see cref="ClientCapabilities"/> model.
|
/// Convert the dto to the full <see cref="ClientCapabilities"/> model.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
using Jellyfin.Data.Enums;
|
using Jellyfin.Data.Enums;
|
||||||
using MediaBrowser.Model.Dlna;
|
using MediaBrowser.Model.Dlna;
|
||||||
|
|
||||||
|
@ -30,5 +31,15 @@ namespace MediaBrowser.Model.Session
|
||||||
public string AppStoreUrl { get; set; }
|
public string AppStoreUrl { get; set; }
|
||||||
|
|
||||||
public string IconUrl { get; set; }
|
public string IconUrl { get; set; }
|
||||||
|
|
||||||
|
// TODO: Remove after 10.9
|
||||||
|
[Obsolete("Unused")]
|
||||||
|
[DefaultValue(false)]
|
||||||
|
public bool? SupportsContentUploading { get; set; }
|
||||||
|
|
||||||
|
// TODO: Remove after 10.9
|
||||||
|
[Obsolete("Unused")]
|
||||||
|
[DefaultValue(false)]
|
||||||
|
public bool? SupportsSync { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,29 +3,11 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Runtime.InteropServices;
|
using System.ComponentModel;
|
||||||
using MediaBrowser.Model.Updates;
|
using MediaBrowser.Model.Updates;
|
||||||
|
|
||||||
namespace MediaBrowser.Model.System
|
namespace MediaBrowser.Model.System
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Enum describing the location of the FFmpeg tool.
|
|
||||||
/// </summary>
|
|
||||||
public enum FFmpegLocation
|
|
||||||
{
|
|
||||||
/// <summary>No path to FFmpeg found.</summary>
|
|
||||||
NotFound,
|
|
||||||
|
|
||||||
/// <summary>Path supplied via command line using switch --ffmpeg.</summary>
|
|
||||||
SetByArgument,
|
|
||||||
|
|
||||||
/// <summary>User has supplied path via Transcoding UI page.</summary>
|
|
||||||
Custom,
|
|
||||||
|
|
||||||
/// <summary>FFmpeg tool found on system $PATH.</summary>
|
|
||||||
System
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class SystemInfo.
|
/// Class SystemInfo.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -83,9 +65,11 @@ namespace MediaBrowser.Model.System
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value><c>true</c>.</value>
|
/// <value><c>true</c>.</value>
|
||||||
[Obsolete("This is always true")]
|
[Obsolete("This is always true")]
|
||||||
|
[DefaultValue(true)]
|
||||||
public bool CanSelfRestart { get; set; } = true;
|
public bool CanSelfRestart { get; set; } = true;
|
||||||
|
|
||||||
[Obsolete("This is always false")]
|
[Obsolete("This is always false")]
|
||||||
|
[DefaultValue(false)]
|
||||||
public bool CanLaunchWebBrowser { get; set; } = false;
|
public bool CanLaunchWebBrowser { get; set; } = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -140,12 +124,15 @@ namespace MediaBrowser.Model.System
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
|
/// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
|
||||||
[Obsolete("This should be handled by the package manager")]
|
[Obsolete("This should be handled by the package manager")]
|
||||||
|
[DefaultValue(false)]
|
||||||
public bool HasUpdateAvailable { get; set; }
|
public bool HasUpdateAvailable { get; set; }
|
||||||
|
|
||||||
[Obsolete("This isn't set correctly anymore")]
|
[Obsolete("This isn't set correctly anymore")]
|
||||||
public FFmpegLocation EncoderLocation { get; set; }
|
[DefaultValue("System")]
|
||||||
|
public string EncoderLocation { get; set; } = "System";
|
||||||
|
|
||||||
[Obsolete("This is no longer set")]
|
[Obsolete("This is no longer set")]
|
||||||
public Architecture SystemArchitecture { get; set; } = Architecture.X64;
|
[DefaultValue("X64")]
|
||||||
|
public string SystemArchitecture { get; set; } = "X64";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue