fix an old todo, remove some settings

Author: nift4

app/src/main/kotlin/org/akanework/gramophone/logic/GramophonePlaybackService.kt

@@ -58,12 +58,14 @@ import androidx.media3.common.util.BitmapLoader
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.common.util.Util
 import androidx.media3.common.util.Util.isBitmapFactorySupportedMimeType
+import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.analytics.AnalyticsListener
 import androidx.media3.exoplayer.audio.AudioSink
 import androidx.media3.exoplayer.source.MediaLoadData
 import androidx.media3.exoplayer.util.EventLogger
+import androidx.media3.extractor.mp3.Mp3Extractor
 import androidx.media3.session.CacheBitmapLoader
 import androidx.media3.session.CommandButton
 import androidx.media3.session.MediaController
@@ -104,6 +106,7 @@ import org.akanework.gramophone.logic.utils.MediaStoreUtils
 import org.akanework.gramophone.logic.utils.NativeTrack
 import org.akanework.gramophone.logic.utils.SemanticLyrics
 import org.akanework.gramophone.logic.utils.exoplayer.EndedWorkaroundPlayer
+import org.akanework.gramophone.logic.utils.exoplayer.GramophoneExtractorsFactory
 import org.akanework.gramophone.logic.utils.exoplayer.GramophoneMediaSourceFactory
 import org.akanework.gramophone.logic.utils.exoplayer.GramophoneRenderFactory
 import org.akanework.gramophone.ui.LyricWidgetProvider
@@ -331,16 +334,14 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
                         prefs.getBooleanStrict("floatoutput", false)
                     )
                     .setEnableDecoderFallback(true)
-                    .setEnableAudioTrackPlaybackParams( // hardware/system-accelerated playback speed
-                        prefs.getBooleanStrict("ps_hardware_acc", true)
-                    )
+                    .setEnableAudioTrackPlaybackParams(true)
                     .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER),
-                GramophoneMediaSourceFactory(this)
-                /* .setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING))
-            TODO flag breaks playback of AcousticGuitar.mp3, report exo bug + add UI toggle*/
-            )
+                GramophoneMediaSourceFactory(DefaultDataSource.Factory(this), GramophoneExtractorsFactory().also {
+                    it.setConstantBitrateSeekingEnabled(true)
+                    if (prefs.getBooleanStrict("mp3_index_seeking", false))
+                        it.setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING)
+                }))
                 .setWakeMode(C.WAKE_MODE_LOCAL)
