Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correctly set playback speed and pitch

Browse source
This commit is contained in:
Prathamesh More 2022-05-21 02:00:26 +05:30
parent d6c4d5e133
commit b9f0adc9c2
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
View file

@ -19,8 +19,6 @@ import code.name.monkey.retromusic.service.AudioFader.Companion.createFadeAnimat
import code.name.monkey.retromusic.service.playback.Playback import code.name.monkey.retromusic.service.playback.Playback
import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtil.playbackPitch
import code.name.monkey.retromusic.util.PreferenceUtil.playbackSpeed
import kotlinx.coroutines.* import kotlinx.coroutines.*
/** @author Prathamesh M */ /** @author Prathamesh M */
@ -168,7 +166,6 @@ class CrossFadePlayer(val context: Context) : Playback, MediaPlayer.OnCompletion
player.setAudioAttributes( player.setAudioAttributes(
AudioAttributes.Builder().setLegacyStreamType(AudioManager.STREAM_MUSIC).build() AudioAttributes.Builder().setLegacyStreamType(AudioManager.STREAM_MUSIC).build()
) )
player.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
player.setOnPreparedListener { player.setOnPreparedListener {
player.setOnPreparedListener(null) player.setOnPreparedListener(null)
completion(true) completion(true)
@ -321,7 +318,6 @@ class CrossFadePlayer(val context: Context) : Playback, MediaPlayer.OnCompletion
} }
} }
fun onDurationUpdated(progress: Int, total: Int) { fun onDurationUpdated(progress: Int, total: Int) {
if (total > 0 && (total - progress).div(1000) == crossFadeDuration) { if (total > 0 && (total - progress).div(1000) == crossFadeDuration) {
getNextPlayer()?.let { player -> getNextPlayer()?.let { player ->
@ -369,10 +365,6 @@ internal fun crossFadeScope(): CoroutineScope = CoroutineScope(Job() + Dispatche
fun MediaPlayer.setPlaybackSpeedPitch(speed: Float, pitch: Float) { fun MediaPlayer.setPlaybackSpeedPitch(speed: Float, pitch: Float) {
if (hasMarshmallow()) { if (hasMarshmallow()) {
val wasPlaying: Boolean = isPlaying
playbackParams = PlaybackParams().setSpeed(speed).setPitch(pitch) playbackParams = PlaybackParams().setSpeed(speed).setPitch(pitch)
if (!wasPlaying) {
if (isPlaying) pause()
}
} }
} }

3
app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
View file

@ -27,8 +27,6 @@ import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.service.playback.Playback import code.name.monkey.retromusic.service.playback.Playback
import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
import code.name.monkey.retromusic.util.PreferenceUtil.isGapLessPlayback import code.name.monkey.retromusic.util.PreferenceUtil.isGapLessPlayback
import code.name.monkey.retromusic.util.PreferenceUtil.playbackPitch
import code.name.monkey.retromusic.util.PreferenceUtil.playbackSpeed
/** /**
* @author Andrew Neal, Karim Abou Zeid (kabouzeid) * @author Andrew Neal, Karim Abou Zeid (kabouzeid)
@ -91,7 +89,6 @@ class MultiPlayer internal constructor(private val context: Context) : Playback,
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build() .build()
) )
player.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
player.setOnPreparedListener { player.setOnPreparedListener {
player.setOnPreparedListener(null) player.setOnPreparedListener(null)
completion(true) completion(true)

8
app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
View file

@ -6,6 +6,8 @@ import android.media.audiofx.AudioEffect
import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.service.playback.Playback import code.name.monkey.retromusic.service.playback.Playback
import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.PreferenceUtil.playbackPitch
import code.name.monkey.retromusic.util.PreferenceUtil.playbackSpeed
import com.google.android.gms.cast.framework.CastSession import com.google.android.gms.cast.framework.CastSession
@ -32,6 +34,9 @@ class PlaybackManager(val context: Context) {
val isPlaying: Boolean val isPlaying: Boolean
get() = playback != null && playback!!.isPlaying get() = playback != null && playback!!.isPlaying
private val shouldSetSpeed: Boolean
get() = !(playbackSpeed == 1f && playbackPitch == 1f)
init { init {
playback = createLocalPlayback() playback = createLocalPlayback()
} }
@ -52,6 +57,9 @@ class PlaybackManager(val context: Context) {
onPlay() onPlay()
} }
} }
if (shouldSetSpeed) {
playback?.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
}
playback?.start() playback?.start()
} }
} }