wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the selected equalizer at the mediaplayer

Browse source
This commit is contained in:
tibbi 2021-02-04 23:03:50 +01:00
parent 51d696bd3c
commit 82906cc45f
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/EqualizerActivity.kt
View file

@ -121,15 +121,17 @@ class EqualizerActivity : SimpleActivity() {
equalizer_preset.text = getString(R.string.custom)
for (band in 0 until equalizer.numberOfBands) {
val minValue = equalizer.bandLevelRange[0]
val progress = if (bands.containsKey(band.toShort())) {
bands[band.toShort()]
} else {
val minValue = equalizer.bandLevelRange[0]
val maxValue = equalizer.bandLevelRange[1]
(maxValue - minValue) / 2
}
bandSeekBars[band].progress = progress!!.toInt()
val newValue = progress + minValue
equalizer.setBandLevel(band.toShort(), newValue.toShort())
}
} else {
val presetName = equalizer.getPresetName(presetId.toShort())

23
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/MusicService.kt
View file

@ -12,6 +12,7 @@ import android.media.AudioManager
import android.media.AudioManager.*
import android.media.MediaMetadataRetriever
import android.media.MediaPlayer
import android.media.audiofx.Equalizer
import android.media.session.PlaybackState.PLAYBACK_POSITION_UNKNOWN
import android.net.Uri
import android.os.CountDownTimer
@ -27,6 +28,8 @@ import android.util.Size
import android.view.KeyEvent
import androidx.core.app.NotificationCompat
import androidx.media.session.MediaButtonReceiver
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.simplemobiletools.commons.extensions.getColoredBitmap
import com.simplemobiletools.commons.extensions.getRealPathFromURI
import com.simplemobiletools.commons.extensions.hasPermission
@ -148,7 +151,6 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
REFRESH_LIST -> handleRefreshList()
UPDATE_NEXT_TRACK -> broadcastNextTrackChange()
SET_PROGRESS -> handleSetProgress(intent)
SET_EQUALIZER -> handleSetEqualizer(intent)
SKIP_BACKWARD -> skip(false)
SKIP_FORWARD -> skip(true)
START_SLEEP_TIMER -> startSleepTimer()
@ -278,10 +280,6 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
}
}
private fun handleSetEqualizer(intent: Intent) {
}
private fun setupTrack() {
if (mIsThirdPartyIntent) {
initMediaPlayerIfNeeded()
@ -344,7 +342,20 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
}
private fun setupEqualizer() {
val preset = config.equalizerPreset
val equalizer = Equalizer(0, mPlayer!!.audioSessionId)
equalizer.enabled = true
if (preset != EQUALIZER_PRESET_CUSTOM) {
equalizer.usePreset(preset.toShort())
} else {
val minValue = equalizer.bandLevelRange[0]
val bandType = object : TypeToken<HashMap<Short, Int>>() {}.type
val equalizerBands = Gson().fromJson<HashMap<Short, Int>>(config.equalizerBands, bandType) ?: HashMap()
for ((key, value) in equalizerBands) {
val newValue = value + minValue
equalizer.setBandLevel(key, newValue.toShort())
}
}
}
// make sure tracks don't get duplicated in the queue, if they exist in multiple playlists