-                .setSkipSilenceEnabled(prefs.getBooleanStrict("skip_silence", false))
                 .setAudioAttributes(
                     AudioAttributes
                         .Builder()

app/src/main/kotlin/org/akanework/gramophone/logic/utils/exoplayer/GramophoneMediaSourceFactory.kt

@@ -1,6 +1,5 @@
 package org.akanework.gramophone.logic.utils.exoplayer
 
-import android.content.Context
 import androidx.annotation.OptIn
 import androidx.media3.common.Format
 import androidx.media3.common.MediaItem
@@ -9,7 +8,6 @@ import androidx.media3.common.util.Assertions
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.common.util.Util
 import androidx.media3.datasource.DataSource
-import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.exoplayer.drm.DrmSessionManager
 import androidx.media3.exoplayer.drm.DrmSessionManagerProvider
 import androidx.media3.exoplayer.source.BundledExtractorsAdapter
@@ -51,16 +49,6 @@ class GramophoneMediaSourceFactory(
     private var liveMinSpeed: Float
     private var liveMaxSpeed: Float
 
-    constructor(context: Context?) : this(
-        DefaultDataSource.Factory(
-            context!!
-        ) as DataSource.Factory
-    )
-
-    constructor(dataSourceFactory: DataSource.Factory) : this(
-        dataSourceFactory, GramophoneExtractorsFactory()
-    )
-
     init {
         delegateFactoryLoader.setDataSourceFactory(dataSourceFactory)
         this.liveTargetOffsetMs = -9223372036854775807L

app/src/main/kotlin/org/akanework/gramophone/ui/AudioPreviewActivity.kt

@@ -31,8 +31,10 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.extractor.mp3.Mp3Extractor
 import androidx.preference.PreferenceManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -46,6 +48,7 @@ import org.akanework.gramophone.logic.hasScopedStorageWithMediaTypes
 import org.akanework.gramophone.logic.playOrPause
 import org.akanework.gramophone.logic.startAnimation
 import org.akanework.gramophone.logic.utils.CalculationUtils.convertDurationToTimeStamp
+import org.akanework.gramophone.logic.utils.exoplayer.GramophoneExtractorsFactory
 import org.akanework.gramophone.logic.utils.exoplayer.GramophoneMediaSourceFactory
 import org.akanework.gramophone.logic.utils.exoplayer.GramophoneRenderFactory
 import org.akanework.gramophone.ui.components.FullBottomSheet.Companion.SLIDER_UPDATE_INTERVAL
@@ -162,11 +165,13 @@ class AudioPreviewActivity : AppCompatActivity(), View.OnClickListener {
                     prefs.getBooleanStrict("floatoutput", false)
                 )
                 .setEnableDecoderFallback(true)
-                .setEnableAudioTrackPlaybackParams( // hardware/system-accelerated playback speed
-                    prefs.getBooleanStrict("ps_hardware_acc", true)
-                )
+                .setEnableAudioTrackPlaybackParams(true)
                 .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER),
-            GramophoneMediaSourceFactory(this)
+            GramophoneMediaSourceFactory(DefaultDataSource.Factory(this), GramophoneExtractorsFactory().also {
+                it.setConstantBitrateSeekingEnabled(true)
+                if (prefs.getBooleanStrict("mp3_index_seeking", false))
+                    it.setMp3ExtractorFlags(Mp3Extractor.FLAG_ENABLE_INDEX_SEEKING)
+            })
         )
             .setWakeMode(C.WAKE_MODE_LOCAL)
             .setAudioAttributes(

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

@@ -17,7 +17,6 @@
     <string name="sort_by_artist">الفنّان</string>
     <string name="settings_mediastore_filter">الحد الأدنى لطول الأغنية (بالثواني)</string>
     <string name="sort_by_modified_date">تاريخ التعديل</string>
-    <string name="settings_hardware_acceleration_summary">تنشيط تسريع التشغيل باستخدام العَتَاد الصّلب</string>
     <string name="settings_player_ui">واجهة المُشَغِّل</string>
     <string name="category_songs">الأغاني</string>
     <string name="settings_behavior_summary">الفلاتر وسلوكات التَّشغيل</string>
@@ -30,7 +29,6 @@
     <string name="settings_title_bold">تغميق خط الاسم</string>
     <string name="settings_audio">الصوت</string>
     <string name="settings_title_center">توسيط الاسم</string>
-    <string name="settings_skip_silence_summary">تجاوز الصَّمت أثناء تشغيل الأغاني</string>
     <plurals name="items">
         <item quantity="zero">لا أغراض</item>
         <item quantity="one">غرض واحد (%d)</item>
@@ -88,7 +86,6 @@
     <string name="settings_default_progress_bar">شريط التَّقدُّم الأصليّ</string>
     <string name="details">التَّفاصيل</string>
     <string name="home_menu_equalizer">مُعادِل الصَّوت</string>
-    <string name="settings_skip_silence">تجاوز الصَّمت</string>
     <string name="dialog_path">المَسَار</string>
     <string name="settings_version">الإصدار</string>
     <string name="settings_lyrics_center">مُحَاذاة المنتصَف</string>
@@ -129,7 +126,6 @@
     <string name="settings_experimental_settings_summary">تجريب الميّزات والمُنوَّعات</string>
     <string name="settings_package_type">نوع الحِزمة</string>
     <string name="settings_title_center_summary">استعمال العنوان المُتمَركِز في المنتصف في المُشغِّل الكامل</string>
-    <string name="settings_hardware_acceleration">سرعة التَّشغيل</string>
     <string name="go_to_artist">اذهب إلى الفنّان</string>
     <string name="settings_float_output">خرج الصَّوت الطّافي</string>
     <string name="settings_album_round_corner_summary">تنشيط الزوايا المُدَوَّرة في المُشَغِّل الكامل</string>

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

@@ -100,7 +100,6 @@
     <string name="settings_behavior_summary">Filtrlər, açılış davranışları</string>
     <string name="settings_player_options_summary">Çıxış keyfiyyəti, oynanılma davranışı</string>
     <string name="settings_customization">Fərdiləşdirmə</string>
-    <string name="settings_hardware_acceleration">Oynatma sürəti</string>
     <string name="settings_experimental_settings">Eksperimental</string>
     <string name="settings_color_accuracy">Rəng dəqiqliyi</string>
     <string name="settings_lyrics_bold">Qalın şriftli sözlər</string>
@@ -129,7 +128,6 @@
     <string name="settings_lyrics_multiline">Çoxsətirli mahnı sözlərinin oxunması</string>
     <string name="settings_lyrics_bold_summary">Sözlər üçün qalın şriftdən istifadə et</string>
     <string name="layout">Görünüş</string>
-    <string name="settings_hardware_acceleration_summary">Oynatma sürətinin avadanlıq sürətləndirməsini aktivləşdir</string>
     <string name="tab_order">Tab sırası</string>
     <string name="tab_order_summary">Tətbiq işə salındıqda ilk tabı göstərəcək. Ayırıcıdan sonra gələn tablar gizlədiləcək.</string>
     <string name="settings_category_basic_info">Əsas təfərrüatlar</string>
@@ -142,8 +140,6 @@
     </plurals>
     <string name="play_next">Növbəti oynat</string>
     <string name="settings_category_behavior">Davranış</string>
-    <string name="settings_skip_silence">Sakitliyi burax</string>
-    <string name="settings_skip_silence_summary">Mahnı oynanılma zamanı sakitliyi burax</string>
     <string name="sort_by_add_date">Əlavə edilmə tarixi üzrə</string>
     <string name="settings_lyrics_center_summary">Sözlər üçün mərkəzi düzülüşdən istifadə et</string>
     <string name="settings_play_on_launch">Açılış zamanı oynat</string>

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

@@ -113,7 +113,6 @@
     <string name="settings_blacklist">Чорны спіс</string>
     <string name="sort_by_add_date">Дадаць дату</string>
     <string name="settings_experimental_settings">Эксперыментальныя</string>
-    <string name="settings_hardware_acceleration_summary">Уключыць апаратнае паскарэнне хуткасці прайгравання</string>
     <string name="settings_lyrics_bold">Тоўсты тэкст песні</string>
     <string name="settings_lyric">Тэкст песні</string>
     <string name="settings_category_links">Спасылкі</string>
@@ -128,12 +127,9 @@
     <string name="sort_by_modified_date">Дата змены</string>
     <string name="settings_player_ui">Інтэрфейс прайгравальніка</string>
     <string name="settings_customization_summary">Кіраванне наладамі персаналізацыі</string>
-    <string name="settings_skip_silence_summary">Прапусціць цішыню падчас прайгравання трэкаў</string>
     <string name="settings_play_on_launch_summary">Гуляць музыку пры запуску</string>
     <string name="settings_player_ui_summary">Наладзьце інтэрфейс прайгравальніка</string>
     <string name="settings_play_on_launch">Прайграваць пры запуску</string>
-    <string name="settings_skip_silence">Прапусціць цішыню</string>
-    <string name="settings_hardware_acceleration">Хуткасць прайгравання</string>
     <string name="settings_preference_category_application">Праграма</string>
     <string name="settings_category_basic_info">Асноўная інфармацыя</string>
     <string name="settings_category_filters">Фільтры</string>

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

@@ -78,7 +78,6 @@
     <string name="app_name">গ্রামোফোন</string>
     <string name="settings_default_progress_bar_summary">মেটেরিয়াল স্টাইলড প্রক্রিয়া বার চালু করুন</string>
     <string name="now_playing">এখন চলছে</string>
-    <string name="settings_skip_silence">নীরবতা এড়িয়ে যান</string>
     <string name="settings_lyrics_bold">বোল্ড লিরিক</string>
     <string name="filesystem">ফাইল সিস্টেম</string>
     <string name="settings_player_options_summary">আউটপুট গুণমান, প্লেব্যাক আচরণ</string>
@@ -99,13 +98,10 @@
     <string name="settings_category_links">লিঙ্কস</string>
     <string name="settings_customization">কাস্টমাইজেশন</string>
     <string name="settings_album_round_corner">অ্যালবাম বৃত্তাকার কোণ</string>
-    <string name="settings_skip_silence_summary">ট্র্যাক বাজানোর সময় নীরবতা এড়িয়ে যান</string>
-    <string name="settings_hardware_acceleration">প্লেব্যাক গতি</string>
     <string name="settings_title_bold">বোল্ড শিরোনাম</string>
     <string name="settings_experimental_settings">পরীক্ষামূলক</string>
     <string name="settings_lyrics_multiline">মাল্টিলাইন লিরিক্স পড়ুন</string>
     <string name="share">শেয়ার করুন</string>
-    <string name="settings_hardware_acceleration_summary">প্লেব্যাক গতি হার্ডওয়্যার ত্বরণ সক্ষম করুন</string>
     <string name="settings_title_center">কেন্দ্রীভূত শিরোনাম</string>
     <string name="settings_player_ui">প্লেয়ার ইওআই</string>
     <string name="settings_float_output_summary">৩২ বিট ফ্লোট আউটপুট সক্ষম করুন</string>

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

@@ -107,7 +107,6 @@
     <string name="settings_album_round_corner_summary">Activa les cantonades arrodonides en el reproductor complet</string>
     <string name="settings_float_output">Sortida d\'àudio flotant</string>
     <string name="settings_float_output_summary">Activa la sortida flotant de 32 bits</string>
-    <string name="settings_skip_silence_summary">Salta el silenci en reproduir les pistes</string>
     <string name="settings_title_bold">Títols en negreta</string>
     <string name="settings_color_accuracy_summary">Fes que la generació de color sigui precisa</string>
     <string name="settings_experimental_settings_summary">Funcionalitats de prova, miscel·lània</string>
@@ -157,10 +156,7 @@
     <string name="settings_customization_summary">Gestió de les opcions de personalització</string>
     <string name="settings_player_options_summary">Qualitat de la sortida, comportament de la reproducció</string>
     <string name="settings_album_round_corner">Cantonades arrodonides dels àlbums</string>
-    <string name="settings_hardware_acceleration">Velocitat de reproducció</string>
     <string name="settings_audio">Àudio</string>
-    <string name="settings_skip_silence">Salta el silenci</string>
-    <string name="settings_hardware_acceleration_summary">Activa l\'acceleració de maquinari de la velocitat de reproducció</string>
     <string name="settings_title_bold_summary">Utilitza el títol en negreta al reproductor complet</string>
     <string name="settings_experimental_settings">Experimental</string>
     <string name="settings_lyric">Lletra</string>

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

@@ -78,7 +78,6 @@
     <string name="settings_float_output_summary">Povolit 32 bitový float výstup</string>
     <string name="settings_content_based_color_summary">Povolit generaci barev na základě alba</string>
     <string name="settings_default_progress_bar_summary">Povolit material stylizaci ukazatele průběhu</string>
-    <string name="settings_hardware_acceleration_summary">Povolit hardwarovou akceleraci pro rychlost přehrávání</string>
     <string name="home_menu_equalizer">Ekvalizér</string>
     <string name="settings_behavior_summary">Filtry, chování po spuštění</string>
     <string name="spk_channel_out_surround">Surround (4.0)</string>
@@ -142,7 +141,6 @@
     <string name="now_playing">Nyní se přehrává</string>
     <string name="settings_customization_summary">Správa vlastních nastavení</string>
     <string name="settings_float_output">Plovoucí audio výstup</string>
-    <string name="settings_skip_silence">Přeskočit ticho</string>
     <string name="sort_by_modified_date">Datum modifikace</string>
     <string name="settings_lyric">Lyric</string>
     <string name="preference_category_quality">Kvalita</string>
@@ -207,7 +205,6 @@
     <string name="unknown_title">Neznámý název</string>
     <string name="dialog_mime">MIME typ</string>
     <string name="settings_title_center_summary">Použít centralizovaný název pro přehrávač</string>
-    <string name="settings_skip_silence_summary">Přeskočit ticho ve skladbě</string>
     <string name="lyric_widget_description">Widget který ukazuje text skladby která se teď přehrává</string>
     <string name="timer">Spánkový časovač</string>
     <string name="current_playlist">Aktuální playlist</string>
@@ -267,7 +264,6 @@
     <string name="settings_player_ui_summary">Plný přehrávač UI, text skladby</string>
     <string name="settings_library">Knihovna</string>
     <string name="settings_library_summary">Správa mediální knihovny</string>
-    <string name="settings_hardware_acceleration">Rychlost přehrávání</string>
     <string name="settings_color_accuracy_summary">Udělat barevný gradient přesný</string>
     <string name="settings_lyrics_configuration">Konfigurace textu skladby</string>
     <string name="settings_lyrics_multiline_summary">Považovat všechny řádky text skladby jako za jeden</string>

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

@@ -88,7 +88,6 @@
     <string name="preference_category_quality">Qualität</string>
     <string name="settings_category_full_player">Vollbildmodus</string>
     <string name="settings_preference_category_application">Anwendung</string>
-    <string name="settings_skip_silence_summary">Stille bei der Wiedergabe von Titeln überspringen</string>
     <string name="settings_lyrics_center_summary">Zentrierte Ausrichtung für Liedtexte verwenden</string>
     <string name="dialog_duration">Dauer</string>
     <string name="settings_default_progress_bar">Standard-Fortschrittsbalken</string>
@@ -107,10 +106,7 @@
     <string name="settings_library_summary">Mediathek verwalten</string>
     <string name="settings_player_options_summary">Ausgabequalität, Wiedergabeverhalten</string>
     <string name="unknown_title">Unbekannter Titel</string>
-    <string name="settings_hardware_acceleration_summary">Hardwarebeschleunigung für Wiedergabegeschwindigkeit aktivieren</string>
     <string name="settings_album_round_corner_summary">Runde Ecken im Vollbildmodus aktivieren</string>
-    <string name="settings_hardware_acceleration">Wiedergabegeschwindigkeit</string>
-    <string name="settings_skip_silence">Stille überspringen</string>
     <string name="settings_lyrics_center">Zentriert</string>
     <string name="settings_play_on_launch_summary">Beim Start Musik wiedergeben</string>
     <string name="settings_play_on_launch">Beim Start wiedergeben</string>