-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Totally change how player works in backend, hopefully it will be smoo…
…ther to use now (#15)
- Loading branch information
1 parent
c070c5c
commit a1857ec
Showing
48 changed files
with
1,524 additions
and
1,135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
app/src/main/java/dev/brahmkshatriya/echo/playback/Current.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package dev.brahmkshatriya.echo.playback | ||
|
|
||
| import androidx.media3.common.MediaItem | ||
|
|
||
| data class Current( | ||
| val index: Int, | ||
| val mediaItem: MediaItem, | ||
| val isLoaded: Boolean | ||
| ) |
87 changes: 87 additions & 0 deletions
87
app/src/main/java/dev/brahmkshatriya/echo/playback/MediaItemUtils.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package dev.brahmkshatriya.echo.playback | ||
|
|
||
| import android.content.SharedPreferences | ||
| import androidx.core.net.toUri | ||
| import androidx.core.os.bundleOf | ||
| import androidx.media3.common.MediaItem | ||
| import androidx.media3.common.MediaMetadata | ||
| import androidx.media3.common.ThumbRating | ||
| import dev.brahmkshatriya.echo.common.models.EchoMediaItem | ||
| import dev.brahmkshatriya.echo.common.models.Track | ||
| import dev.brahmkshatriya.echo.ui.settings.AudioFragment.AudioPreference.Companion.selectStreamIndex | ||
| import dev.brahmkshatriya.echo.utils.getParcel | ||
|
|
||
| object MediaItemUtils { | ||
|
|
||
| fun build( | ||
| settings: SharedPreferences?, | ||
| track: Track, | ||
| clientId: String, | ||
| context: EchoMediaItem?, | ||
| ): MediaItem { | ||
| val item = MediaItem.Builder() | ||
| item.setUri(track.id) | ||
| val metadata = track.toMetaData(settings, clientId, context) | ||
| item.setMediaMetadata(metadata) | ||
| item.setMediaId(track.id) | ||
| return item.build() | ||
| } | ||
|
|
||
| fun build(settings: SharedPreferences?, mediaItem: MediaItem, track: Track): MediaItem = | ||
| with(mediaItem) { | ||
| val item = buildUpon() | ||
| val metadata = track.toMetaData(settings, clientId, context, true) | ||
| item.setMediaMetadata(metadata) | ||
| return item.build() | ||
| } | ||
|
|
||
| private fun Track.toMetaData( | ||
| settings: SharedPreferences?, | ||
| clientId: String, | ||
| context: EchoMediaItem?, | ||
| loaded: Boolean = false, | ||
| audioStreamIndex: Int? = null | ||
| ) = MediaMetadata.Builder() | ||
| .setTitle(title) | ||
| .setArtist(artists.joinToString(", ") { it.name }) | ||
| .setArtworkUri(id.toUri()) | ||
| .setUserRating(ThumbRating(liked)) | ||
| .setIsPlayable(true) | ||
| .setIsBrowsable(false) | ||
| .setExtras( | ||
| bundleOf( | ||
| "track" to this, | ||
| "clientId" to clientId, | ||
| "context" to context, | ||
| "loaded" to loaded, | ||
| "audioStream" to selectStream(settings, loaded, audioStreamIndex) | ||
| ) | ||
| ) | ||
| .setIsPlayable(loaded) | ||
| .build() | ||
|
|
||
| private fun Track.selectStream( | ||
| settings: SharedPreferences?, | ||
| loaded: Boolean, | ||
| audioStreamIndex: Int? | ||
| ): Int? { | ||
| if (!loaded) return null | ||
| if (settings == null) return audioStreamIndex | ||
| return audioStreamIndex ?: selectStreamIndex(settings, audioStreamables) | ||
| } | ||
|
|
||
| val MediaMetadata.isLoaded get() = extras?.getBoolean("loaded") ?: false | ||
| val MediaMetadata.track get() = requireNotNull(extras?.getParcel<Track>("track")) | ||
| val MediaMetadata.clientId get() = requireNotNull(extras?.getString("clientId")) | ||
| val MediaMetadata.context get() = extras?.getParcel<EchoMediaItem?>("context") | ||
| val MediaMetadata.audioStreamIndex get() = extras?.getInt("audioStream") ?: -1 | ||
| val MediaMetadata.isLiked get() = (userRating as? ThumbRating)?.isThumbsUp == true | ||
|
|
||
| val MediaItem.track get() = mediaMetadata.track | ||
| val MediaItem.clientId get() = mediaMetadata.clientId | ||
| val MediaItem.context get() = mediaMetadata.context | ||
| val MediaItem.isLoaded get() = mediaMetadata.isLoaded | ||
| val MediaItem.audioStreamIndex get() = mediaMetadata.audioStreamIndex | ||
| val MediaItem.isLiked get() = mediaMetadata.isLiked | ||
|
|
||
| } |
Oops, something went wrong.