Merge branch 'jellyfin:master' into feature/EFUserData

5 files changed, 32 insertions, 28 deletions

diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index 6054ba34e..590b74304 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Configuration
             TypeOptions = Array.Empty<TypeOptions>();
             DisabledSubtitleFetchers = Array.Empty<string>();
             DisabledMediaSegmentProviders = Array.Empty<string>();
-            MediaSegmentProvideOrder = Array.Empty<string>();
+            MediaSegmentProviderOrder = Array.Empty<string>();
             SubtitleFetcherOrder = Array.Empty<string>();
             DisabledLocalMetadataReaders = Array.Empty<string>();
             DisabledLyricFetchers = Array.Empty<string>();
@@ -99,7 +99,7 @@ namespace MediaBrowser.Model.Configuration
 
         public string[] DisabledMediaSegmentProviders { get; set; }
 
-        public string[] MediaSegmentProvideOrder { get; set; }
+        public string[] MediaSegmentProviderOrder { get; set; }
 
         public bool SkipSubtitlesIfEmbeddedSubtitlesPresent { get; set; }
 
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 5ad588200..bc4e6ef73 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -244,11 +244,6 @@ public class ServerConfiguration : BaseApplicationConfiguration
     public int LibraryMetadataRefreshConcurrency { get; set; }
 
     /// <summary>
-    /// Gets or sets a value indicating whether older plugins should automatically be deleted from the plugin folder.
-    /// </summary>
-    public bool RemoveOldPlugins { get; set; }
-
-    /// <summary>
     /// Gets or sets a value indicating whether clients should be allowed to upload logs.
     /// </summary>
     public bool AllowClientLogUpload { get; set; } = true;
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 5d65b0f9b..e4c0239b8 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -125,6 +125,7 @@ namespace MediaBrowser.Model.Net
             new("audio/vorbis", ".vorbis"),
             new("audio/x-ape", ".ape"),
             new("audio/xsp", ".xsp"),
+            new("audio/x-aac", ".aac"),
             new("audio/x-wavpack", ".wv"),
 
             // Type image
diff --git a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
index 63709557d..186c0aed3 100644
--- a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
+++ b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
@@ -9,30 +9,10 @@ namespace MediaBrowser.Model.Tasks
     public class TaskTriggerInfo
     {
         /// <summary>
-        /// The daily trigger.
-        /// </summary>
-        public const string TriggerDaily = "DailyTrigger";
-
-        /// <summary>
-        /// The weekly trigger.
-        /// </summary>
-        public const string TriggerWeekly = "WeeklyTrigger";
-
-        /// <summary>
-        /// The interval trigger.
-        /// </summary>
-        public const string TriggerInterval = "IntervalTrigger";
-
-        /// <summary>
-        /// The startup trigger.
-        /// </summary>
-        public const string TriggerStartup = "StartupTrigger";
-
-        /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        public string Type { get; set; }
+        public TaskTriggerInfoType Type { get; set; }
 
         /// <summary>
         /// Gets or sets the time of day.
diff --git a/MediaBrowser.Model/Tasks/TaskTriggerInfoType.cs b/MediaBrowser.Model/Tasks/TaskTriggerInfoType.cs
new file mode 100644
index 000000000..b596cf580
--- /dev/null
+++ b/MediaBrowser.Model/Tasks/TaskTriggerInfoType.cs
@@ -0,0 +1,28 @@
+namespace MediaBrowser.Model.Tasks
+{
+    /// <summary>
+    /// Enum TaskTriggerInfoType.
+    /// </summary>
+    public enum TaskTriggerInfoType
+    {
+        /// <summary>
+        /// The daily trigger.
+        /// </summary>
+        DailyTrigger,
+
+        /// <summary>
+        /// The weekly trigger.
+        /// </summary>
+        WeeklyTrigger,
+
+        /// <summary>
+        /// The interval trigger.
+        /// </summary>
+        IntervalTrigger,
+
+        /// <summary>
+        /// The startup trigger.
+        /// </summary>
+        StartupTrigger
+    }
+}