hamystudio/muza
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Tweak PlayerService code

Browse Source
This commit is contained in:
vfsfitvnm
2022-10-11 17:24:56 +02:00
parent 39b2cc2239
commit f726d3e934
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
View File

@@ -104,7 +104,6 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.cancellable import kotlinx.coroutines.flow.cancellable
import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.plus import kotlinx.coroutines.plus
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
@@ -298,8 +297,6 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
if (totalPlayTimeMs > 30000) { if (totalPlayTimeMs > 30000) {
query { query {
// THANKS, EXOPLAYER
if (runBlocking { Database.song(mediaItem.mediaId).first() } != null) {
Database.insert( Database.insert(
Event( Event(
songId = mediaItem.mediaId, songId = mediaItem.mediaId,
@@ -310,7 +307,6 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
} }
} }
} }
}
override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) { override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
maybeRecoverPlaybackError() maybeRecoverPlaybackError()
@@ -322,20 +318,6 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
} else if (mediaItem.mediaMetadata.artworkUri == bitmapProvider.lastUri) { } else if (mediaItem.mediaMetadata.artworkUri == bitmapProvider.lastUri) {
bitmapProvider.listener?.invoke(bitmapProvider.lastBitmap) bitmapProvider.listener?.invoke(bitmapProvider.lastBitmap)
} }
// On playlist changed, we refresh the mediaSession queue
// if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED) {
// mediaSession.setQueue(player.currentTimeline.mediaItems.mapIndexed { index, it ->
// MediaSession.QueueItem(
// MediaDescription.Builder()
// .setMediaId(it.mediaId)
// .setTitle(it.mediaMetadata.title)
// .setSubtitle(it.mediaMetadata.artist)
// .setIconUri(it.mediaMetadata.artworkUri)
// .build(), index.toLong()
// )
// })
// }
} }
private fun maybeRecoverPlaybackError() { private fun maybeRecoverPlaybackError() {
@@ -483,10 +465,6 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
MediaMetadata.METADATA_KEY_ALBUM, MediaMetadata.METADATA_KEY_ALBUM,
player.currentMediaItem?.mediaMetadata?.albumTitle player.currentMediaItem?.mediaMetadata?.albumTitle
) )
// .putBitmap(
// MediaMetadata.METADATA_KEY_ALBUM_ART,
// if (isShowingThumbnailInLockscreen) bitmapProvider.bitmap else null
// )
.putLong(MediaMetadata.METADATA_KEY_DURATION, player.duration) .putLong(MediaMetadata.METADATA_KEY_DURATION, player.duration)
.build().let(mediaSession::setMetadata) .build().let(mediaSession::setMetadata)
} }