From ed5d73de4b840c50b18fdc2d33fb4ab40c72d32a Mon Sep 17 00:00:00 2001
From: Chris Forte <chris.forte@live.com>
Date: Thu, 15 Feb 2024 09:57:37 -0500
Subject: [PATCH] combine audio codec settings

---
 locale/en_US/translations.ts       | 10 ------
 settings/settings.json             |  7 -----
 source/utils/deviceCapabilities.bs | 50 +++---------------------------
 3 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index 57695197..106f124c 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -1117,16 +1117,6 @@
             <translation>Choose your preferred audio codecs when transcoding.</translation>
             <extracomment>Settings Menu - Description for option</extracomment>
         </message>
-        <message>
-            <source>Multichannel Audio - DTS</source>
-            <translation>Multichannel Audio - DTS</translation>
-            <extracomment>Settings Menu - Title of option</extracomment>
-        </message>
-        <message>
-            <source>Force all audio transcodes to use DTS instead of the default EAC3. The device must support DTS for this setting to have an effect.</source>
-            <translation>Force all audio transcodes to use DTS instead of the default EAC3. The device must support DTS for this setting to have an effect.</translation>
-            <extracomment>Settings Menu - Description for option</extracomment>
-        </message>
         <message>
             <source>Preferred Audio Codec</source>
             <translation>Preferred Audio Codec</translation>
diff --git a/settings/settings.json b/settings/settings.json
index 9c2e042d..abd39698 100644
--- a/settings/settings.json
+++ b/settings/settings.json
@@ -20,13 +20,6 @@
                 "title": "Audio Codec Support",
                 "description": "Choose your preferred audio codecs when transcoding.",
                 "children": [
-                    {
-                        "title": "Multichannel Audio - DTS",
-                        "description": "Force all audio transcodes to use DTS instead of the default EAC3. The device must support DTS for this setting to have an effect.",
-                        "settingName": "playback.forceDTS",
-                        "type": "bool",
-                        "default": "false"
-                    },
                     {
                         "title": "Preferred Audio Codec",
                         "description": "Use the selected audio codec for transcodes. If the device or stream does not support it, a fallback codec will be used.",
diff --git a/source/utils/deviceCapabilities.bs b/source/utils/deviceCapabilities.bs
index 5e5cd789..3dd234dc 100644
--- a/source/utils/deviceCapabilities.bs
+++ b/source/utils/deviceCapabilities.bs
@@ -195,21 +195,13 @@ function getTranscodingProfiles() as object
     ' does the users setup support surround sound?
     maxAudioChannels = "2" ' jellyfin expects this as a string
     ' in order of preference from left to right
-    audioCodecs = ["mp3", "vorbis", "opus", "flac", "alac", "ac4", "pcm", "wma", "wmapro"]
-    surroundSoundCodecs = ["eac3", "ac3", "dts"]
-    if globalUserSettings["playback.forceDTS"] = true
-        surroundSoundCodecs = ["dts", "eac3", "ac3"]
-    end if
+    audioCodecs = ["eac3", "ac3", "dts", "mp3", "vorbis", "opus", "flac", "alac", "ac4", "pcm", "wma", "wmapro"]
 
-    surroundSoundCodec = invalid
     if di.GetAudioOutputChannel() = "5.1 surround"
         maxAudioChannels = "6"
-        for each codec in surroundSoundCodecs
-            if di.CanDecodeAudio({ Codec: codec, ChCnt: 6 }).Result
-                surroundSoundCodec = codec
-                if di.CanDecodeAudio({ Codec: codec, ChCnt: 8 }).Result
-                    maxAudioChannels = "8"
-                end if
+        for each codec in audioCodecs
+            if di.CanDecodeAudio({ Codec: codec, ChCnt: 8 }).Result
+                maxAudioChannels = "8"
                 exit for
             end if
         end for
@@ -403,40 +395,6 @@ function getTranscodingProfiles() as object
         mp4Array.Conditions = [getMaxHeightArray(), getMaxWidthArray()]
     end if
 
-    ' surround sound
-    if surroundSoundCodec <> invalid
-        ' add preferred surround sound codec to TranscodingProfile
-        transcodingProfiles.push({
-            "Container": surroundSoundCodec,
-            "Type": "Audio",
-            "AudioCodec": surroundSoundCodec,
-            "Context": "Streaming",
-            "Protocol": "http",
-            "MaxAudioChannels": maxAudioChannels
-        })
-        transcodingProfiles.push({
-            "Container": surroundSoundCodec,
-            "Type": "Audio",
-            "AudioCodec": surroundSoundCodec,
-            "Context": "Static",
-            "Protocol": "http",
-            "MaxAudioChannels": maxAudioChannels
-        })
-
-        ' put codec in front of AudioCodec string
-        if tsArray.AudioCodec = ""
-            tsArray.AudioCodec = surroundSoundCodec
-        else
-            tsArray.AudioCodec = surroundSoundCodec + "," + tsArray.AudioCodec
-        end if
-
-        if mp4Array.AudioCodec = ""
-            mp4Array.AudioCodec = surroundSoundCodec
-        else
-            mp4Array.AudioCodec = surroundSoundCodec + "," + mp4Array.AudioCodec
-        end if
-    end if
-
     ' add user-selected preferred codec to the front of the list
     if globalUserSettings["playback.preferredAudioCodec"] <> "auto"
         tsArray.AudioCodec = globalUserSettings["playback.preferredAudioCodec"] + "," + tsArray.AudioCodec