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

fix #169, properly updatemetadata in mediasession

Browse source
This commit is contained in:
tibbi 2022-02-09 15:19:07 +01:00
parent ea4152fe26
commit ac65abe097
4 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -142,6 +142,7 @@
<action android:name="com.simplemobiletools.musicplayer.action.SKIP_FORWARD" />
<action android:name="com.simplemobiletools.musicplayer.action.SET_PLAYBACK_SPEED" />
<action android:name="com.simplemobiletools.musicplayer.action.BROADCAST_STATUS" />
<action android:name="com.simplemobiletools.musicplayer.action.UPDATE_QUEUE_SIZE" />
</intent-filter>
</service>

1
app/src/main/kotlin/com/simplemobiletools/musicplayer/extensions/Context.kt
View file

@ -262,6 +262,7 @@ fun Context.addQueueItems(newTracks: List<Track>, callback: () -> Unit) {
tracksDAO.insertAll(newTracks)
queueDAO.insertAll(itemsToInsert)
sendIntent(UPDATE_QUEUE_SIZE)
callback()
}
}

1
app/src/main/kotlin/com/simplemobiletools/musicplayer/helpers/Constants.kt
View file

@ -40,6 +40,7 @@ const val SKIP_FORWARD = PATH + "SKIP_FORWARD"
const val BROADCAST_STATUS = PATH + "BROADCAST_STATUS"
const val NOTIFICATION_DISMISSED = PATH + "NOTIFICATION_DISMISSED"
const val SET_PLAYBACK_SPEED = PATH + "SET_PLAYBACK_SPEED"
const val UPDATE_QUEUE_SIZE = PATH + "UPDATE_QUEUE_SIZE"
const val NEW_TRACK = "NEW_TRACK"
const val IS_PLAYING = "IS_PLAYING"

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

@ -13,7 +13,6 @@ 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.*
import android.provider.MediaStore
@ -161,6 +160,7 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
STOP_SLEEP_TIMER -> stopSleepTimer()
BROADCAST_STATUS -> broadcastPlayerStatus()
SET_PLAYBACK_SPEED -> setPlaybackSpeed()
UPDATE_QUEUE_SIZE -> updateQueueSize()
}
MediaButtonReceiver.handleIntent(mMediaSession!!, intent)
@ -497,16 +497,6 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
stopForeground(false)
}
}, 200L)
val playbackState = if (getIsPlaying()) PlaybackStateCompat.STATE_PLAYING else PlaybackStateCompat.STATE_PAUSED
try {
mMediaSession!!.setPlaybackState(
PlaybackStateCompat.Builder()
.setState(playbackState, PLAYBACK_POSITION_UNKNOWN, 1.0f)
.build()
)
} catch (ignored: IllegalStateException) {
}
}
private fun getContentIntent(): PendingIntent {
@ -739,18 +729,49 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
}
private fun trackChanged() {
broadcastTrackChange()
updateMediaSession()
updateMediaSessionState()
}
private fun updateMediaSession() {
val albumImage = getAlbumImage()
mCurrTrackCover = albumImage.first
broadcastTrackChange()
var lockScreenImage = if (albumImage.second) albumImage.first else null
if (lockScreenImage == null || lockScreenImage.isRecycled) {
lockScreenImage = resources.getColoredBitmap(R.drawable.ic_headset, config.textColor)
}
val lockScreenImage = if (albumImage.second) albumImage.first else null
val metadata = MediaMetadataCompat.Builder()
.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, lockScreenImage)
.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, lockScreenImage)
.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, mCurrTrack?.album ?: "")
.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, mCurrTrack?.artist ?: "")
.putString(MediaMetadataCompat.METADATA_KEY_TITLE, mCurrTrack?.title ?: "")
.putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, mCurrTrack?.mediaStoreId?.toString())
.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, (mCurrTrack?.duration?.toLong() ?: 0L) * 1000)
.putLong(MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER, mTracks.indexOf(mCurrTrack).toLong() + 1)
.putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, mTracks.size.toLong())
.build()
mMediaSession?.setMetadata(metadata)
}
private fun updateMediaSessionState() {
val builder = PlaybackStateCompat.Builder()
val playbackState = if (getIsPlaying()) {
PlaybackStateCompat.STATE_PLAYING
} else {
PlaybackStateCompat.STATE_PAUSED
}
builder.setState(playbackState, mPlayer?.currentPosition?.toLong() ?: 0L, mPlaybackSpeed)
mMediaSession?.setPlaybackState(builder.build())
}
private fun updateQueueSize() {
updateMediaSession()
}
@SuppressLint("NewApi")
private fun setPlaybackSpeed() {
if (isMarshmallowPlus() && mPlayer != null) {
@ -797,6 +818,7 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
private fun broadcastTrackProgress(progress: Int) {
EventBus.getDefault().post(Events.ProgressUpdated(progress))
updateMediaSessionState()
}
// do not just return the album cover, but also a boolean to indicate if it a real cover, or just the placeholder
@ -973,7 +995,6 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
private fun trackStateChanged(isPlaying: Boolean) {
handleProgressHandler(isPlaying)
setupNotification()
mMediaSession?.isActive = isPlaying
broadcastTrackStateChange(isPlaying)
if (isPlaying) {