swapped dont prefer DRC audio to prefer DRC audio

app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt

@@ -59,9 +59,9 @@ class FormatUtil(private var context: Context) {
                 formatImportance.remove("codec")
             }
 
-            val noDRC = sharedPreferences.getBoolean("no_prefer_drc_audio", false)
+            val preferDRC = sharedPreferences.getBoolean("prefer_drc_audio", false)
-            if (noDRC) {
+            if (preferDRC) {
-                formatImportance.add(0,"no_drc")
+                formatImportance.add(0,"prefer_drc")
             }
 
             return formatImportance
@@ -100,11 +100,12 @@ class FormatUtil(private var context: Context) {
         val orderPreferences = getAudioFormatImportance()
 
         val comparator = Comparator<Format> { a, b ->
-            if ("no_drc" in orderPreferences) {
+            if ("prefer_drc" in orderPreferences) {
-                val aHasDrc = a.format_note.contains("drc", ignoreCase = true)
+                val comparison = (b.format_note.contains("drc", ignoreCase = true)).compareTo(
-                val bHasDrc = b.format_note.contains("drc", ignoreCase = true)
+                    a.format_note.contains("drc", ignoreCase = true)
-                if (aHasDrc != bHasDrc)
+                )
-                    return@Comparator aHasDrc.compareTo(bHasDrc)
+
+                if (comparison != 0) return@Comparator comparison
             }
 
             for (order in orderPreferences) {
@@ -146,7 +147,6 @@ class FormatUtil(private var context: Context) {
                             }
                         }
                     }
-
                     "codec" -> {
                         if (audioCodecPreference.isNotBlank()) {
                             ("^(${audioCodecPreference}).*$".toRegex(RegexOption.IGNORE_CASE)

app/src/main/res/values-ar/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">حجم التنسيق المفضل</string>
     <string name="smallest">الأصغر</string>
     <string name="largest">الأكبر</string>
-    <string name="no_prefer_drc_audio">لا تفضل صوت DRC</string>
     <string name="potoken_gvs">رمز PO (GVS)</string>
     <string name="potoken_player">رمز PO (مشغّل)</string>
     <string name="potoken_subs">رمز PO (الاشتراكات)</string>

app/src/main/res/values-az/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Üstünlük verilən Format Həcmi</string>
     <string name="smallest">Ən kiçik</string>
     <string name="largest">Ən böyük</string>
-    <string name="no_prefer_drc_audio">DRC Səsə üstünlük vermə</string>
     <string name="potoken_gvs">PO Token (GVS)</string>
     <string name="potoken_player">PO Token (Oynadıcı)</string>
     <string name="potoken_subs">PO Token (Titrlər)</string>

app/src/main/res/values-bg/strings.xml

@@ -483,7 +483,6 @@
     <string name="preferred_format_size">Предпочитан размер на формата</string>
     <string name="smallest">Най-малкият</string>
     <string name="largest">Най-големият</string>
-    <string name="no_prefer_drc_audio">Не предпочитане DRC Audio</string>
     <string name="potoken_gvs">PO Token (GVS)</string>
     <string name="potoken_player">PO Token (Плеър)</string>
     <string name="visitor_data">PO Token (Subs)</string>

app/src/main/res/values-cs/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Preferovaná velikost formátu</string>
     <string name="smallest">Nejmenší</string>
     <string name="largest">Největší</string>
-    <string name="no_prefer_drc_audio">Neupřednostňovat DRC Audio</string>
     <string name="potoken_gvs">PO Token (GVS)</string>
     <string name="potoken_player">PO Token (Přehrávač)</string>
     <string name="potoken_subs">PO Token (Titulky)</string>

app/src/main/res/values-de/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Bevorzugte Formatgröße</string>
     <string name="smallest">Kleinste</string>
     <string name="largest">Größte</string>
-    <string name="no_prefer_drc_audio">DRC Audio nicht bevorzugen</string>
     <string name="potoken_gvs">PO-Token (GVS)</string>
     <string name="potoken_player">PO-Token (Player)</string>
     <string name="potoken_subs">PO-Token (Untertitel)</string>

app/src/main/res/values-es/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Tamaño de formato preferido</string>
     <string name="smallest">Más pequeño</string>
     <string name="largest">Más grande</string>
-    <string name="no_prefer_drc_audio">No prefiero DRC Audio</string>
     <string name="visitor_data">Datos de visitantes</string>
     <string name="get_data_sync_id">Obtener ID de sincronización de datos</string>
     <string name="desktop">Escritorio</string>

app/src/main/res/values-fr/strings.xml

@@ -486,7 +486,6 @@
     <string name="preferred_format_size">Taille du format préféré</string>
     <string name="smallest">Plus petit</string>
     <string name="largest">Plus grand</string>
-    <string name="no_prefer_drc_audio">Ne pas préférer l\'audio DRC</string>
     <string name="potoken_gvs">Token PO (GVS)</string>
     <string name="potoken_player">Token PO (Lecteur)</string>
     <string name="potoken_subs">Token PO (Sous-titres)</string>

app/src/main/res/values-hu/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Preferált formátumméret</string>
     <string name="smallest">Legkisebb</string>
     <string name="largest">Legnagyobb</string>
-    <string name="no_prefer_drc_audio">Ne részesítsd előnyben a DRC Audio-t</string>
     <string name="potoken_gvs">PO zseton (GVS)</string>
     <string name="potoken_player">PO zseton (Lejátszó)</string>
     <string name="potoken_subs">PO zseton (Feliratok)</string>

app/src/main/res/values-in/strings.xml

@@ -484,7 +484,6 @@
     <string name="preferred_format_size">Ukuran Format yang Disukai</string>
     <string name="smallest">Paling Kecil</string>
     <string name="largest">Terbesar</string>
-    <string name="no_prefer_drc_audio">Jangan pilih Audio DRC</string>
     <string name="potoken_gvs">PO Token (GVS)</string>
     <string name="potoken_player">PO Token (Pemutar)</string>
     <string name="potoken_subs">PO Token (Subtitel)</string>

app/src/main/res/values-it/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Formato Dimensione Preferito</string>
     <string name="smallest">Il più piccolo</string>
     <string name="largest">Il più grande</string>
-    <string name="no_prefer_drc_audio">Non preferire Audio DRC</string>
     <string name="potoken_gvs">Token PO (GVS)</string>
     <string name="potoken_player">Token PO (Lettore)</string>
     <string name="potoken_subs">Token PO (Iscrizioni)</string>

app/src/main/res/values-ja/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">推奨形式サイズ</string>
     <string name="smallest">最小</string>
     <string name="largest">最大</string>
-    <string name="no_prefer_drc_audio">DRCオーディオを推奨しない</string>
     <string name="potoken_gvs">PO トークン (GVS)</string>
     <string name="potoken_player">PO トークン (プレーヤー)</string>
     <string name="potoken_subs">PO トークン (字幕)</string>

app/src/main/res/values-pl/strings.xml

@@ -484,7 +484,6 @@
     <string name="no_free_space_warning">Nie ma wolnego miejsca dla tej konfiguracji.</string>
     <string name="smallest">Najmniejszy</string>
     <string name="largest">Największy</string>
-    <string name="no_prefer_drc_audio">Nie preferuj DRC Audio</string>
     <string name="visitor_data">Dane odwiedzających</string>
     <string name="get_data_sync_id">Uzyskaj ID synchronizacji danych</string>
     <string name="desktop">Pulpit</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Tamanho do formato preferido</string>
     <string name="smallest">Menor</string>
     <string name="largest">Maior</string>
-    <string name="no_prefer_drc_audio">Não prefiro áudio DRC</string>
     <string name="potoken_gvs">Chave de acesso PO (GVS)</string>
     <string name="potoken_player">Chave de acesso PO (Player)</string>
     <string name="potoken_subs">Chave de acesso PO (inscrições)</string>

app/src/main/res/values-pt/strings.xml

@@ -484,7 +484,6 @@
     <string name="preferred_format_size">Tamanho do formato preferido</string>
     <string name="smallest">Menor</string>
     <string name="largest">Maior</string>
-    <string name="no_prefer_drc_audio">Não prefiro áudio DRC</string>
     <string name="potoken_gvs">Chave de acesso PO (GVS)</string>
     <string name="potoken_player">Chave de acesso PO (Player)</string>
     <string name="potoken_subs">Chave de acesso PO (inscrições)</string>

app/src/main/res/values-ro/strings.xml

@@ -483,7 +483,6 @@
     <string name="preferred_format_size">Dimensiunea preferată a formatului</string>
     <string name="smallest">Cel mai mic</string>
     <string name="largest">Cel mai mare</string>
-    <string name="no_prefer_drc_audio">Nu prefer DRC Audio</string>
     <string name="chapters">Capitole</string>
     <string name="use_original_url_playlist">Folosește URL-ul original pentru ULR-ul playlist-ului</string>
     <string name="update_ytdlp_while_downloading">Actualizează yt-dlp în timpul descărcării</string>

app/src/main/res/values-ru/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Предпочтительный размер формата</string>
     <string name="smallest">Наименьший</string>
     <string name="largest">Самый большой</string>
-    <string name="no_prefer_drc_audio">Не отдавать предпочтение DRC Audio</string>
     <string name="potoken_gvs">PO токен (GVS)</string>
     <string name="potoken_player">PO токен (Player)</string>
     <string name="potoken_subs">PO токен (Subs)</string>

app/src/main/res/values-sk/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Preferovaná veľkosť formátu</string>
     <string name="smallest">Najmenšia</string>
     <string name="largest">Najväčšia</string>
-    <string name="no_prefer_drc_audio">Nepoužívať DRC Audio</string>
     <string name="potoken_gvs">PO Token (GVS)</string>
     <string name="potoken_player">PO Token (Prehrávač)</string>
     <string name="potoken_subs">PO Token (Titulky)</string>

app/src/main/res/values-sl/strings.xml

@@ -484,7 +484,6 @@
     <string name="preferred_format_size">Prednostna velikost formata</string>
     <string name="smallest">Najmanjše</string>
     <string name="largest">Največje</string>
-    <string name="no_prefer_drc_audio">Ne preferiraj DRC zvoka</string>
     <string name="potoken_gvs">PO Žeton (GVS)</string>
     <string name="potoken_player">PO Žeton (Predvajalnik)</string>
     <string name="potoken_subs">PO Žeton (Podnapisi)</string>

app/src/main/res/values-sq-rAL/strings.xml

@@ -484,7 +484,6 @@
     <string name="preferred_format_size">Madhësia e preferuar e formatit</string>
     <string name="smallest">Më i vogli</string>
     <string name="largest">Më i madhi</string>
-    <string name="no_prefer_drc_audio">Mos prefero Audio DRC</string>
     <string name="potoken_gvs">Po Token (GVS)</string>
     <string name="potoken_player">Po Token (Player)</string>
     <string name="potoken_subs">Po Token (Subs)</string>

app/src/main/res/values-ta/strings.xml

@@ -484,7 +484,6 @@
     <string name="preferred_format_size">விருப்பமான வடிவமைப்பு அளவு</string>
     <string name="smallest">மிகச் சிறியது</string>
     <string name="largest">மிகப் பெரியது</string>
-    <string name="no_prefer_drc_audio">DRC ஆடியோவை விரும்ப வேண்டாம்</string>
     <string name="potoken_gvs">PO கிள்ளாக்கு (GVS)</string>
     <string name="potoken_player">PO கிள்ளாக்கு (பிளேயர்)</string>
     <string name="potoken_subs">PO கிள்ளாக்கு (துணைகள்)</string>

app/src/main/res/values-th/strings.xml

@@ -484,7 +484,6 @@
     <string name="video_compatible_summary">ถอดรหัสของวิดีโอเพื่อให้เข้ากันได้กับแอปอื่นๆ</string>
     <string name="no_free_space_warning">ไม่มีพื้นที่ว่างสำหรับการกำหนดค่านี้</string>
     <string name="preferred_format_size">ขนาดฟอร์แมตไฟล์ที่ต้องการ</string>
-    <string name="no_prefer_drc_audio">ไม่ต้องการเสียงแบบ DRC</string>
     <string name="potoken_gvs">โทเค็น PO (GVS)</string>
     <string name="potoken_player">โทเค็น PO (ตัวเล่น)</string>
     <string name="potoken_subs">โทเค็น PO (Subs)</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -487,7 +487,6 @@
     <string name="smallest">En küçük</string>
     <string name="largest">En büyük</string>
     <string name="no_free_space_warning">Bu configürasyon için yeterli alan yok.</string>
-    <string name="no_prefer_drc_audio">DRC Audio\'yu tercih etme</string>
     <string name="potoken_gvs">PO Jetonu (GVS)</string>
     <string name="potoken_player">PO Jetonu (Oynatıcı)</string>
     <string name="potoken_subs">PO Jetonu (Altyazılar)</string>

app/src/main/res/values-uk/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Бажаний розмір формату</string>
     <string name="smallest">Найменший</string>
     <string name="largest">Найбільший</string>
-    <string name="no_prefer_drc_audio">Не надавати перевагу DRC Audio</string>
     <string name="potoken_gvs">PO токен (GVS)</string>
     <string name="potoken_player">PO токен (Player)</string>
     <string name="potoken_subs">PO токен (Subs)</string>

app/src/main/res/values-vi/strings.xml

@@ -485,7 +485,6 @@
     <string name="preferred_format_size">Kích thước định dạng ưa tiên</string>
     <string name="smallest">Bé nhất</string>
     <string name="largest">Lớn nhất</string>
-    <string name="no_prefer_drc_audio">Không dùng âm thanh DRC</string>
     <string name="potoken_gvs">Mã PO (GVS)</string>
     <string name="potoken_player">Mã PO (Trình phát)</string>
     <string name="potoken_subs">Mã PO (Phụ đề)</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -484,7 +484,6 @@
     <string name="preferred_format_size">首选的格式大小</string>
     <string name="smallest">最小</string>
     <string name="largest">最大</string>
-    <string name="no_prefer_drc_audio">不偏好 DRC 音频</string>
     <string name="potoken_gvs">PO 令牌 (GVS)</string>
     <string name="potoken_player">PO 令牌 （播放器）</string>
     <string name="potoken_subs">PO 令牌 （字幕）</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -486,7 +486,6 @@
     <string name="smallest">最小</string>
     <string name="largest">最大</string>
     <string name="potoken_guide">"驗證授權\n-----------------------\n1. 點選「驗證」開啟 WebView 的登入頁面\n2. 使用您的 Google 帳戶登入\n3. 播放支援自動翻譯字幕的影片\n4. 開啟自動翻譯字幕並檢查是否正常運作\n   4.1 若自動翻譯字幕無效，請切換至另一支支援自動翻譯字幕的影片，並重試步驟 4\n5. 點選「確認」完成\n\n略過驗證\n-----------------------\n1. 點選「略過驗證」\n2. 輸入任一 YouTube 影片網址\n3. 等待影片載入並播放至少 3 秒\n4. 點選「確認」完成"</string>
-    <string name="no_prefer_drc_audio">不優先使用 DRC 音訊</string>
     <string name="potoken_gvs">PO Token (GVS)</string>
     <string name="potoken_player">PO Token (播放器)</string>
     <string name="potoken_subs">PO Token (字幕)</string>

app/src/main/res/values/strings.xml

@@ -487,7 +487,7 @@
     <string name="preferred_format_size">Preferred Format Size</string>
     <string name="smallest">Smallest</string>
     <string name="largest">Largest</string>
-    <string name="no_prefer_drc_audio">Don\'t prefer DRC Audio</string>
+    <string name="prefer_drc_audio">Prefer DRC Audio</string>
     <string name="potoken_gvs">PO Token (GVS)</string>
     <string name="potoken_player">PO Token (Player)</string>
     <string name="potoken_subs">PO Token (Subs)</string>

app/src/main/res/xml/processing_preferences.xml

@@ -150,8 +150,8 @@
             android:widgetLayout="@layout/preferece_material_switch"
             app:defaultValue="false"
             app:icon="@drawable/baseline_audio_file_24"
-            app:key="no_prefer_drc_audio"
+            app:key="prefer_drc_audio"
-            app:title="@string/no_prefer_drc_audio" />
+            app:title="@string/prefer_drc_audio" />
 
     </PreferenceCategory>