antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: casting full album/playlist working as intended, passing metadata for album artwork in small square #16

Browse source
This commit is contained in:
eddyizm 2025-08-31 20:24:48 -07:00
parent 4740028a44
commit cf7feacdc0
No known key found for this signature in database
GPG key ID: CF5F671829E8158A
2 changed files with 140 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

106
app/src/play/java/com/cappielloantonio/tempo/service/MediaService.kt
View file

@ -45,8 +45,8 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
initializePlayerListener() initializePlayerListener()
setPlayer( setPlayer(
null, null,
if (this::castPlayer.isInitialized && castPlayer.isCastSessionAvailable) castPlayer else player if (this::castPlayer.isInitialized && castPlayer.isCastSessionAvailable) castPlayer else player
) )
} }
@ -73,13 +73,13 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializePlayer() { private fun initializePlayer() {
player = ExoPlayer.Builder(this) player = ExoPlayer.Builder(this)
.setRenderersFactory(getRenderersFactory()) .setRenderersFactory(getRenderersFactory())
.setMediaSourceFactory(getMediaSourceFactory()) .setMediaSourceFactory(getMediaSourceFactory())
.setAudioAttributes(AudioAttributes.DEFAULT, true) .setAudioAttributes(AudioAttributes.DEFAULT, true)
.setHandleAudioBecomingNoisy(true) .setHandleAudioBecomingNoisy(true)
.setWakeMode(C.WAKE_MODE_NETWORK) .setWakeMode(C.WAKE_MODE_NETWORK)
.setLoadControl(initializeLoadControl()) .setLoadControl(initializeLoadControl())
.build() .build()
player.shuffleModeEnabled = Preferences.isShuffleModeEnabled() player.shuffleModeEnabled = Preferences.isShuffleModeEnabled()
player.repeatMode = Preferences.getRepeatMode() player.repeatMode = Preferences.getRepeatMode()
@ -87,7 +87,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializeCastPlayer() { private fun initializeCastPlayer() {
if (GoogleApiAvailability.getInstance() if (GoogleApiAvailability.getInstance()
.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS .isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS
) { ) {
castPlayer = CastPlayer(CastContext.getSharedInstance(this)) castPlayer = CastPlayer(CastContext.getSharedInstance(this))
castPlayer.setSessionAvailabilityListener(this) castPlayer.setSessionAvailabilityListener(this)
@ -96,16 +96,16 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializeMediaLibrarySession() { private fun initializeMediaLibrarySession() {
val sessionActivityPendingIntent = val sessionActivityPendingIntent =
TaskStackBuilder.create(this).run { TaskStackBuilder.create(this).run {
addNextIntent(Intent(this@MediaService, MainActivity::class.java)) addNextIntent(Intent(this@MediaService, MainActivity::class.java))
getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT) getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
} }
librarySessionCallback = createLibrarySessionCallback() librarySessionCallback = createLibrarySessionCallback()
mediaLibrarySession = mediaLibrarySession =
MediaLibrarySession.Builder(this, player, librarySessionCallback) MediaLibrarySession.Builder(this, player, librarySessionCallback)
.setSessionActivity(sessionActivityPendingIntent) .setSessionActivity(sessionActivityPendingIntent)
.build() .build()
} }
private fun createLibrarySessionCallback(): MediaLibrarySessionCallback { private fun createLibrarySessionCallback(): MediaLibrarySessionCallback {
@ -133,8 +133,8 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
override fun onIsPlayingChanged(isPlaying: Boolean) { override fun onIsPlayingChanged(isPlaying: Boolean) {
if (!isPlaying) { if (!isPlaying) {
MediaManager.setPlayingPausedTimestamp( MediaManager.setPlayingPausedTimestamp(
player.currentMediaItem, player.currentMediaItem,
player.currentPosition player.currentPosition
) )
} else { } else {
MediaManager.scrobble(player.currentMediaItem, false) MediaManager.scrobble(player.currentMediaItem, false)
@ -145,8 +145,8 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
super.onPlaybackStateChanged(playbackState) super.onPlaybackStateChanged(playbackState)
if (!player.hasNextMediaItem() && if (!player.hasNextMediaItem() &&
playbackState == Player.STATE_ENDED && playbackState == Player.STATE_ENDED &&
player.mediaMetadata.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC player.mediaMetadata.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC
) { ) {
MediaManager.scrobble(player.currentMediaItem, true) MediaManager.scrobble(player.currentMediaItem, true)
MediaManager.saveChronology(player.currentMediaItem) MediaManager.saveChronology(player.currentMediaItem)
@ -154,9 +154,9 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
} }
override fun onPositionDiscontinuity( override fun onPositionDiscontinuity(
oldPosition: Player.PositionInfo, oldPosition: Player.PositionInfo,
newPosition: Player.PositionInfo, newPosition: Player.PositionInfo,
reason: Int reason: Int
) { ) {
super.onPositionDiscontinuity(oldPosition, newPosition, reason) super.onPositionDiscontinuity(oldPosition, newPosition, reason)
@ -175,14 +175,14 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) { override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
Preferences.setShuffleModeEnabled(shuffleModeEnabled) Preferences.setShuffleModeEnabled(shuffleModeEnabled)
mediaLibrarySession.setCustomLayout( mediaLibrarySession.setCustomLayout(
librarySessionCallback.buildCustomLayout(player) librarySessionCallback.buildCustomLayout(player)
) )
} }
override fun onRepeatModeChanged(repeatMode: Int) { override fun onRepeatModeChanged(repeatMode: Int) {
Preferences.setRepeatMode(repeatMode) Preferences.setRepeatMode(repeatMode)
mediaLibrarySession.setCustomLayout( mediaLibrarySession.setCustomLayout(
librarySessionCallback.buildCustomLayout(player) librarySessionCallback.buildCustomLayout(player)
) )
} }
}) })
@ -190,17 +190,28 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializeLoadControl(): DefaultLoadControl { private fun initializeLoadControl(): DefaultLoadControl {
return DefaultLoadControl.Builder() return DefaultLoadControl.Builder()
.setBufferDurationsMs( .setBufferDurationsMs(
(DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(), (DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
(DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(), (DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS, DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
) )
.build() .build()
}
private fun getQueueFromPlayer(player: Player): List<MediaItem> {
// Helper function to get all media items from a player's queue.
val queue = mutableListOf<MediaItem>()
for (i in 0 until player.mediaItemCount) {
queue.add(player.getMediaItemAt(i))
}
return queue
} }
private fun setPlayer(oldPlayer: Player?, newPlayer: Player) { private fun setPlayer(oldPlayer: Player?, newPlayer: Player) {
// Safely switches the player instance and handles state transfer.
if (oldPlayer === newPlayer) return if (oldPlayer === newPlayer) return
oldPlayer?.stop() oldPlayer?.stop()
mediaLibrarySession.player = newPlayer mediaLibrarySession.player = newPlayer
} }
@ -211,19 +222,42 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
player.release() player.release()
mediaLibrarySession.release() mediaLibrarySession.release()
automotiveRepository.deleteMetadata() automotiveRepository.deleteMetadata()
clearListener()
} }
private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false) private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
private fun getMediaSourceFactory() = private fun getMediaSourceFactory() =
DefaultMediaSourceFactory(this).setDataSourceFactory(DownloadUtil.getDataSourceFactory(this)) DefaultMediaSourceFactory(this).setDataSourceFactory(DownloadUtil.getDataSourceFactory(this))
override fun onCastSessionAvailable() { override fun onCastSessionAvailable() {
// Get the current queue, item index, and position from the local player.
val currentQueue = getQueueFromPlayer(player)
val currentIndex = player.currentMediaItemIndex
val currentPosition = player.currentPosition
val isPlaying = player.playWhenReady
// Switch the player to the CastPlayer.
setPlayer(player, castPlayer) setPlayer(player, castPlayer)
// Transfer the entire queue to the CastPlayer and start playback.
castPlayer.setMediaItems(currentQueue, currentIndex, currentPosition)
castPlayer.playWhenReady = isPlaying
castPlayer.prepare()
} }
override fun onCastSessionUnavailable() { override fun onCastSessionUnavailable() {
// Get the current queue, item index, and position from the CastPlayer.
val currentQueue = getQueueFromPlayer(castPlayer)
val currentIndex = castPlayer.currentMediaItemIndex
val currentPosition = castPlayer.currentPosition
val isPlaying = castPlayer.playWhenReady
// Switch the player back to the local ExoPlayer.
setPlayer(castPlayer, player) setPlayer(castPlayer, player)
// Transfer the entire queue to the local ExoPlayer and start playback.
player.setMediaItems(currentQueue, currentIndex, currentPosition)
player.playWhenReady = isPlaying
player.prepare()
} }
} }

106
app/src/tempo/java/com/cappielloantonio/tempo/service/MediaService.kt
View file

@ -45,8 +45,8 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
initializePlayerListener() initializePlayerListener()
setPlayer( setPlayer(
null, null,
if (this::castPlayer.isInitialized && castPlayer.isCastSessionAvailable) castPlayer else player if (this::castPlayer.isInitialized && castPlayer.isCastSessionAvailable) castPlayer else player
) )
} }
@ -73,13 +73,13 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializePlayer() { private fun initializePlayer() {
player = ExoPlayer.Builder(this) player = ExoPlayer.Builder(this)
.setRenderersFactory(getRenderersFactory()) .setRenderersFactory(getRenderersFactory())
.setMediaSourceFactory(getMediaSourceFactory()) .setMediaSourceFactory(getMediaSourceFactory())
.setAudioAttributes(AudioAttributes.DEFAULT, true) .setAudioAttributes(AudioAttributes.DEFAULT, true)
.setHandleAudioBecomingNoisy(true) .setHandleAudioBecomingNoisy(true)
.setWakeMode(C.WAKE_MODE_NETWORK) .setWakeMode(C.WAKE_MODE_NETWORK)
.setLoadControl(initializeLoadControl()) .setLoadControl(initializeLoadControl())
.build() .build()
player.shuffleModeEnabled = Preferences.isShuffleModeEnabled() player.shuffleModeEnabled = Preferences.isShuffleModeEnabled()
player.repeatMode = Preferences.getRepeatMode() player.repeatMode = Preferences.getRepeatMode()
@ -87,7 +87,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializeCastPlayer() { private fun initializeCastPlayer() {
if (GoogleApiAvailability.getInstance() if (GoogleApiAvailability.getInstance()
.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS .isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS
) { ) {
castPlayer = CastPlayer(CastContext.getSharedInstance(this)) castPlayer = CastPlayer(CastContext.getSharedInstance(this))
castPlayer.setSessionAvailabilityListener(this) castPlayer.setSessionAvailabilityListener(this)
@ -96,16 +96,16 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializeMediaLibrarySession() { private fun initializeMediaLibrarySession() {
val sessionActivityPendingIntent = val sessionActivityPendingIntent =
TaskStackBuilder.create(this).run { TaskStackBuilder.create(this).run {
addNextIntent(Intent(this@MediaService, MainActivity::class.java)) addNextIntent(Intent(this@MediaService, MainActivity::class.java))
getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT) getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)
} }
librarySessionCallback = createLibrarySessionCallback() librarySessionCallback = createLibrarySessionCallback()
mediaLibrarySession = mediaLibrarySession =
MediaLibrarySession.Builder(this, player, librarySessionCallback) MediaLibrarySession.Builder(this, player, librarySessionCallback)
.setSessionActivity(sessionActivityPendingIntent) .setSessionActivity(sessionActivityPendingIntent)
.build() .build()
} }
private fun createLibrarySessionCallback(): MediaLibrarySessionCallback { private fun createLibrarySessionCallback(): MediaLibrarySessionCallback {
@ -133,8 +133,8 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
override fun onIsPlayingChanged(isPlaying: Boolean) { override fun onIsPlayingChanged(isPlaying: Boolean) {
if (!isPlaying) { if (!isPlaying) {
MediaManager.setPlayingPausedTimestamp( MediaManager.setPlayingPausedTimestamp(
player.currentMediaItem, player.currentMediaItem,
player.currentPosition player.currentPosition
) )
} else { } else {
MediaManager.scrobble(player.currentMediaItem, false) MediaManager.scrobble(player.currentMediaItem, false)
@ -145,8 +145,8 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
super.onPlaybackStateChanged(playbackState) super.onPlaybackStateChanged(playbackState)
if (!player.hasNextMediaItem() && if (!player.hasNextMediaItem() &&
playbackState == Player.STATE_ENDED && playbackState == Player.STATE_ENDED &&
player.mediaMetadata.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC player.mediaMetadata.extras?.getString("type") == Constants.MEDIA_TYPE_MUSIC
) { ) {
MediaManager.scrobble(player.currentMediaItem, true) MediaManager.scrobble(player.currentMediaItem, true)
MediaManager.saveChronology(player.currentMediaItem) MediaManager.saveChronology(player.currentMediaItem)
@ -154,9 +154,9 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
} }
override fun onPositionDiscontinuity( override fun onPositionDiscontinuity(
oldPosition: Player.PositionInfo, oldPosition: Player.PositionInfo,
newPosition: Player.PositionInfo, newPosition: Player.PositionInfo,
reason: Int reason: Int
) { ) {
super.onPositionDiscontinuity(oldPosition, newPosition, reason) super.onPositionDiscontinuity(oldPosition, newPosition, reason)
@ -175,14 +175,14 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) { override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
Preferences.setShuffleModeEnabled(shuffleModeEnabled) Preferences.setShuffleModeEnabled(shuffleModeEnabled)
mediaLibrarySession.setCustomLayout( mediaLibrarySession.setCustomLayout(
librarySessionCallback.buildCustomLayout(player) librarySessionCallback.buildCustomLayout(player)
) )
} }
override fun onRepeatModeChanged(repeatMode: Int) { override fun onRepeatModeChanged(repeatMode: Int) {
Preferences.setRepeatMode(repeatMode) Preferences.setRepeatMode(repeatMode)
mediaLibrarySession.setCustomLayout( mediaLibrarySession.setCustomLayout(
librarySessionCallback.buildCustomLayout(player) librarySessionCallback.buildCustomLayout(player)
) )
} }
}) })
@ -190,17 +190,28 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
private fun initializeLoadControl(): DefaultLoadControl { private fun initializeLoadControl(): DefaultLoadControl {
return DefaultLoadControl.Builder() return DefaultLoadControl.Builder()
.setBufferDurationsMs( .setBufferDurationsMs(
(DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(), (DefaultLoadControl.DEFAULT_MIN_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
(DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(), (DefaultLoadControl.DEFAULT_MAX_BUFFER_MS * Preferences.getBufferingStrategy()).toInt(),
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS, DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
) )
.build() .build()
}
private fun getQueueFromPlayer(player: Player): List<MediaItem> {
// Helper function to get all media items from a player's queue.
val queue = mutableListOf<MediaItem>()
for (i in 0 until player.mediaItemCount) {
queue.add(player.getMediaItemAt(i))
}
return queue
} }
private fun setPlayer(oldPlayer: Player?, newPlayer: Player) { private fun setPlayer(oldPlayer: Player?, newPlayer: Player) {
// Safely switches the player instance and handles state transfer.
if (oldPlayer === newPlayer) return if (oldPlayer === newPlayer) return
oldPlayer?.stop() oldPlayer?.stop()
mediaLibrarySession.player = newPlayer mediaLibrarySession.player = newPlayer
} }
@ -211,19 +222,42 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
player.release() player.release()
mediaLibrarySession.release() mediaLibrarySession.release()
automotiveRepository.deleteMetadata() automotiveRepository.deleteMetadata()
clearListener()
} }
private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false) private fun getRenderersFactory() = DownloadUtil.buildRenderersFactory(this, false)
private fun getMediaSourceFactory() = private fun getMediaSourceFactory() =
DefaultMediaSourceFactory(this).setDataSourceFactory(DownloadUtil.getDataSourceFactory(this)) DefaultMediaSourceFactory(this).setDataSourceFactory(DownloadUtil.getDataSourceFactory(this))
override fun onCastSessionAvailable() { override fun onCastSessionAvailable() {
// Get the current queue, item index, and position from the local player.
val currentQueue = getQueueFromPlayer(player)
val currentIndex = player.currentMediaItemIndex
val currentPosition = player.currentPosition
val isPlaying = player.playWhenReady
// Switch the player to the CastPlayer.
setPlayer(player, castPlayer) setPlayer(player, castPlayer)
// Transfer the entire queue to the CastPlayer and start playback.
castPlayer.setMediaItems(currentQueue, currentIndex, currentPosition)
castPlayer.playWhenReady = isPlaying
castPlayer.prepare()
} }
override fun onCastSessionUnavailable() { override fun onCastSessionUnavailable() {
// Get the current queue, item index, and position from the CastPlayer.
val currentQueue = getQueueFromPlayer(castPlayer)
val currentIndex = castPlayer.currentMediaItemIndex
val currentPosition = castPlayer.currentPosition
val isPlaying = castPlayer.playWhenReady
// Switch the player back to the local ExoPlayer.
setPlayer(castPlayer, player) setPlayer(castPlayer, player)
// Transfer the entire queue to the local ExoPlayer and start playback.
player.setMediaItems(currentQueue, currentIndex, currentPosition)
player.playWhenReady = isPlaying
player.prepare()
} }
} }