Revert "Allow disabling gapless offload"

This reverts commit 91aad35.

Author: nift4

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

@@ -345,8 +345,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
                 this,
                 GramophoneRenderFactory(
                     this, rgAp, this::onAudioSinkInputFormatChanged,
-                    afFormatTracker::setAudioSink,
-                    Flags.OFFLOAD && prefs.getStringStrict("offload", "0")?.toIntOrNull() == 3,
+                    afFormatTracker::setAudioSink
                 )
                     .setPcmEncodingRestrictionLifted(true)
                     .setEnableDecoderFallback(true)

app/src/main/java/org/akanework/gramophone/logic/utils/exoplayer/GramophoneRenderFactory.kt

@@ -3,17 +3,14 @@ package org.akanework.gramophone.logic.utils.exoplayer
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
-import androidx.media3.common.AudioAttributes
 import androidx.media3.common.Format
 import androidx.media3.common.PlaybackParameters
 import androidx.media3.common.audio.AudioProcessor
 import androidx.media3.common.audio.AudioProcessorChain
 import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.Renderer
-import androidx.media3.exoplayer.audio.AudioOffloadSupport
 import androidx.media3.exoplayer.audio.AudioRendererEventListener
 import androidx.media3.exoplayer.audio.AudioSink
-import androidx.media3.exoplayer.audio.DefaultAudioOffloadSupportProvider
 import androidx.media3.exoplayer.audio.DefaultAudioSink
 import androidx.media3.exoplayer.audio.ForwardingAudioSink
 import androidx.media3.exoplayer.mediacodec.MediaCodecSelector
@@ -27,8 +24,7 @@ class GramophoneRenderFactory(
     context: Context,
     private val rgAp: ReplayGainAudioProcessor,
     private val configurationListener: (Format?) -> Unit,
-    private val audioSinkListener: (DefaultAudioSink) -> Unit,
-    private val disableGaplessOffload: Boolean
+    private val audioSinkListener: (DefaultAudioSink) -> Unit
 ) :
     DefaultRenderersFactory(context) {
     override fun buildTextRenderers(
@@ -124,11 +120,6 @@ class GramophoneRenderFactory(
                 return 0
             }
         })
-
-        builder.setAudioOffloadSupportProvider(
-            MyAudioOffloadSupportProvider(DefaultAudioOffloadSupportProvider(context), disableGaplessOffload)
-        )
-
         var postAmpAudioSink: PostAmpAudioSink? = null
         val root = builder.setEnableAudioTrackPlaybackParams(enableAudioTrackPlaybackParams)
             .setCanReuse { postAmpAudioSink!!.canReuse() }.build()
@@ -157,22 +148,4 @@ class GramophoneRenderFactory(
             configurationListener(null)
         }
     }
-
-    class MyAudioOffloadSupportProvider(
-        private val default: DefaultAudioOffloadSupportProvider,
-        private val disableGaplessOffload: Boolean
-    ) : DefaultAudioSink.AudioOffloadSupportProvider by default {
-        override fun getAudioOffloadSupport(
-            format: Format,
-            audioAttributes: AudioAttributes
-        ): AudioOffloadSupport {
-            val defaultResult = default.getAudioOffloadSupport(format, audioAttributes)
-            val audioOffloadSupport = AudioOffloadSupport.Builder()
-            return audioOffloadSupport
-                .setIsFormatSupported(defaultResult.isFormatSupported)
-                .setIsGaplessSupported(defaultResult.isGaplessSupported && !disableGaplessOffload)
-                .setIsSpeedChangeSupported(defaultResult.isSpeedChangeSupported)
-                .build()
-        }
-    }
 }

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

@@ -165,9 +165,7 @@ class AudioPreviewActivity : BaseActivity(), View.OnClickListener {
             this,
             GramophoneRenderFactory(
                 this,
-                rgAp, {}, {},
-                Flags.OFFLOAD && prefs.getStringStrict("offload", "0")?.toIntOrNull() == 3
-            )
+                rgAp, {}, {})
                 .setPcmEncodingRestrictionLifted(true)
                 .setEnableDecoderFallback(true)
                 .setEnableAudioTrackPlaybackParams(true)

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

@@ -30,14 +30,12 @@
         <item>@string/disabled</item>
         <item>@string/offload_enabled_if_gapless</item>
         <item>@string/offload_enabled_if_supported</item>
-        <item>@string/offload_enabled_no_gapless</item>
     </string-array>
 
     <string-array name="offload_switch_val" translatable="false">
         <item>0</item>
         <item>2</item>
         <item>1</item>
-        <item>3</item>
     </string-array>
 
     <string-array name="shuffle_all_queries" translatable="false">

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

@@ -458,7 +458,6 @@
     <string name="disabled">Disabled</string>
     <string name="offload_enabled_if_supported">Always enabled</string>
     <string name="offload_enabled_if_gapless">Enabled if gapless playback possible</string>
-    <string name="offload_enabled_no_gapless">Always enabled, but without gapless offload</string>
     <string name="settings_audio_offload">Audio offload (saves battery)</string>
     <string name="settings_telegram">Telegram</string>
     <string name="spk_encoding_pcm_20bit">20-bit PCM</string>