@@ -336,6 +336,8 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
336336 }
337337 }
338338 rgAp = ReplayGainAudioProcessor ()
339+ prefs.registerOnSharedPreferenceChangeListener(this )
340+ onSharedPreferenceChanged(prefs, null ) // read initial values
339341 val player = EndedWorkaroundPlayer (
340342 ExoPlayer .Builder (
341343 this ,
@@ -346,7 +348,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
346348 .setPcmEncodingRestrictionLifted(true )
347349 .setEnableDecoderFallback(true )
348350 .setEnableAudioTrackPlaybackParams(true )
349- .setExtensionRendererMode(DefaultRenderersFactory .EXTENSION_RENDERER_MODE_PREFER ),
351+ .setExtensionRendererMode(DefaultRenderersFactory .EXTENSION_RENDERER_MODE_ON ),
350352 GramophoneMediaSourceFactory (
351353 DefaultDataSource .Factory (this ),
352354 GramophoneExtractorsFactory ().also {
@@ -504,8 +506,6 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
504506 if (controller!! .audioSessionId != C .AUDIO_SESSION_ID_UNSET ) {
505507 onAudioSessionIdChanged(controller!! .audioSessionId)
506508 }
507- prefs.registerOnSharedPreferenceChangeListener(this )
508- onSharedPreferenceChanged(prefs, null ) // read initial values
509509 ContextCompat .registerReceiver(
510510 this ,
511511 seekReceiver,
@@ -709,19 +709,19 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
709709 }
710710 if (key == null || key == " rg_drc" ) {
711711 val drc = prefs.getBooleanStrict(" rg_drc" , true )
712- restart = restart || ! rgAp.setReduceGain(! drc)
712+ restart = ! rgAp.setReduceGain(! drc) || restart
713713 }
714714 if (key == null || key == " rg_rg_gain" ) {
715715 val rgGain = prefs.getIntStrict(" rg_rg_gain" , 19 )
716- restart = restart || ! rgAp.setRgGain(rgGain - 15 )
716+ restart = ! rgAp.setRgGain(rgGain - 15 ) || restart
717717 }
718718 if (key == null || key == " rg_no_rg_gain" ) {
719719 val nonRgGain = prefs.getIntStrict(" rg_no_rg_gain" , 0 )
720- restart = restart || ! rgAp.setNonRgGain(- nonRgGain)
720+ restart = ! rgAp.setNonRgGain(- nonRgGain) || restart
721721 }
722722 if (key == null || key == " rg_boost_gain" ) {
723723 val boostGain = prefs.getIntStrict(" rg_boost_gain" , 0 )
724- restart = restart || ! rgAp.setBoostGain(boostGain)
724+ restart = ! rgAp.setBoostGain(boostGain) || restart
725725 }
726726 if (restart) {
727727 controller?.stop()
@@ -738,10 +738,10 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
738738 3 -> {
739739 val item = controller?.currentMediaItem
740740 val idx = controller?.currentMediaItemIndex ? : 0
741- val count = controller?.mediaItemCount
742- val next = if (idx + 1 >= ( count ? : 0 ) ) null else
741+ val count = controller?.mediaItemCount ? : 0
742+ val next = if (idx + 1 >= count) null else
743743 controller?.getMediaItemAt(idx + 1 )
744- val prev = if (idx - 1 < 0 || ( count ? : 0 ) == 0 ) null else
744+ val prev = if (idx - 1 < 0 || count == 0 ) null else
745745 controller?.getMediaItemAt(idx - 1 )
746746 if (item != null && (item.mediaMetadata.albumId == next?.mediaMetadata?.albumId ||
747747 item.mediaMetadata.albumId == prev?.mediaMetadata?.albumId)
0 commit comments