328 lines
13 KiB
Diff
328 lines
13 KiB
Diff
diff --git a/ios/AudioPlaylist.swift b/ios/AudioPlaylist.swift
|
|
--- a/ios/AudioPlaylist.swift
|
|
+++ b/ios/AudioPlaylist.swift
|
|
@@ -179,20 +179,31 @@
|
|
return
|
|
}
|
|
|
|
- let wasPlaying = isPlaying
|
|
- let resumeIndex: Int
|
|
- if ref.currentItem != nil {
|
|
- resumeIndex = index <= currentTrackIndex ? currentTrackIndex + 1 : currentTrackIndex
|
|
- } else {
|
|
- resumeIndex = index
|
|
- }
|
|
sources.insert(source, at: index)
|
|
|
|
- previousTrackIndex = resumeIndex
|
|
- rebuildPlaylist(startingAt: resumeIndex)
|
|
- if wasPlaying {
|
|
- play(at: currentRate)
|
|
+ // Nothing is loaded yet, so rebuilding does not interrupt playback.
|
|
+ guard ref.currentItem != nil else {
|
|
+ previousTrackIndex = index
|
|
+ rebuildPlaylist(startingAt: index)
|
|
+ updateStatus(with: ["trackCount": trackCount])
|
|
+ return
|
|
}
|
|
+
|
|
+ if index <= currentTrackIndex {
|
|
+ // Earlier tracks are not queued. Keep the playing item and shift indexes.
|
|
+ playerItems.insert(nil, at: index)
|
|
+ previousTrackIndex = currentTrackIndex
|
|
+ } else if let item = AudioUtils.createAVPlayerItem(from: source) {
|
|
+ // Queue the item in place so the playing item is left alone.
|
|
+ playerItems.insert(item, at: index)
|
|
+ let queued = ref.items()
|
|
+ let offset = index - currentTrackIndex
|
|
+ let after = offset - 1 < queued.count ? queued[offset - 1] : queued.last
|
|
+ ref.insert(item, after: after)
|
|
+ } else {
|
|
+ playerItems.insert(nil, at: index)
|
|
+ }
|
|
+
|
|
updateStatus(with: ["trackCount": trackCount])
|
|
}
|
|
|
|
@@ -213,12 +224,11 @@
|
|
play(at: currentRate)
|
|
}
|
|
} else if index < current {
|
|
- let resumeIndex = current - 1
|
|
- previousTrackIndex = resumeIndex
|
|
- rebuildPlaylist(startingAt: resumeIndex)
|
|
- if wasPlaying {
|
|
- play(at: currentRate)
|
|
+ // Earlier tracks are not queued, so only the index moves.
|
|
+ if index < playerItems.count {
|
|
+ playerItems.remove(at: index)
|
|
}
|
|
+ previousTrackIndex = currentTrackIndex
|
|
} else if index < playerItems.count {
|
|
if let item = playerItems[index] {
|
|
ref.remove(item)
|
|
diff --git a/android/src/main/java/expo/modules/audio/AudioPlaylist.kt b/android/src/main/java/expo/modules/audio/AudioPlaylist.kt
|
|
--- a/android/src/main/java/expo/modules/audio/AudioPlaylist.kt
|
|
+++ b/android/src/main/java/expo/modules/audio/AudioPlaylist.kt
|
|
@@ -9,2 +9,3 @@
|
|
import androidx.media3.exoplayer.ExoPlayer
|
|
+import androidx.media3.exoplayer.source.MediaSource
|
|
import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
|
|
@@ -53,3 +54,3 @@
|
|
|
|
- private var createMediaItemForSource: ((AudioSource) -> MediaItem?)? = null
|
|
+ private var createMediaSourceForSource: ((AudioSource) -> MediaSource?)? = null
|
|
|
|
@@ -60,4 +61,4 @@
|
|
|
|
- fun setMediaItemCreator(creator: (AudioSource) -> MediaItem?) {
|
|
- this.createMediaItemForSource = creator
|
|
+ fun setMediaSourceCreator(creator: (AudioSource) -> MediaSource?) {
|
|
+ this.createMediaSourceForSource = creator
|
|
}
|
|
@@ -67,5 +68,5 @@
|
|
sources.forEach { source ->
|
|
- createMediaItemForSource?.invoke(source)?.let { mediaItem ->
|
|
+ createMediaSourceForSource?.invoke(source)?.let { mediaItem ->
|
|
validSources.add(source)
|
|
- ref.addMediaItem(mediaItem)
|
|
+ ref.addMediaSource(mediaItem)
|
|
}
|
|
@@ -151,5 +152,5 @@
|
|
fun add(source: AudioSource) {
|
|
- val mediaItem = createMediaItemForSource?.invoke(source) ?: return
|
|
+ val mediaItem = createMediaSourceForSource?.invoke(source) ?: return
|
|
sources.add(source)
|
|
- ref.addMediaItem(mediaItem)
|
|
+ ref.addMediaSource(mediaItem)
|
|
sendStatusUpdate(mapOf("trackCount" to trackCount))
|
|
@@ -161,5 +162,5 @@
|
|
}
|
|
- val mediaItem = createMediaItemForSource?.invoke(source) ?: return
|
|
+ val mediaItem = createMediaSourceForSource?.invoke(source) ?: return
|
|
sources.add(index, source)
|
|
- ref.addMediaItem(index, mediaItem)
|
|
+ ref.addMediaSource(index, mediaItem)
|
|
sendStatusUpdate(mapOf("trackCount" to trackCount))
|
|
diff --git a/android/src/main/java/expo/modules/audio/AudioModule.kt b/android/src/main/java/expo/modules/audio/AudioModule.kt
|
|
--- a/android/src/main/java/expo/modules/audio/AudioModule.kt
|
|
+++ b/android/src/main/java/expo/modules/audio/AudioModule.kt
|
|
@@ -909,14 +909,4 @@
|
|
playlist.loopMode = loop
|
|
- playlist.setMediaItemCreator { source ->
|
|
- source.uri?.let { uriString ->
|
|
- val uri = uriString.toUri()
|
|
- when {
|
|
- isRawResource(uri) -> {
|
|
- val file = getResourceName(uri, uriString)
|
|
- MediaItem.fromUri(getRawResourceURI(file))
|
|
- }
|
|
- else -> MediaItem.fromUri(uri)
|
|
- }
|
|
- }
|
|
- }
|
|
+ // Use the same per-source headers and stream type as standalone players.
|
|
+ playlist.setMediaSourceCreator { source -> createMediaItem(source) }
|
|
playlist.loadInitialPlaylist()
|
|
@@ -1130,3 +1120,3 @@
|
|
}
|
|
- else -> MediaItem.fromUri(uri)
|
|
+ else -> MediaItem.Builder().setUri(uri).setMimeType(source.mimeType).build()
|
|
}
|
|
@@ -1196,3 +1186,3 @@
|
|
val uri = mediaItem.localConfiguration?.uri
|
|
- return when (val type = uri?.let { retrieveStreamType(it) }) {
|
|
+ return when (val type = uri?.let { Util.inferContentTypeForUriAndMimeType(it, mediaItem.localConfiguration?.mimeType) }) {
|
|
CONTENT_TYPE_SS -> SsMediaSource.Factory(factory)
|
|
diff --git a/android/src/main/java/expo/modules/audio/AudioRecords.kt b/android/src/main/java/expo/modules/audio/AudioRecords.kt
|
|
--- a/android/src/main/java/expo/modules/audio/AudioRecords.kt
|
|
+++ b/android/src/main/java/expo/modules/audio/AudioRecords.kt
|
|
@@ -15,3 +15,4 @@
|
|
@Field val headers: Map<String, String>?,
|
|
- @Field val name: String? = null
|
|
+ @Field val name: String? = null,
|
|
+ @Field val mimeType: String? = null
|
|
) : Record
|
|
diff --git a/src/Audio.types.ts b/src/Audio.types.ts
|
|
--- a/src/Audio.types.ts
|
|
+++ b/src/Audio.types.ts
|
|
@@ -38,2 +38,4 @@
|
|
headers?: Record<string, string>;
|
|
+ /** MIME type for streams whose URL has no file extension, such as HLS. */
|
|
+ mimeType?: string;
|
|
/**
|
|
diff --git a/build/Audio.types.d.ts b/build/Audio.types.d.ts
|
|
--- a/build/Audio.types.d.ts
|
|
+++ b/build/Audio.types.d.ts
|
|
@@ -31,2 +31,4 @@
|
|
headers?: Record<string, string>;
|
|
+ /** MIME type for streams whose URL has no file extension, such as HLS. */
|
|
+ mimeType?: string;
|
|
/**
|
|
diff --git a/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt b/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt
|
|
--- a/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt
|
|
+++ b/android/src/main/java/expo/modules/audio/BaseAudioPlayer.kt
|
|
@@ -159,8 +159,16 @@
|
|
super.sharedObjectDidRelease()
|
|
// Run on GlobalScope (not appContext.mainQueue) so that reloading doesn't cancel the release process
|
|
GlobalScope.launch(Dispatchers.Main) {
|
|
- releasePlayer()
|
|
+ release()
|
|
}
|
|
+ }
|
|
+
|
|
+ private var released = false
|
|
+
|
|
+ fun release() {
|
|
+ if (released) return
|
|
+ released = true
|
|
+ releasePlayer()
|
|
}
|
|
|
|
protected open fun releasePlayer() {
|
|
diff --git a/android/src/main/java/expo/modules/audio/AudioModule.kt b/android/src/main/java/expo/modules/audio/AudioModule.kt
|
|
--- a/android/src/main/java/expo/modules/audio/AudioModule.kt
|
|
+++ b/android/src/main/java/expo/modules/audio/AudioModule.kt
|
|
@@ -1105,6 +1105,7 @@
|
|
runOnMain {
|
|
playlist.clearLockScreenControls()
|
|
playlists.remove(playlist.id)
|
|
+ playlist.release()
|
|
releaseAudioFocusIfUnused()
|
|
}
|
|
}
|
|
diff --git a/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt b/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt
|
|
--- a/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt
|
|
+++ b/android/src/main/java/expo/modules/audio/service/MetadataInjectingPlayer.kt
|
|
@@ -1,5 +1,14 @@
|
|
package expo.modules.audio.service
|
|
|
|
+import androidx.media3.common.AudioAttributes
|
|
+import androidx.media3.common.DeviceInfo
|
|
+import androidx.media3.common.MediaItem
|
|
+import androidx.media3.common.PlaybackException
|
|
+import androidx.media3.common.PlaybackParameters
|
|
+import androidx.media3.common.Timeline
|
|
+import androidx.media3.common.TrackSelectionParameters
|
|
+import androidx.media3.common.Tracks
|
|
+import androidx.media3.common.VideoSize
|
|
import android.os.Handler
|
|
import android.os.Looper
|
|
import androidx.core.net.toUri
|
|
@@ -81,7 +90,114 @@
|
|
|
|
private inner class MetadataForwardingListener(
|
|
private val listener: Player.Listener
|
|
- ) : Player.Listener by listener {
|
|
+ ) : Player.Listener {
|
|
+ // Kotlin delegation does not forward Java default methods on Player.Listener.
|
|
+ // Forward each callback so MediaSession receives timeline and duration changes.
|
|
+ override fun onTimelineChanged(timeline: Timeline, reason: Int) =
|
|
+ listener.onTimelineChanged(timeline, reason)
|
|
+
|
|
+ override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) =
|
|
+ listener.onMediaItemTransition(mediaItem, reason)
|
|
+
|
|
+ override fun onTracksChanged(tracks: Tracks) =
|
|
+ listener.onTracksChanged(tracks)
|
|
+
|
|
+ override fun onPlaylistMetadataChanged(mediaMetadata: MediaMetadata) =
|
|
+ listener.onPlaylistMetadataChanged(mediaMetadata)
|
|
+
|
|
+ override fun onIsLoadingChanged(isLoading: Boolean) =
|
|
+ listener.onIsLoadingChanged(isLoading)
|
|
+
|
|
+ override fun onLoadingChanged(isLoading: Boolean) =
|
|
+ listener.onLoadingChanged(isLoading)
|
|
+
|
|
+ override fun onAvailableCommandsChanged(availableCommands: Player.Commands) =
|
|
+ listener.onAvailableCommandsChanged(availableCommands)
|
|
+
|
|
+ override fun onTrackSelectionParametersChanged(parameters: TrackSelectionParameters) =
|
|
+ listener.onTrackSelectionParametersChanged(parameters)
|
|
+
|
|
+ override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) =
|
|
+ listener.onPlayerStateChanged(playWhenReady, playbackState)
|
|
+
|
|
+ override fun onPlaybackStateChanged(playbackState: Int) =
|
|
+ listener.onPlaybackStateChanged(playbackState)
|
|
+
|
|
+ override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) =
|
|
+ listener.onPlayWhenReadyChanged(playWhenReady, reason)
|
|
+
|
|
+ override fun onPlaybackSuppressionReasonChanged(playbackSuppressionReason: Int) =
|
|
+ listener.onPlaybackSuppressionReasonChanged(playbackSuppressionReason)
|
|
+
|
|
+ override fun onIsPlayingChanged(isPlaying: Boolean) =
|
|
+ listener.onIsPlayingChanged(isPlaying)
|
|
+
|
|
+ override fun onRepeatModeChanged(repeatMode: Int) =
|
|
+ listener.onRepeatModeChanged(repeatMode)
|
|
+
|
|
+ override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) =
|
|
+ listener.onShuffleModeEnabledChanged(shuffleModeEnabled)
|
|
+
|
|
+ override fun onPlayerError(error: PlaybackException) =
|
|
+ listener.onPlayerError(error)
|
|
+
|
|
+ override fun onPlayerErrorChanged(error: PlaybackException?) =
|
|
+ listener.onPlayerErrorChanged(error)
|
|
+
|
|
+ override fun onPositionDiscontinuity(reason: Int) =
|
|
+ listener.onPositionDiscontinuity(reason)
|
|
+
|
|
+ override fun onPositionDiscontinuity(oldPosition: Player.PositionInfo, newPosition: Player.PositionInfo, reason: Int) =
|
|
+ listener.onPositionDiscontinuity(oldPosition, newPosition, reason)
|
|
+
|
|
+ override fun onPlaybackParametersChanged(playbackParameters: PlaybackParameters) =
|
|
+ listener.onPlaybackParametersChanged(playbackParameters)
|
|
+
|
|
+ override fun onSeekBackIncrementChanged(seekBackIncrementMs: Long) =
|
|
+ listener.onSeekBackIncrementChanged(seekBackIncrementMs)
|
|
+
|
|
+ override fun onSeekForwardIncrementChanged(seekForwardIncrementMs: Long) =
|
|
+ listener.onSeekForwardIncrementChanged(seekForwardIncrementMs)
|
|
+
|
|
+ override fun onMaxSeekToPreviousPositionChanged(maxSeekToPreviousPositionMs: Long) =
|
|
+ listener.onMaxSeekToPreviousPositionChanged(maxSeekToPreviousPositionMs)
|
|
+
|
|
+ override fun onAudioSessionIdChanged(audioSessionId: Int) =
|
|
+ listener.onAudioSessionIdChanged(audioSessionId)
|
|
+
|
|
+ override fun onAudioAttributesChanged(audioAttributes: AudioAttributes) =
|
|
+ listener.onAudioAttributesChanged(audioAttributes)
|
|
+
|
|
+ override fun onVolumeChanged(volume: Float) =
|
|
+ listener.onVolumeChanged(volume)
|
|
+
|
|
+ override fun onSkipSilenceEnabledChanged(skipSilenceEnabled: Boolean) =
|
|
+ listener.onSkipSilenceEnabledChanged(skipSilenceEnabled)
|
|
+
|
|
+ override fun onDeviceInfoChanged(deviceInfo: DeviceInfo) =
|
|
+ listener.onDeviceInfoChanged(deviceInfo)
|
|
+
|
|
+ override fun onDeviceVolumeChanged(volume: Int, muted: Boolean) =
|
|
+ listener.onDeviceVolumeChanged(volume, muted)
|
|
+
|
|
+ override fun onVideoSizeChanged(videoSize: VideoSize) =
|
|
+ listener.onVideoSizeChanged(videoSize)
|
|
+
|
|
+ override fun onSurfaceSizeChanged(width: Int, height: Int) =
|
|
+ listener.onSurfaceSizeChanged(width, height)
|
|
+
|
|
+ override fun onRenderedFirstFrame() =
|
|
+ listener.onRenderedFirstFrame()
|
|
+
|
|
+ override fun onCues(cues: List<androidx.media3.common.text.Cue>) =
|
|
+ listener.onCues(cues)
|
|
+
|
|
+ override fun onCues(cueGroup: androidx.media3.common.text.CueGroup) =
|
|
+ listener.onCues(cueGroup)
|
|
+
|
|
+ override fun onMetadata(metadata: androidx.media3.common.Metadata) =
|
|
+ listener.onMetadata(metadata)
|
|
+
|
|
override fun onMediaMetadataChanged(mediaMetadata: MediaMetadata) {
|
|
listener.onMediaMetadataChanged(this@MetadataInjectingPlayer.mediaMetadata)
|
|
}
|