From f07134cc55d22bc3df6a62b1ea56717f092685bd Mon Sep 17 00:00:00 2001
From: TwistedUmbrellaX <1173913+AbandonedCart@users.noreply.github.com>
Date: Thu, 10 Oct 2024 11:38:47 -0400
Subject: [PATCH] All platforms ship with ffmpeg (#340)

* All platforms ship with ffmpeg

This is no longer necessary as a workaround for ffmpeg without chromaprint.

* Remove an obsolete reference

* Reset existing user setting to "true"
---
 .../Configuration/PluginConfiguration.cs          |  2 +-
 .../Configuration/configPage.html                 | 15 ---------------
 .../ScheduledTasks/BaseItemAnalyzerTask.cs        |  6 +++---
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs
index 033a2be..16306ea 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs
@@ -61,7 +61,7 @@ public class PluginConfiguration : BasePluginConfiguration
     /// <summary>
     /// Gets or sets a value indicating whether analysis will use Chromaprint to determine fingerprints.
     /// </summary>
-    public bool UseChromaprint { get; set; } = true;
+    public bool WithChromaprint { get; set; } = true;
 
     // ===== EDL handling =====
 
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html
index a0101aa..da94930 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html
@@ -269,20 +269,6 @@
                             <summary>Process Configuration</summary>
 
                             <br />
-                            <div class="checkboxContainer checkboxContainer-withDescription">
-                                <label class="emby-checkbox-label">
-                                    <input id="UseChromaprint" type="checkbox" is="emby-checkbox" />
-                                    <span>Chromaprint analysis</span>
-                                </label>
-
-                                <div class="fieldDescription">
-                                    If checked, analysis will use Chromaprint to compare episode audio and identify intros.
-                                    <br />
-                                    <strong>WARNING: Disabling this option may result in incomplete or innaccurate analysis!</strong>
-                                    <br />
-                                </div>
-                            </div>
-
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
                                     <input id="CacheFingerprints" type="checkbox" is="emby-checkbox" />
@@ -812,7 +798,6 @@
                 "AnalyzeSeasonZero",
                 "SelectAllLibraries",
                 "RegenerateEdlFiles",
-                "UseChromaprint",
                 "CacheFingerprints",
                 "AutoSkip",
                 "AutoSkipCredits",
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs
index 1e7bc57..7f8c49f 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs
@@ -61,7 +61,7 @@ public class BaseItemAnalyzerTask
     {
         var ffmpegValid = FFmpegWrapper.CheckFFmpegVersion();
         // Assert that ffmpeg with chromaprint is installed
-        if (Plugin.Instance!.Configuration.UseChromaprint && !ffmpegValid)
+        if (Plugin.Instance!.Configuration.WithChromaprint && !ffmpegValid)
         {
             throw new FingerprintException(
                 "Analysis terminated! Chromaprint is not enabled in the current ffmpeg. If Jellyfin is running natively, install jellyfin-ffmpeg5. If Jellyfin is running in a container, upgrade to version 10.8.0 or newer.");
@@ -211,7 +211,7 @@ public class BaseItemAnalyzerTask
             new ChapterAnalyzer(_loggerFactory.CreateLogger<ChapterAnalyzer>())
         };
 
-        if (first.IsAnime && Plugin.Instance!.Configuration.UseChromaprint)
+        if (first.IsAnime && Plugin.Instance!.Configuration.WithChromaprint)
         {
             analyzers.Add(new ChromaprintAnalyzer(_loggerFactory.CreateLogger<ChromaprintAnalyzer>()));
         }
@@ -221,7 +221,7 @@ public class BaseItemAnalyzerTask
             analyzers.Add(new BlackFrameAnalyzer(_loggerFactory.CreateLogger<BlackFrameAnalyzer>()));
         }
 
-        if (!first.IsAnime && Plugin.Instance!.Configuration.UseChromaprint)
+        if (!first.IsAnime && Plugin.Instance!.Configuration.WithChromaprint)
         {
             analyzers.Add(new ChromaprintAnalyzer(_loggerFactory.CreateLogger<ChromaprintAnalyzer>()));
         }