react-native-audio-browser 0.2.0-next.50 → 0.2.0-next.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/build.gradle +15 -0
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +215 -0
- package/android/src/main/AndroidManifest.xml +11 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +0 -4
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +47 -10
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +12 -3
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +4 -1
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +49 -0
- package/android/src/main/java/com/audiobrowser/player/Player.kt +170 -119
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +18 -13
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +10 -13
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +64 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +98 -0
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +42 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +110 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +696 -0
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +113 -0
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +39 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +59 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +92 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +105 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +69 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +128 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +550 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +99 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +201 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +15 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +66 -0
- package/android/src/main/java/com/audiobrowser/sonos/SpeakerXml.kt +26 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +63 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +63 -0
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +68 -0
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +2 -1
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +18 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +20 -3
- package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +35 -0
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +12 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +136 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +213 -0
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +275 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteItemTest.kt +61 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteOutputsControllerTest.kt +77 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteQueueTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +815 -0
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +203 -0
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +90 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +73 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +135 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +170 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +174 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +691 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +129 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +165 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosStreamUriTest.kt +64 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +204 -0
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +99 -0
- package/android/src/test/java/com/audiobrowser/sonos/ZoneGroupStateTest.kt +139 -0
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +12 -10
- package/android/src/test/resources/sonos/device_description.xml +78 -0
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +56 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +79 -0
- package/lib/commonjs/features/player/setup.js +2 -0
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/module/features/player/setup.js +2 -0
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +37 -7
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +3 -3
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +4 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +7 -5
- package/nitrogen/generated/android/c++/JOutputType.hpp +3 -0
- package/nitrogen/generated/android/c++/JRemoteOutputsOptions.hpp +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +3 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteOutputsOptions.kt +61 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +18 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +3 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +3 -0
- package/nitrogen/generated/ios/swift/NativeSetupPlayerOptions.swift +5 -12
- package/nitrogen/generated/ios/swift/OutputType.swift +4 -0
- package/nitrogen/generated/ios/swift/RemoteOutputsOptions.swift +78 -0
- package/nitrogen/generated/shared/c++/NativeSetupPlayerOptions.hpp +8 -5
- package/nitrogen/generated/shared/c++/OutputType.hpp +6 -2
- package/nitrogen/generated/shared/c++/RemoteOutputsOptions.hpp +92 -0
- package/package.json +1 -1
- package/src/features/player/setup.ts +38 -7
- package/src/specs/audio-browser.nitro.ts +4 -3
- package/website/guide/audio-output.md +185 -4
- package/website/guide/configuration.md +6 -0
|
@@ -8,6 +8,7 @@ import androidx.core.net.toUri
|
|
|
8
8
|
import androidx.media3.common.C
|
|
9
9
|
import androidx.media3.common.MediaItem
|
|
10
10
|
import androidx.media3.common.MediaMetadata
|
|
11
|
+
import androidx.media3.common.Player as MediaPlayer
|
|
11
12
|
import androidx.media3.database.StandaloneDatabaseProvider
|
|
12
13
|
import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
|
|
13
14
|
import androidx.media3.datasource.cache.SimpleCache
|
|
@@ -18,11 +19,17 @@ import com.audiobrowser.AudioBrowser
|
|
|
18
19
|
import com.audiobrowser.Callbacks
|
|
19
20
|
import com.audiobrowser.browser.displayArtworkSource
|
|
20
21
|
import com.audiobrowser.browser.resolveArtworkUrl
|
|
22
|
+
import com.audiobrowser.browser.resolveMediaUrl
|
|
21
23
|
import com.audiobrowser.browser.unattributedArtworkSource
|
|
24
|
+
import com.audiobrowser.cast.createCastRemote
|
|
22
25
|
import com.audiobrowser.extension.NumberExt.Companion.toSeconds
|
|
23
26
|
import com.audiobrowser.extension.identity
|
|
24
27
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
25
28
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
29
|
+
import com.audiobrowser.remote.RemoteOutputsController
|
|
30
|
+
import com.audiobrowser.remote.RemotePlayback
|
|
31
|
+
import com.audiobrowser.remote.RemoteUrls
|
|
32
|
+
import com.audiobrowser.sonos.SonosRemote
|
|
26
33
|
import com.audiobrowser.util.ArtworkRoutes
|
|
27
34
|
import com.audiobrowser.util.ArtworkUris
|
|
28
35
|
import com.audiobrowser.util.Automotive
|
|
@@ -57,6 +64,7 @@ import java.io.IOException
|
|
|
57
64
|
import java.util.concurrent.TimeUnit
|
|
58
65
|
import kotlin.time.Duration.Companion.seconds
|
|
59
66
|
import kotlinx.coroutines.CompletableDeferred
|
|
67
|
+
import kotlinx.coroutines.CoroutineScope
|
|
60
68
|
import kotlinx.coroutines.Dispatchers
|
|
61
69
|
import kotlinx.coroutines.MainScope
|
|
62
70
|
import kotlinx.coroutines.TimeoutCancellationException
|
|
@@ -65,7 +73,14 @@ import kotlinx.coroutines.withTimeout
|
|
|
65
73
|
import timber.log.Timber
|
|
66
74
|
|
|
67
75
|
@SuppressLint("RestrictedApi")
|
|
68
|
-
class Player
|
|
76
|
+
class Player
|
|
77
|
+
internal constructor(
|
|
78
|
+
internal val context: Context,
|
|
79
|
+
castRemote: (Context, String?) -> RemotePlayback?,
|
|
80
|
+
sonosRemote: (Context, CoroutineScope) -> RemotePlayback,
|
|
81
|
+
) {
|
|
82
|
+
constructor(context: Context) : this(context, ::createCastRemote, ::SonosRemote)
|
|
83
|
+
|
|
69
84
|
val appKilledPlaybackBehavior: AppKilledPlaybackBehavior
|
|
70
85
|
get() = options.appKilledPlaybackBehavior
|
|
71
86
|
|
|
@@ -78,7 +93,9 @@ class Player(internal val context: Context) {
|
|
|
78
93
|
EqualizerController(onSettingsChanged = { settings -> callbacks?.onEqualizerChanged(settings) })
|
|
79
94
|
private val mediaSessionCallback = MediaSessionCallback(this)
|
|
80
95
|
internal val playbackStateStore = PlaybackStateStore(this)
|
|
81
|
-
|
|
96
|
+
// The local engine's own volume: a receiver plays on at its own while the fade runs here.
|
|
97
|
+
internal val volumeFader =
|
|
98
|
+
VolumeFader(getVolume = { exoPlayer.volume }, setVolume = { exoPlayer.volume = it })
|
|
82
99
|
internal val sleepTimer =
|
|
83
100
|
SleepTimerManager(
|
|
84
101
|
volumeFader,
|
|
@@ -86,8 +103,30 @@ class Player(internal val context: Context) {
|
|
|
86
103
|
onChanged = { callbacks?.onSleepTimerChanged(it) },
|
|
87
104
|
)
|
|
88
105
|
|
|
89
|
-
|
|
90
|
-
lateinit var
|
|
106
|
+
/** The local engine. Rebuilt when the engine options change. */
|
|
107
|
+
internal lateinit var exoPlayer: ExoPlayer
|
|
108
|
+
private set
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* What plays: [exoPlayer], or while a remote output is on, the [RemoteSwitchingPlayer] around it.
|
|
112
|
+
* Every playback read and command goes here. Local-only work that would disturb a remote (retry,
|
|
113
|
+
* reconnect, stuck recovery, the shuffle order) goes through [localEngine]; the equalizer,
|
|
114
|
+
* skip-silence, buffering and the volume fade act on [exoPlayer] alone.
|
|
115
|
+
*/
|
|
116
|
+
lateinit var sessionPlayer: MediaPlayer
|
|
117
|
+
private set
|
|
118
|
+
|
|
119
|
+
/** [sessionPlayer] behind the remote-command seam: what the MediaSession wraps. */
|
|
120
|
+
lateinit var forwardingPlayer: MediaPlayer
|
|
121
|
+
|
|
122
|
+
private val remoteOutputs =
|
|
123
|
+
RemoteOutputsController(context, ::resolveRemoteUrls, castRemote, sonosRemote)
|
|
124
|
+
|
|
125
|
+
internal val localEngine =
|
|
126
|
+
LocalEngine({ exoPlayer }, isRemote = { remoteOutputs.player?.isRemote == true })
|
|
127
|
+
|
|
128
|
+
private var keepSessionAliveOnError = true
|
|
129
|
+
|
|
91
130
|
/** Thread-safe cache of playWhenReady for access from non-main threads (e.g., retry policy) */
|
|
92
131
|
@Volatile internal var playWhenReadyCache = false
|
|
93
132
|
|
|
@@ -250,7 +289,7 @@ class Player(internal val context: Context) {
|
|
|
250
289
|
private set
|
|
251
290
|
|
|
252
291
|
val currentTrack: Track?
|
|
253
|
-
get() =
|
|
292
|
+
get() = sessionPlayer.currentMediaItem?.let { TrackFactory.fromMedia3(it) }
|
|
254
293
|
|
|
255
294
|
internal var lastTrack: Track? = null
|
|
256
295
|
internal var lastIndex: Int? = null
|
|
@@ -285,47 +324,50 @@ class Player(internal val context: Context) {
|
|
|
285
324
|
}
|
|
286
325
|
|
|
287
326
|
var playWhenReady: Boolean
|
|
288
|
-
get() =
|
|
327
|
+
get() = sessionPlayer.playWhenReady
|
|
289
328
|
set(value) {
|
|
290
329
|
// Raising the intent at STATE_ENDED must replay, not silently no-op:
|
|
291
330
|
// ExoPlayer's setPlayWhenReady(true) never restarts an ended player (the
|
|
292
331
|
// ENDED→seekToDefaultPosition replay lives in media3's media-button
|
|
293
332
|
// path, not the Player API). In the setter so every writer gets it —
|
|
294
333
|
// play(), togglePlayback() and JS setPlayWhenReady alike.
|
|
295
|
-
if (value &&
|
|
296
|
-
|
|
334
|
+
if (value && sessionPlayer.playbackState == MediaPlayer.STATE_ENDED) {
|
|
335
|
+
sessionPlayer.seekToDefaultPosition()
|
|
297
336
|
}
|
|
298
337
|
playWhenReadyCache = value
|
|
299
|
-
|
|
338
|
+
sessionPlayer.playWhenReady = value
|
|
300
339
|
}
|
|
301
340
|
|
|
302
341
|
val duration: Long
|
|
303
|
-
get() = if (
|
|
342
|
+
get() = if (sessionPlayer.duration == C.TIME_UNSET) 0 else sessionPlayer.duration
|
|
304
343
|
|
|
305
344
|
internal var oldPosition = 0L
|
|
306
345
|
|
|
307
346
|
val position: Long
|
|
308
347
|
get() =
|
|
309
|
-
if (
|
|
348
|
+
if (sessionPlayer.currentPosition == C.INDEX_UNSET.toLong()) 0
|
|
349
|
+
else sessionPlayer.currentPosition
|
|
310
350
|
|
|
311
351
|
val bufferedPosition: Long
|
|
312
352
|
get() =
|
|
313
|
-
if (
|
|
353
|
+
if (sessionPlayer.bufferedPosition == C.INDEX_UNSET.toLong()) 0
|
|
354
|
+
else sessionPlayer.bufferedPosition
|
|
314
355
|
|
|
356
|
+
/** The volume, from 0 to 1: the local engine's, or while remote, the receiver's. */
|
|
315
357
|
var volume: Float
|
|
316
|
-
get() =
|
|
358
|
+
get() = sessionPlayer.volume
|
|
317
359
|
set(value) {
|
|
318
|
-
|
|
360
|
+
sessionPlayer.volume = value
|
|
319
361
|
}
|
|
320
362
|
|
|
321
363
|
var playbackSpeed: Float
|
|
322
|
-
get() =
|
|
364
|
+
get() = sessionPlayer.playbackParameters.speed
|
|
323
365
|
set(value) {
|
|
324
|
-
|
|
366
|
+
sessionPlayer.setPlaybackSpeed(value)
|
|
325
367
|
}
|
|
326
368
|
|
|
327
369
|
val isPlaying
|
|
328
|
-
get() =
|
|
370
|
+
get() = sessionPlayer.isPlaying
|
|
329
371
|
|
|
330
372
|
/**
|
|
331
373
|
* False while ExoPlayer suppresses output (a transient audio focus loss) though [playWhenReady]
|
|
@@ -333,36 +375,36 @@ class Player(internal val context: Context) {
|
|
|
333
375
|
*/
|
|
334
376
|
internal val shouldPlayWhenReady
|
|
335
377
|
get() =
|
|
336
|
-
|
|
337
|
-
|
|
378
|
+
sessionPlayer.playWhenReady &&
|
|
379
|
+
sessionPlayer.playbackSuppressionReason == MediaPlayer.PLAYBACK_SUPPRESSION_REASON_NONE
|
|
338
380
|
|
|
339
381
|
var repeatMode: RepeatMode
|
|
340
|
-
get() = RepeatModeFactory.fromMedia3(
|
|
382
|
+
get() = RepeatModeFactory.fromMedia3(sessionPlayer.repeatMode)
|
|
341
383
|
internal set(value) {
|
|
342
|
-
|
|
384
|
+
sessionPlayer.repeatMode = RepeatModeFactory.toMedia3(value)
|
|
343
385
|
}
|
|
344
386
|
|
|
345
387
|
val currentIndex: Int?
|
|
346
388
|
get() =
|
|
347
|
-
if (
|
|
348
|
-
else
|
|
389
|
+
if (sessionPlayer.currentMediaItemIndex == C.INDEX_UNSET) null
|
|
390
|
+
else sessionPlayer.currentMediaItemIndex
|
|
349
391
|
|
|
350
392
|
var shuffleMode: Boolean
|
|
351
|
-
get() =
|
|
393
|
+
get() = sessionPlayer.shuffleModeEnabled
|
|
352
394
|
set(value) {
|
|
353
|
-
|
|
395
|
+
sessionPlayer.shuffleModeEnabled = value
|
|
354
396
|
}
|
|
355
397
|
|
|
356
398
|
val trackCount: Int
|
|
357
|
-
get() =
|
|
399
|
+
get() = sessionPlayer.mediaItemCount
|
|
358
400
|
|
|
359
401
|
val isEmpty: Boolean
|
|
360
|
-
get() =
|
|
402
|
+
get() = sessionPlayer.mediaItemCount == 0
|
|
361
403
|
|
|
362
404
|
val tracks: Array<Track>
|
|
363
405
|
get() =
|
|
364
|
-
(0 until
|
|
365
|
-
.map { index -> TrackFactory.fromMedia3(
|
|
406
|
+
(0 until sessionPlayer.mediaItemCount)
|
|
407
|
+
.map { index -> TrackFactory.fromMedia3(sessionPlayer.getMediaItemAt(index)) }
|
|
366
408
|
.toTypedArray()
|
|
367
409
|
|
|
368
410
|
/**
|
|
@@ -372,7 +414,7 @@ class Player(internal val context: Context) {
|
|
|
372
414
|
* `isLastInPlaybackOrder`.
|
|
373
415
|
*/
|
|
374
416
|
val isLastInPlaybackOrder: Boolean
|
|
375
|
-
get() =
|
|
417
|
+
get() = sessionPlayer.nextMediaItemIndex == C.INDEX_UNSET
|
|
376
418
|
|
|
377
419
|
/**
|
|
378
420
|
* The source path from which the current queue was expanded (e.g., from a contextual path). Used
|
|
@@ -388,12 +430,12 @@ class Player(internal val context: Context) {
|
|
|
388
430
|
* @throws IllegalArgumentException if index is out of bounds.
|
|
389
431
|
*/
|
|
390
432
|
fun getTrack(index: Int): Track {
|
|
391
|
-
if (index < 0 || index >=
|
|
433
|
+
if (index < 0 || index >= sessionPlayer.mediaItemCount) {
|
|
392
434
|
throw IllegalArgumentException(
|
|
393
|
-
"Track index $index is out of bounds (size: ${
|
|
435
|
+
"Track index $index is out of bounds (size: ${sessionPlayer.mediaItemCount})"
|
|
394
436
|
)
|
|
395
437
|
}
|
|
396
|
-
return TrackFactory.fromMedia3(
|
|
438
|
+
return TrackFactory.fromMedia3(sessionPlayer.getMediaItemAt(index))
|
|
397
439
|
}
|
|
398
440
|
|
|
399
441
|
var skipSilence: Boolean
|
|
@@ -419,8 +461,14 @@ class Player(internal val context: Context) {
|
|
|
419
461
|
val newEngineOptions = setupOptions.engineOptions()
|
|
420
462
|
if (newEngineOptions == engineOptions) {
|
|
421
463
|
Timber.Forest.d("Setup options unchanged: keeping the player")
|
|
422
|
-
|
|
464
|
+
} else {
|
|
465
|
+
buildEngine(setupOptions)
|
|
466
|
+
engineOptions = newEngineOptions
|
|
423
467
|
}
|
|
468
|
+
if (remoteOutputs.apply(setupOptions.remoteOutputs, exoPlayer)) attachSessionPlayer()
|
|
469
|
+
}
|
|
470
|
+
|
|
471
|
+
private fun buildEngine(setupOptions: PlayerSetupOptions) {
|
|
424
472
|
Timber.Forest.d("Setting up player with new options")
|
|
425
473
|
val isInitialSetup = engineOptions == null
|
|
426
474
|
val carried = if (isInitialSetup) null else EnginePlayback.of(exoPlayer)
|
|
@@ -473,35 +521,18 @@ class Player(internal val context: Context) {
|
|
|
473
521
|
exoPlayer = engine.exoPlayer
|
|
474
522
|
// Before the listener and the session are attached, so neither hears the playback replayed.
|
|
475
523
|
carried?.restoreTo(exoPlayer)
|
|
524
|
+
remoteOutputs.setLocal(exoPlayer)
|
|
525
|
+
keepSessionAliveOnError = setupOptions.keepSessionAliveOnError
|
|
476
526
|
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
InterceptingPlayer(
|
|
480
|
-
exoPlayer,
|
|
481
|
-
{ callbacks },
|
|
482
|
-
{ options },
|
|
483
|
-
keepSessionAliveOnError = setupOptions.keepSessionAliveOnError,
|
|
484
|
-
)
|
|
527
|
+
if (isInitialSetup) playerListener = PlayerListener(this)
|
|
528
|
+
attachSessionPlayer()
|
|
485
529
|
|
|
486
530
|
if (isInitialSetup) {
|
|
487
|
-
// Initial setup - create player listener and emit initial state
|
|
488
|
-
playerListener = PlayerListener(this)
|
|
489
|
-
forwardingPlayer.addListener(playerListener)
|
|
490
531
|
callbacks?.onPlaybackChanged(Playback(PlaybackState.NONE, null))
|
|
491
|
-
|
|
492
|
-
// Initialize equalizer with audio session ID
|
|
493
532
|
equalizer.initialize(exoPlayer.audioSessionId)
|
|
494
|
-
} else {
|
|
495
|
-
//
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
// Update MediaSession with new forwardingPlayer reference if MediaSession exists
|
|
499
|
-
if (::mediaSession.isInitialized) {
|
|
500
|
-
Timber.Forest.d("Updating MediaSession with new forwardingPlayer reference")
|
|
501
|
-
mediaSession.player = forwardingPlayer
|
|
502
|
-
}
|
|
503
|
-
|
|
504
|
-
// No listener heard the restore; its prepare() leaves the engine buffering.
|
|
533
|
+
} else if (localEngine.isActive) {
|
|
534
|
+
// No listener heard the restore; its prepare() leaves the engine buffering. While remote,
|
|
535
|
+
// the receiver plays on unchanged.
|
|
505
536
|
setPlaybackState(
|
|
506
537
|
if (exoPlayer.playbackState == ExoPlayer.STATE_IDLE) PlaybackState.NONE
|
|
507
538
|
else PlaybackState.BUFFERING
|
|
@@ -514,7 +545,31 @@ class Player(internal val context: Context) {
|
|
|
514
545
|
|
|
515
546
|
// Set up automatic buffer management if enabled
|
|
516
547
|
setupAutomaticBufferManager(setupOptions.automaticBuffer)
|
|
517
|
-
|
|
548
|
+
}
|
|
549
|
+
|
|
550
|
+
/**
|
|
551
|
+
* Wraps [sessionPlayer] for the session: the remote switch while there is one, else [exoPlayer].
|
|
552
|
+
* Called when either changes.
|
|
553
|
+
*/
|
|
554
|
+
private fun attachSessionPlayer() {
|
|
555
|
+
if (::forwardingPlayer.isInitialized) forwardingPlayer.removeListener(playerListener)
|
|
556
|
+
sessionPlayer = remoteOutputs.player ?: exoPlayer
|
|
557
|
+
forwardingPlayer =
|
|
558
|
+
InterceptingPlayer(sessionPlayer, { callbacks }, { options }, keepSessionAliveOnError)
|
|
559
|
+
forwardingPlayer.addListener(playerListener)
|
|
560
|
+
if (::mediaSession.isInitialized) mediaSession.player = forwardingPlayer
|
|
561
|
+
}
|
|
562
|
+
|
|
563
|
+
/**
|
|
564
|
+
* The URLs a receiver fetches for [track]: through the media transform, which can call into JS.
|
|
565
|
+
*/
|
|
566
|
+
private suspend fun resolveRemoteUrls(track: Track): RemoteUrls {
|
|
567
|
+
val src = checkNotNull(track.src) { "The track has no src" }
|
|
568
|
+
val browserManager = browser?.browserManager
|
|
569
|
+
return RemoteUrls(
|
|
570
|
+
url = browserManager?.resolveMediaUrl(src, track)?.url() ?: src,
|
|
571
|
+
artworkUrl = browserManager?.resolveArtworkUrl(track)?.uri,
|
|
572
|
+
)
|
|
518
573
|
}
|
|
519
574
|
|
|
520
575
|
/** Sets up or tears down the automatic buffer manager based on the enabled flag. */
|
|
@@ -551,10 +606,8 @@ class Player(internal val context: Context) {
|
|
|
551
606
|
if (isOnline && pendingNetworkRetry) {
|
|
552
607
|
Timber.d("Network restored with pending retry, triggering immediate retry")
|
|
553
608
|
pendingNetworkRetry = false
|
|
554
|
-
// Only
|
|
555
|
-
if (playWhenReadyCache)
|
|
556
|
-
exoPlayer.prepare()
|
|
557
|
-
}
|
|
609
|
+
// Only while the play intent holds, and only locally: a receiver reconnects by itself.
|
|
610
|
+
if (playWhenReadyCache) localEngine.retry()
|
|
558
611
|
}
|
|
559
612
|
}
|
|
560
613
|
}
|
|
@@ -566,13 +619,13 @@ class Player(internal val context: Context) {
|
|
|
566
619
|
* @param track The [Track] to load.
|
|
567
620
|
*/
|
|
568
621
|
fun load(track: Track) {
|
|
569
|
-
if (
|
|
622
|
+
if (sessionPlayer.mediaItemCount == 0) {
|
|
570
623
|
add(track)
|
|
571
624
|
} else {
|
|
572
|
-
val index =
|
|
625
|
+
val index = sessionPlayer.currentMediaItemIndex
|
|
573
626
|
replaceTrack(index, track)
|
|
574
|
-
|
|
575
|
-
|
|
627
|
+
sessionPlayer.seekTo(index, C.TIME_UNSET)
|
|
628
|
+
sessionPlayer.prepare()
|
|
576
629
|
}
|
|
577
630
|
}
|
|
578
631
|
|
|
@@ -584,8 +637,8 @@ class Player(internal val context: Context) {
|
|
|
584
637
|
*/
|
|
585
638
|
fun add(track: Track) {
|
|
586
639
|
val mediaItem = TrackFactory.toMedia3(track)
|
|
587
|
-
|
|
588
|
-
|
|
640
|
+
sessionPlayer.addMediaItem(mediaItem)
|
|
641
|
+
sessionPlayer.prepare()
|
|
589
642
|
}
|
|
590
643
|
|
|
591
644
|
/**
|
|
@@ -596,8 +649,8 @@ class Player(internal val context: Context) {
|
|
|
596
649
|
*/
|
|
597
650
|
fun add(tracks: Array<Track>) {
|
|
598
651
|
val mediaItems = TrackFactory.toMedia3(tracks)
|
|
599
|
-
|
|
600
|
-
|
|
652
|
+
sessionPlayer.addMediaItems(mediaItems.toList())
|
|
653
|
+
sessionPlayer.prepare()
|
|
601
654
|
}
|
|
602
655
|
|
|
603
656
|
/**
|
|
@@ -609,10 +662,10 @@ class Player(internal val context: Context) {
|
|
|
609
662
|
*/
|
|
610
663
|
fun add(tracks: Array<Track>, atIndex: Int) {
|
|
611
664
|
validateInsertIndex(atIndex)
|
|
612
|
-
val index = if (atIndex == -1)
|
|
665
|
+
val index = if (atIndex == -1) sessionPlayer.mediaItemCount else atIndex
|
|
613
666
|
val mediaItems = tracks.map { TrackFactory.toMedia3(it) }
|
|
614
|
-
|
|
615
|
-
|
|
667
|
+
sessionPlayer.addMediaItems(index, mediaItems)
|
|
668
|
+
sessionPlayer.prepare()
|
|
616
669
|
}
|
|
617
670
|
|
|
618
671
|
/**
|
|
@@ -623,7 +676,7 @@ class Player(internal val context: Context) {
|
|
|
623
676
|
*/
|
|
624
677
|
fun remove(index: Int) {
|
|
625
678
|
validateIndex(index)
|
|
626
|
-
|
|
679
|
+
sessionPlayer.removeMediaItem(index)
|
|
627
680
|
}
|
|
628
681
|
|
|
629
682
|
/**
|
|
@@ -639,7 +692,7 @@ class Player(internal val context: Context) {
|
|
|
639
692
|
}
|
|
640
693
|
indexes.forEach { validateIndex(it) }
|
|
641
694
|
val sorted = indexes.sortedDescending()
|
|
642
|
-
sorted.forEach {
|
|
695
|
+
sorted.forEach { sessionPlayer.removeMediaItem(it) }
|
|
643
696
|
}
|
|
644
697
|
|
|
645
698
|
/**
|
|
@@ -647,8 +700,8 @@ class Player(internal val context: Context) {
|
|
|
647
700
|
* if there is no next track to skip to.
|
|
648
701
|
*/
|
|
649
702
|
fun next() {
|
|
650
|
-
|
|
651
|
-
|
|
703
|
+
sessionPlayer.seekToNextMediaItem()
|
|
704
|
+
sessionPlayer.prepare()
|
|
652
705
|
}
|
|
653
706
|
|
|
654
707
|
/**
|
|
@@ -656,8 +709,8 @@ class Player(internal val context: Context) {
|
|
|
656
709
|
* nothing if there is no previous track to skip to.
|
|
657
710
|
*/
|
|
658
711
|
fun previous() {
|
|
659
|
-
|
|
660
|
-
|
|
712
|
+
sessionPlayer.seekToPreviousMediaItem()
|
|
713
|
+
sessionPlayer.prepare()
|
|
661
714
|
}
|
|
662
715
|
|
|
663
716
|
/**
|
|
@@ -670,7 +723,7 @@ class Player(internal val context: Context) {
|
|
|
670
723
|
*/
|
|
671
724
|
fun move(fromIndex: Int, toIndex: Int) {
|
|
672
725
|
validateIndex(fromIndex)
|
|
673
|
-
|
|
726
|
+
sessionPlayer.moveMediaItem(fromIndex, toIndex)
|
|
674
727
|
}
|
|
675
728
|
|
|
676
729
|
/**
|
|
@@ -681,8 +734,8 @@ class Player(internal val context: Context) {
|
|
|
681
734
|
*/
|
|
682
735
|
fun skipTo(index: Int) {
|
|
683
736
|
validateIndex(index)
|
|
684
|
-
|
|
685
|
-
|
|
737
|
+
sessionPlayer.seekTo(index, C.TIME_UNSET)
|
|
738
|
+
sessionPlayer.prepare()
|
|
686
739
|
}
|
|
687
740
|
|
|
688
741
|
/**
|
|
@@ -702,12 +755,13 @@ class Player(internal val context: Context) {
|
|
|
702
755
|
sourcePath: String? = null,
|
|
703
756
|
) {
|
|
704
757
|
val mediaItems = TrackFactory.toMedia3(tracks).toMutableList()
|
|
705
|
-
|
|
758
|
+
sessionPlayer.setMediaItems(mediaItems, startIndex, startPositionMs)
|
|
759
|
+
// While remote, the queue plays in list order.
|
|
706
760
|
if (mediaItems.isNotEmpty()) {
|
|
707
|
-
|
|
761
|
+
localEngine.setShuffleOrder(shuffleOrderLedBy(startIndex, mediaItems.size))
|
|
708
762
|
}
|
|
709
763
|
queueSourcePath = sourcePath
|
|
710
|
-
|
|
764
|
+
sessionPlayer.prepare()
|
|
711
765
|
}
|
|
712
766
|
|
|
713
767
|
/**
|
|
@@ -719,7 +773,7 @@ class Player(internal val context: Context) {
|
|
|
719
773
|
validateIndex(index)
|
|
720
774
|
val isCurrent = index == currentIndex
|
|
721
775
|
if (isCurrent) nowPlaying.forgetPublished()
|
|
722
|
-
|
|
776
|
+
sessionPlayer.replaceMediaItem(index, TrackFactory.toMedia3(track))
|
|
723
777
|
if (isCurrent) nowPlaying.render()
|
|
724
778
|
}
|
|
725
779
|
|
|
@@ -745,7 +799,7 @@ class Player(internal val context: Context) {
|
|
|
745
799
|
// Cache written above: the gesture is durably recorded even without a media
|
|
746
800
|
// item to restamp (queue tear-down, between-track gaps) — that counts as
|
|
747
801
|
// applied; there is also no visible heart to revert in that state.
|
|
748
|
-
val index =
|
|
802
|
+
val index = sessionPlayer.currentMediaItemIndex
|
|
749
803
|
if (index == C.INDEX_UNSET) return true
|
|
750
804
|
|
|
751
805
|
val updatedTrack = currentTrack.copy(favorited = favorited)
|
|
@@ -860,14 +914,14 @@ class Player(internal val context: Context) {
|
|
|
860
914
|
* replacement: each separate one would be a timeline change, and a queue event to JS.
|
|
861
915
|
*/
|
|
862
916
|
private fun restampFavorites() {
|
|
863
|
-
if (!::
|
|
917
|
+
if (!::sessionPlayer.isInitialized || sessionPlayer.mediaItemCount == 0) return
|
|
864
918
|
val items =
|
|
865
|
-
(0 until
|
|
866
|
-
val item =
|
|
919
|
+
(0 until sessionPlayer.mediaItemCount).map { index ->
|
|
920
|
+
val item = sessionPlayer.getMediaItemAt(index)
|
|
867
921
|
val track = item.localConfiguration?.tag as? Track ?: return@map item
|
|
868
922
|
item.restamped(track) { setFavorite(track.favorited) }
|
|
869
923
|
}
|
|
870
|
-
|
|
924
|
+
sessionPlayer.replaceMediaItems(0, items.size, items)
|
|
871
925
|
}
|
|
872
926
|
|
|
873
927
|
/** Republishes the item at [index] with mutated metadata, preserving uri and Track tag. */
|
|
@@ -876,7 +930,10 @@ class Player(internal val context: Context) {
|
|
|
876
930
|
track: Track,
|
|
877
931
|
mutate: MediaMetadata.Builder.() -> MediaMetadata.Builder,
|
|
878
932
|
) {
|
|
879
|
-
|
|
933
|
+
sessionPlayer.replaceMediaItem(
|
|
934
|
+
index,
|
|
935
|
+
sessionPlayer.getMediaItemAt(index).restamped(track, mutate),
|
|
936
|
+
)
|
|
880
937
|
}
|
|
881
938
|
|
|
882
939
|
/**
|
|
@@ -918,8 +975,8 @@ class Player(internal val context: Context) {
|
|
|
918
975
|
* resolution registry). Must run on the main thread (ExoPlayer access).
|
|
919
976
|
*/
|
|
920
977
|
private fun findQueueTrackByArtworkUri(uri: String): Track? {
|
|
921
|
-
for (i in 0 until
|
|
922
|
-
val item =
|
|
978
|
+
for (i in 0 until sessionPlayer.mediaItemCount) {
|
|
979
|
+
val item = sessionPlayer.getMediaItemAt(i)
|
|
923
980
|
if (item.mediaMetadata.artworkUri?.toString() == uri) {
|
|
924
981
|
return item.localConfiguration?.tag as? Track
|
|
925
982
|
}
|
|
@@ -971,12 +1028,12 @@ class Player(internal val context: Context) {
|
|
|
971
1028
|
|
|
972
1029
|
/** Removes all the upcoming tracks, if any (the ones returned by [next]). */
|
|
973
1030
|
fun removeUpcomingTracks() {
|
|
974
|
-
val index =
|
|
1031
|
+
val index = sessionPlayer.currentMediaItemIndex
|
|
975
1032
|
if (index == C.INDEX_UNSET) return
|
|
976
|
-
val lastIndex =
|
|
1033
|
+
val lastIndex = sessionPlayer.mediaItemCount
|
|
977
1034
|
val fromIndex = index + 1
|
|
978
1035
|
|
|
979
|
-
|
|
1036
|
+
sessionPlayer.removeMediaItems(fromIndex, lastIndex)
|
|
980
1037
|
}
|
|
981
1038
|
|
|
982
1039
|
fun play() {
|
|
@@ -988,7 +1045,7 @@ class Player(internal val context: Context) {
|
|
|
988
1045
|
// otherwise), so this only reconnects after a stop() or error and never
|
|
989
1046
|
// re-buffers a healthy stream. Reconnecting is also how live streams
|
|
990
1047
|
// rejoin the live edge on resume.
|
|
991
|
-
|
|
1048
|
+
sessionPlayer.prepare()
|
|
992
1049
|
}
|
|
993
1050
|
}
|
|
994
1051
|
|
|
@@ -1001,15 +1058,8 @@ class Player(internal val context: Context) {
|
|
|
1001
1058
|
*/
|
|
1002
1059
|
fun seekToLiveEdge() {
|
|
1003
1060
|
if (currentTrack?.live != true) return
|
|
1004
|
-
|
|
1005
|
-
|
|
1006
|
-
} else {
|
|
1007
|
-
// ExoPlayer.prepare() only re-prepares from STATE_IDLE, hence the raw stop() — not
|
|
1008
|
-
// Player.stop(), which would drop the play intent this reconnect must preserve.
|
|
1009
|
-
exoPlayer.stop()
|
|
1010
|
-
exoPlayer.seekToDefaultPosition()
|
|
1011
|
-
exoPlayer.prepare()
|
|
1012
|
-
}
|
|
1061
|
+
// A receiver loads a live stream again on a seek to its default position.
|
|
1062
|
+
if (!localEngine.reconnectAtLiveEdge()) sessionPlayer.seekToDefaultPosition()
|
|
1013
1063
|
}
|
|
1014
1064
|
|
|
1015
1065
|
/**
|
|
@@ -1058,7 +1108,7 @@ class Player(internal val context: Context) {
|
|
|
1058
1108
|
|
|
1059
1109
|
fun prepare() {
|
|
1060
1110
|
if (currentTrack != null) {
|
|
1061
|
-
|
|
1111
|
+
sessionPlayer.prepare()
|
|
1062
1112
|
}
|
|
1063
1113
|
}
|
|
1064
1114
|
|
|
@@ -1090,11 +1140,11 @@ class Player(internal val context: Context) {
|
|
|
1090
1140
|
// is emitted (direct field assignment bypasses events — see its docstring).
|
|
1091
1141
|
setPlaybackState(PlaybackState.STOPPED)
|
|
1092
1142
|
playWhenReady = false
|
|
1093
|
-
|
|
1143
|
+
sessionPlayer.stop()
|
|
1094
1144
|
}
|
|
1095
1145
|
|
|
1096
1146
|
fun clear() {
|
|
1097
|
-
|
|
1147
|
+
sessionPlayer.clearMediaItems()
|
|
1098
1148
|
queueSourcePath = null
|
|
1099
1149
|
}
|
|
1100
1150
|
|
|
@@ -1115,6 +1165,7 @@ class Player(internal val context: Context) {
|
|
|
1115
1165
|
forwardingPlayer.removeListener(playerListener)
|
|
1116
1166
|
automaticBufferManager?.detach()
|
|
1117
1167
|
automaticBufferManager = null
|
|
1168
|
+
remoteOutputs.release()
|
|
1118
1169
|
exoPlayer.release()
|
|
1119
1170
|
cache?.release()
|
|
1120
1171
|
cache = null
|
|
@@ -1124,12 +1175,12 @@ class Player(internal val context: Context) {
|
|
|
1124
1175
|
|
|
1125
1176
|
fun seekTo(duration: Long, unit: TimeUnit) {
|
|
1126
1177
|
val positionMs = TimeUnit.MILLISECONDS.convert(duration, unit)
|
|
1127
|
-
|
|
1178
|
+
sessionPlayer.seekTo(positionMs)
|
|
1128
1179
|
}
|
|
1129
1180
|
|
|
1130
1181
|
fun seekBy(offset: Long, unit: TimeUnit) {
|
|
1131
|
-
val positionMs =
|
|
1132
|
-
|
|
1182
|
+
val positionMs = sessionPlayer.currentPosition + TimeUnit.MILLISECONDS.convert(offset, unit)
|
|
1183
|
+
sessionPlayer.seekTo(positionMs)
|
|
1133
1184
|
}
|
|
1134
1185
|
|
|
1135
1186
|
/**
|
|
@@ -1408,9 +1459,9 @@ class Player(internal val context: Context) {
|
|
|
1408
1459
|
* @throws IllegalArgumentException if index is out of bounds.
|
|
1409
1460
|
*/
|
|
1410
1461
|
private fun validateIndex(index: Int) {
|
|
1411
|
-
if (index < 0 || index >=
|
|
1462
|
+
if (index < 0 || index >= sessionPlayer.mediaItemCount) {
|
|
1412
1463
|
throw IllegalArgumentException(
|
|
1413
|
-
"Track index $index is out of bounds (size: ${
|
|
1464
|
+
"Track index $index is out of bounds (size: ${sessionPlayer.mediaItemCount})"
|
|
1414
1465
|
)
|
|
1415
1466
|
}
|
|
1416
1467
|
}
|
|
@@ -1422,9 +1473,9 @@ class Player(internal val context: Context) {
|
|
|
1422
1473
|
* @throws IllegalArgumentException if index is out of bounds.
|
|
1423
1474
|
*/
|
|
1424
1475
|
private fun validateInsertIndex(index: Int) {
|
|
1425
|
-
if (index < -1 || index >
|
|
1476
|
+
if (index < -1 || index > sessionPlayer.mediaItemCount) {
|
|
1426
1477
|
throw IllegalArgumentException(
|
|
1427
|
-
"Insert index $index is out of bounds (size: ${
|
|
1478
|
+
"Insert index $index is out of bounds (size: ${sessionPlayer.mediaItemCount}, use -1 to append)"
|
|
1428
1479
|
)
|
|
1429
1480
|
}
|
|
1430
1481
|
}
|
|
@@ -1461,7 +1512,7 @@ class Player(internal val context: Context) {
|
|
|
1461
1512
|
|
|
1462
1513
|
/** Returns true if the current media item is a live stream. */
|
|
1463
1514
|
val isCurrentItemLive: Boolean
|
|
1464
|
-
get() =
|
|
1515
|
+
get() = sessionPlayer.isCurrentMediaItemLive
|
|
1465
1516
|
|
|
1466
1517
|
// MARK: - Buffer Configuration
|
|
1467
1518
|
|