-
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
fc17f86
commit 5b60fa3
Showing
20 changed files
with
333 additions
and
153 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,83 +8,162 @@ import kotlinx.coroutines.Dispatchers | |
| import kotlinx.coroutines.launch | ||
| import spms.socketapi.shared.SpMsPlayerRepeatMode | ||
| import spms.socketapi.shared.SpMsPlayerState | ||
| import androidx.media3.common.Player | ||
| import androidx.media3.common.MediaItem as ExoMediaItem | ||
|
|
||
| actual class PlatformExternalPlayerService: ForegroundPlayerService(), PlayerService { | ||
| private val service: ExternalPlayerService = ExternalPlayerService() | ||
| actual class PlatformExternalPlayerService: ForegroundPlayerService(play_when_ready = true), PlayerService { | ||
| // private var cancelling_radio: Boolean = false | ||
|
|
||
| private val service_listener = object : PlayerListener() { | ||
| override fun onSongAdded(index: Int, song: Song) = this@PlatformExternalPlayerService.onSongAdded(index, song) | ||
| override fun onPlayingChanged(is_playing: Boolean) = this@PlatformExternalPlayerService.onPlayingChanged(is_playing) | ||
| override fun onSeeked(position_ms: Long) = this@PlatformExternalPlayerService.onSeeked(position_ms) | ||
| override fun onSongMoved(from: Int, to: Int) = this@PlatformExternalPlayerService.onSongMoved(from, to) | ||
| override fun onSongRemoved(index: Int, song: Song) = this@PlatformExternalPlayerService.onSongRemoved(index) | ||
| override fun onSongTransition(song: Song?, manual: Boolean) = this@PlatformExternalPlayerService.onSongTransition(song, manual) | ||
| override fun onRadioCancelled() { | ||
| super.onRadioCancelled() | ||
| server.onRadioCancelled() | ||
| } | ||
|
|
||
| private val server: ExternalPlayerService = | ||
| object : ExternalPlayerService(plays_audio = true) { | ||
| override fun createServicePlayer(): PlayerServicePlayer = this@PlatformExternalPlayerService.service_player | ||
| } | ||
|
|
||
| private val server_listener: PlayerListener = | ||
| object : PlayerListener() { | ||
| override fun onSongAdded(index: Int, song: Song) = this@PlatformExternalPlayerService.onSongAdded(index, song) | ||
| override fun onPlayingChanged(is_playing: Boolean) = this@PlatformExternalPlayerService.onPlayingChanged(is_playing) | ||
| override fun onSeeked(position_ms: Long) = this@PlatformExternalPlayerService.onSeeked(position_ms) | ||
| override fun onSongMoved(from: Int, to: Int) = this@PlatformExternalPlayerService.onSongMoved(from, to) | ||
| override fun onSongRemoved(index: Int, song: Song) = this@PlatformExternalPlayerService.onSongRemoved(index) | ||
| override fun onSongTransition(song: Song?, manual: Boolean) = this@PlatformExternalPlayerService.onSongTransition(current_song_index) | ||
| // override fun onRadioCancelRequested() { | ||
| // cancelling_radio = true | ||
| // [email protected]_player.radio_instance.cancelRadio() | ||
| // cancelling_radio = false | ||
| // } | ||
| } | ||
|
|
||
| private val player_listener: Player.Listener = | ||
| object : Player.Listener { | ||
| private var last_seek_position: Long? = null | ||
|
|
||
| override fun onMediaItemTransition(mediaItem: ExoMediaItem?, reason: Int) { | ||
| if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_SEEK && player.currentMediaItemIndex != current_song_index) { | ||
| server.seekToSong(player.currentMediaItemIndex) | ||
| } | ||
| } | ||
|
|
||
| override fun onIsPlayingChanged(isPlaying: Boolean) { | ||
| if (isPlaying == target_playing || player.playbackState != Player.STATE_READY) { | ||
| return | ||
| } | ||
|
|
||
| if (isPlaying) { | ||
| server.play() | ||
| } | ||
| else { | ||
| server.pause() | ||
| } | ||
| } | ||
|
|
||
| override fun onPositionDiscontinuity(oldPosition: Player.PositionInfo, newPosition: Player.PositionInfo, reason: Int) { | ||
| if (newPosition.positionMs == target_seek) { | ||
| return | ||
| } | ||
|
|
||
| if (reason == Player.DISCONTINUITY_REASON_SEEK && newPosition.positionMs != last_seek_position) { | ||
| last_seek_position = newPosition.positionMs | ||
| pause() | ||
| server.seekTo(newPosition.positionMs) | ||
|
|
||
| if (player.playbackState == Player.STATE_READY) { | ||
| server.notifyReadyToPlay() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun onPlaybackStateChanged(playbackState: Int) { | ||
| if (playbackState == Player.STATE_READY) { | ||
| server.notifyReadyToPlay() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private var target_playing: Boolean = false | ||
| private var target_seek: Long? = null | ||
|
|
||
| override fun onCreate() { | ||
| super.onCreate() | ||
|
|
||
| service._context = context | ||
| service.addListener(service_listener) | ||
| server._context = context | ||
| server.addListener(server_listener) | ||
|
|
||
| player.addListener(player_listener) | ||
|
|
||
| service.onCreate() | ||
| server.onCreate() | ||
| } | ||
|
|
||
| override fun onDestroy() { | ||
| super.onDestroy() | ||
| service.onDestroy() | ||
| server.onDestroy() | ||
| } | ||
|
|
||
| private fun onSongAdded(index: Int, song: Song) { coroutine_scope.launch(Dispatchers.Main) { | ||
| super.addSong(song, index) | ||
| }} | ||
| private fun onPlayingChanged(is_playing: Boolean) { coroutine_scope.launch(Dispatchers.Main) { | ||
| target_playing = is_playing | ||
| if (is_playing) super.play() | ||
| else super.pause() | ||
| }} | ||
| private fun onSeeked(position_ms: Long) { coroutine_scope.launch(Dispatchers.Main) { | ||
| target_seek = position_ms | ||
| super.seekTo(position_ms) | ||
| }} | ||
| private fun onSongMoved(from: Int, to: Int) { coroutine_scope.launch(Dispatchers.Main) { | ||
| super.moveSong(from, to) | ||
| }} | ||
| private fun onSongRemoved(index: Int) { coroutine_scope.launch(Dispatchers.Main) { | ||
| private fun onSongRemoved(index: Int) { coroutine_scope.launch(Dispatchers.Main) { | ||
| super.removeSong(index) | ||
| }} | ||
| private fun onSongTransition(song: Song?, manual: Boolean) { coroutine_scope.launch(Dispatchers.Main) { | ||
| super.seekToSong(current_song_index) | ||
| private fun onSongTransition(index: Int) { coroutine_scope.launch(Dispatchers.Main) { | ||
| if (index < 0 || index == player.currentMediaItemIndex) { | ||
| return@launch | ||
| } | ||
| try { | ||
| super.seekToSong(index) | ||
| } | ||
| catch (e: Throwable) { | ||
| throw RuntimeException("seekToSong($index) failed", e) | ||
| } | ||
| }} | ||
|
|
||
| override val load_state: PlayerServiceLoadState get() = service.load_state | ||
| override val state: SpMsPlayerState get() = service.state | ||
| override val is_playing: Boolean get() = service.is_playing | ||
| override val song_count: Int get() = service.song_count | ||
| override val current_song_index: Int get() = service.current_song_index | ||
| override val current_position_ms: Long get() = service.current_position_ms | ||
| override val duration_ms: Long get() = service.duration_ms | ||
| override val has_focus: Boolean get() = service.has_focus | ||
| override val radio_instance: RadioInstance get() = service.radio_instance | ||
| override val load_state: PlayerServiceLoadState get() = server.load_state | ||
| override val state: SpMsPlayerState get() = server.state | ||
| override val is_playing: Boolean get() = server.is_playing | ||
| override val song_count: Int get() = server.song_count | ||
| override val current_song_index: Int get() = server.current_song_index | ||
| override val current_position_ms: Long get() = server.current_position_ms | ||
| override val duration_ms: Long get() = server.duration_ms | ||
| override val has_focus: Boolean get() = server.has_focus | ||
| override val radio_instance: RadioInstance get() = server.radio_instance | ||
| override var repeat_mode: SpMsPlayerRepeatMode | ||
| get() = service.repeat_mode | ||
| set(value) { service.repeat_mode = value } | ||
| get() = server.repeat_mode | ||
| set(value) { server.repeat_mode = value } | ||
| override var volume: Float | ||
| get() = service.volume | ||
| set(value) { service.volume = value } | ||
|
|
||
| override fun play() = service.play() | ||
| override fun pause() = service.pause() | ||
| override fun playPause() = service.playPause() | ||
| override fun seekTo(position_ms: Long) = service.seekTo(position_ms) | ||
| override fun seekToSong(index: Int) = service.seekToSong(index) | ||
| override fun seekToNext() = service.seekToNext() | ||
| override fun seekToPrevious() = service.seekToPrevious() | ||
| override fun getSong(): Song? = service.getSong() | ||
| override fun getSong(index: Int): Song? = service.getSong(index) | ||
| override fun addSong(song: Song, index: Int) = service.addSong(song, index) | ||
| override fun moveSong(from: Int, to: Int) = service.moveSong(from, to) | ||
| override fun removeSong(index: Int) = service.removeSong(index) | ||
| override fun addListener(listener: PlayerListener) = service.addListener(listener) | ||
| override fun removeListener(listener: PlayerListener) = service.removeListener(listener) | ||
| get() = server.volume | ||
| set(value) { server.volume = value } | ||
|
|
||
| override fun play() = server.play() | ||
| override fun pause() = server.pause() | ||
| override fun playPause() = server.playPause() | ||
| override fun seekTo(position_ms: Long) = server.seekTo(position_ms) | ||
| override fun seekToSong(index: Int) = server.seekToSong(index) | ||
| override fun seekToNext() = server.seekToNext() | ||
| override fun seekToPrevious() = server.seekToPrevious() | ||
| override fun getSong(): Song? = server.getSong() | ||
| override fun getSong(index: Int): Song? = server.getSong(index) | ||
| override fun addSong(song: Song, index: Int) = server.addSong(song, index) | ||
| override fun moveSong(from: Int, to: Int) = server.moveSong(from, to) | ||
| override fun removeSong(index: Int) = server.removeSong(index) | ||
| override fun addListener(listener: PlayerListener) = server.addListener(listener) | ||
| override fun removeListener(listener: PlayerListener) = server.removeListener(listener) | ||
|
|
||
| actual companion object: InternalPlayerServiceCompanion(PlatformExternalPlayerService::class), PlayerServiceCompanion { | ||
| override fun isServiceRunning(context: AppContext): Boolean = true | ||
|
|
||
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
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
Oops, something went wrong.