Merge branch 'master' into network-rewrite

MediaBrowser.Model/Configuration/EncodingOptions.cs

@@ -20,6 +20,8 @@ public class EncodingOptions
         MaxMuxingQueueSize = 2048;
         EnableThrottling = false;
         ThrottleDelaySeconds = 180;
+        EnableSegmentDeletion = false;
+        SegmentKeepSeconds = 720;
         EncodingThreadCount = -1;
         // This is a DRM device that is almost guaranteed to be there on every intel platform,
         // plus it's the default one in ffmpeg if you don't specify anything
@@ -102,6 +104,16 @@ public class EncodingOptions
     /// </summary>
     public int ThrottleDelaySeconds { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether segment deletion is enabled.
+    /// </summary>
+    public bool EnableSegmentDeletion { get; set; }
+
+    /// <summary>
+    /// Gets or sets seconds for which segments should be kept before being deleted.
+    /// </summary>
+    public int SegmentKeepSeconds { get; set; }
+
     /// <summary>
     /// Gets or sets the hardware acceleration type.
     /// </summary>

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -165,6 +165,12 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The file watcher delay.</value>
         public int LibraryMonitorDelay { get; set; } = 60;
 
+        /// <summary>
+        /// Gets or sets the duration in seconds that we will wait after a library updated event before executing the library changed notification.
+        /// </summary>
+        /// <value>The library update duration.</value>
+        public int LibraryUpdateDuration { get; set; } = 30;
+
         /// <summary>
         /// Gets or sets the image saving convention.
         /// </summary>