diff --git a/app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt index 59067a10..1c8b3b4f 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/FormatUtil.kt +++ b/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) - if (noDRC) { - formatImportance.add(0,"no_drc") + val preferDRC = sharedPreferences.getBoolean("prefer_drc_audio", false) + if (preferDRC) { + formatImportance.add(0,"prefer_drc") } return formatImportance @@ -100,11 +100,12 @@ class FormatUtil(private var context: Context) { val orderPreferences = getAudioFormatImportance() val comparator = Comparator { a, b -> - if ("no_drc" in orderPreferences) { - val aHasDrc = a.format_note.contains("drc", ignoreCase = true) - val bHasDrc = b.format_note.contains("drc", ignoreCase = true) - if (aHasDrc != bHasDrc) - return@Comparator aHasDrc.compareTo(bHasDrc) + if ("prefer_drc" in orderPreferences) { + val comparison = (b.format_note.contains("drc", ignoreCase = true)).compareTo( + a.format_note.contains("drc", ignoreCase = true) + ) + + 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) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 17bd4f9f..ffd09aee 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -485,7 +485,6 @@ حجم التنسيق المفضل الأصغر الأكبر - لا تفضل صوت DRC رمز PO (GVS) رمز PO (مشغّل) رمز PO (الاشتراكات) diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 1e262dc9..c6d4df04 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -485,7 +485,6 @@ Üstünlük verilən Format Həcmi Ən kiçik Ən böyük - DRC Səsə üstünlük vermə PO Token (GVS) PO Token (Oynadıcı) PO Token (Titrlər) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c983e450..b0430983 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -483,7 +483,6 @@ Предпочитан размер на формата Най-малкият Най-големият - Не предпочитане DRC Audio PO Token (GVS) PO Token (Плеър) PO Token (Subs) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0c30a057..02979dd8 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -485,7 +485,6 @@ Preferovaná velikost formátu Nejmenší Největší - Neupřednostňovat DRC Audio PO Token (GVS) PO Token (Přehrávač) PO Token (Titulky) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3f954da8..82b99ba0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -485,7 +485,6 @@ Bevorzugte Formatgröße Kleinste Größte - DRC Audio nicht bevorzugen PO-Token (GVS) PO-Token (Player) PO-Token (Untertitel) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d168e83b..0ac7c6b4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -485,7 +485,6 @@ Tamaño de formato preferido Más pequeño Más grande - No prefiero DRC Audio Datos de visitantes Obtener ID de sincronización de datos Escritorio diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 790f8a1b..0333d6b3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -486,7 +486,6 @@ Taille du format préféré Plus petit Plus grand - Ne pas préférer l\'audio DRC Token PO (GVS) Token PO (Lecteur) Token PO (Sous-titres) diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7b5300f4..41d8e494 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -485,7 +485,6 @@ Preferált formátumméret Legkisebb Legnagyobb - Ne részesítsd előnyben a DRC Audio-t PO zseton (GVS) PO zseton (Lejátszó) PO zseton (Feliratok) diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 81ea972c..a89af0fb 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -484,7 +484,6 @@ Ukuran Format yang Disukai Paling Kecil Terbesar - Jangan pilih Audio DRC PO Token (GVS) PO Token (Pemutar) PO Token (Subtitel) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 51c83149..93f5438b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -485,7 +485,6 @@ Formato Dimensione Preferito Il più piccolo Il più grande - Non preferire Audio DRC Token PO (GVS) Token PO (Lettore) Token PO (Iscrizioni) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index db20a903..33df1e53 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -485,7 +485,6 @@ 推奨形式サイズ 最小 最大 - DRCオーディオを推奨しない PO トークン (GVS) PO トークン (プレーヤー) PO トークン (字幕) diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4930bbb2..ca498031 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -484,7 +484,6 @@ Nie ma wolnego miejsca dla tej konfiguracji. Najmniejszy Największy - Nie preferuj DRC Audio Dane odwiedzających Uzyskaj ID synchronizacji danych Pulpit diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ae42c6bf..d3e02f76 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -485,7 +485,6 @@ Tamanho do formato preferido Menor Maior - Não prefiro áudio DRC Chave de acesso PO (GVS) Chave de acesso PO (Player) Chave de acesso PO (inscrições) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bd162e2a..0d57c478 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -484,7 +484,6 @@ Tamanho do formato preferido Menor Maior - Não prefiro áudio DRC Chave de acesso PO (GVS) Chave de acesso PO (Player) Chave de acesso PO (inscrições) diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1db39e77..cf96f2c9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -483,7 +483,6 @@ Dimensiunea preferată a formatului Cel mai mic Cel mai mare - Nu prefer DRC Audio Capitole Folosește URL-ul original pentru ULR-ul playlist-ului Actualizează yt-dlp în timpul descărcării diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f6185879..0715763a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -485,7 +485,6 @@ Предпочтительный размер формата Наименьший Самый большой - Не отдавать предпочтение DRC Audio PO токен (GVS) PO токен (Player) PO токен (Subs) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 9ac75ca7..ef8b3747 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -485,7 +485,6 @@ Preferovaná veľkosť formátu Najmenšia Najväčšia - Nepoužívať DRC Audio PO Token (GVS) PO Token (Prehrávač) PO Token (Titulky) diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index cdc98f72..8f87dc2e 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -484,7 +484,6 @@ Prednostna velikost formata Najmanjše Največje - Ne preferiraj DRC zvoka PO Žeton (GVS) PO Žeton (Predvajalnik) PO Žeton (Podnapisi) diff --git a/app/src/main/res/values-sq-rAL/strings.xml b/app/src/main/res/values-sq-rAL/strings.xml index c2c01e01..bbc3987e 100644 --- a/app/src/main/res/values-sq-rAL/strings.xml +++ b/app/src/main/res/values-sq-rAL/strings.xml @@ -484,7 +484,6 @@ Madhësia e preferuar e formatit Më i vogli Më i madhi - Mos prefero Audio DRC Po Token (GVS) Po Token (Player) Po Token (Subs) diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index b338d57d..3ebc1ddc 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -484,7 +484,6 @@ விருப்பமான வடிவமைப்பு அளவு மிகச் சிறியது மிகப் பெரியது - DRC ஆடியோவை விரும்ப வேண்டாம் PO கிள்ளாக்கு (GVS) PO கிள்ளாக்கு (பிளேயர்) PO கிள்ளாக்கு (துணைகள்) diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ee3e5ef5..2fdee803 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -484,7 +484,6 @@ ถอดรหัสของวิดีโอเพื่อให้เข้ากันได้กับแอปอื่นๆ ไม่มีพื้นที่ว่างสำหรับการกำหนดค่านี้ ขนาดฟอร์แมตไฟล์ที่ต้องการ - ไม่ต้องการเสียงแบบ DRC โทเค็น PO (GVS) โทเค็น PO (ตัวเล่น) โทเค็น PO (Subs) diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 5c9c37f3..3d2419b4 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -487,7 +487,6 @@ En küçük En büyük Bu configürasyon için yeterli alan yok. - DRC Audio\'yu tercih etme PO Jetonu (GVS) PO Jetonu (Oynatıcı) PO Jetonu (Altyazılar) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c2ff7e1e..738c672f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -485,7 +485,6 @@ Бажаний розмір формату Найменший Найбільший - Не надавати перевагу DRC Audio PO токен (GVS) PO токен (Player) PO токен (Subs) diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index cbfc8fca..3a6d716e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -485,7 +485,6 @@ Kích thước định dạng ưa tiên Bé nhất Lớn nhất - Không dùng âm thanh DRC Mã PO (GVS) Mã PO (Trình phát) Mã PO (Phụ đề) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 501a35ca..18402537 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -484,7 +484,6 @@ 首选的格式大小 最小 最大 - 不偏好 DRC 音频 PO 令牌 (GVS) PO 令牌 (播放器) PO 令牌 (字幕) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fd96821c..c376798b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -486,7 +486,6 @@ 最小 最大 "驗證授權\n-----------------------\n1. 點選「驗證」開啟 WebView 的登入頁面\n2. 使用您的 Google 帳戶登入\n3. 播放支援自動翻譯字幕的影片\n4. 開啟自動翻譯字幕並檢查是否正常運作\n 4.1 若自動翻譯字幕無效,請切換至另一支支援自動翻譯字幕的影片,並重試步驟 4\n5. 點選「確認」完成\n\n略過驗證\n-----------------------\n1. 點選「略過驗證」\n2. 輸入任一 YouTube 影片網址\n3. 等待影片載入並播放至少 3 秒\n4. 點選「確認」完成" - 不優先使用 DRC 音訊 PO Token (GVS) PO Token (播放器) PO Token (字幕) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b3d897b0..855e0923 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -487,7 +487,7 @@ Preferred Format Size Smallest Largest - Don\'t prefer DRC Audio + Prefer DRC Audio PO Token (GVS) PO Token (Player) PO Token (Subs) diff --git a/app/src/main/res/xml/processing_preferences.xml b/app/src/main/res/xml/processing_preferences.xml index aaaef756..26f95402 100644 --- a/app/src/main/res/xml/processing_preferences.xml +++ b/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:title="@string/no_prefer_drc_audio" /> + app:key="prefer_drc_audio" + app:title="@string/prefer_drc_audio" />