Merge pull request #7054 from matthew-jones-uk/disable-embedded-subs

MediaBrowser.Model/Configuration/EmbeddedSubtitleOptions.cs

@@ -0,0 +1,30 @@
+namespace MediaBrowser.Model.Configuration
+{
+    /// <summary>
+    /// An enum representing the options to disable embedded subs.
+    /// </summary>
+    public enum EmbeddedSubtitleOptions
+    {
+
+        /// <summary>
+        /// Allow all embedded subs.
+        /// </summary>
+        AllowAll = 0,
+
+        /// <summary>
+        /// Allow only embedded subs that are text based.
+        /// </summary>
+        AllowText = 1,
+
+        /// <summary>
+        /// Allow only embedded subs that are image based.
+        /// </summary>
+        AllowImage = 2,
+
+        /// <summary>
+        /// Disable all embedded subs.
+        /// </summary>
+        AllowNone = 3,
+    }
+
+}

MediaBrowser.Model/Configuration/LibraryOptions.cs

@@ -15,6 +15,7 @@ namespace MediaBrowser.Model.Configuration
 
             SkipSubtitlesIfAudioTrackMatches = true;
             RequirePerfectSubtitleMatch = true;
+            AllowEmbeddedSubtitles = EmbeddedSubtitleOptions.AllowAll;
 
             AutomaticallyAddToCollection = true;
             EnablePhotos = true;
@@ -84,6 +85,8 @@ namespace MediaBrowser.Model.Configuration
 
         public bool AutomaticallyAddToCollection { get; set; }
 
+        public EmbeddedSubtitleOptions AllowEmbeddedSubtitles { get; set; }
+
         public TypeOptions[] TypeOptions { get; set; }
 
         public TypeOptions? GetTypeOptions(string type)