react-native-audio-browser 0.2.0-next.90 → 0.2.0-next.92

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.
Files changed (29) hide show
  1. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +4 -0
  2. package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +60 -1
  3. package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +2 -1
  4. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +80 -7
  5. package/android/src/main/java/com/audiobrowser/player/ConnectionEndSource.kt +145 -0
  6. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +7 -2
  7. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +10 -2
  8. package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +13 -10
  9. package/android/src/test/java/com/audiobrowser/RemoteOutputRoutesTest.kt +29 -0
  10. package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +46 -4
  11. package/android/src/test/java/com/audiobrowser/browser/TrackLoadHandlerTest.kt +1 -0
  12. package/android/src/test/java/com/audiobrowser/player/AutomaticBufferManagerTest.kt +208 -0
  13. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +70 -9
  14. package/android/src/test/java/com/audiobrowser/player/LiveStreamEndTest.kt +183 -6
  15. package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +27 -16
  16. package/android/src/test/java/com/audiobrowser/player/RetryMaskingTest.kt +3 -1
  17. package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +32 -0
  18. package/ios/Model/NitroTypeStubs.swift +1 -0
  19. package/ios/TrackSelector.swift +6 -1
  20. package/lib/typescript/src/types/browser.d.ts +6 -0
  21. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  22. package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +7 -3
  23. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +9 -4
  24. package/nitrogen/generated/ios/swift/TrackLoadEvent.swift +20 -2
  25. package/nitrogen/generated/shared/c++/TrackLoadEvent.hpp +7 -2
  26. package/package.json +2 -1
  27. package/src/types/browser.ts +6 -0
  28. package/website/guide/audio-output.md +27 -2
  29. package/website/guide/browser.md +2 -2
@@ -38,7 +38,8 @@ import org.robolectric.Shadows.shadowOf
38
38
  import org.robolectric.annotation.Config
39
39
 
40
40
  // Robolectric's clock stands still, so a delayed message on ExoPlayer's playback thread never
41
- // runs: the audio track is disabled because an audio renderer can wait in BUFFERING on one.
41
+ // runs: the audio track is disabled because an audio renderer can wait in BUFFERING on one. A
42
+ // rebuild builds an engine with it enabled, so idle() disables it on each new engine.
42
43
  // SDK 28: from 33, media3 asks AudioManager.getAudioDevicesForAttributes, which Robolectric 4.11
43
44
  // answers with null.
44
45
  @RunWith(RobolectricTestRunner::class)
@@ -64,11 +65,7 @@ class PlayerSuppressionTest {
64
65
  player.setup(PlayerSetupOptions())
65
66
  player.setCallbacks(callbacks)
66
67
  val src = folder.silentWavUri(Duration.ofMinutes(1))
67
- player.exoPlayer.trackSelectionParameters =
68
- player.exoPlayer.trackSelectionParameters
69
- .buildUpon()
70
- .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, true)
71
- .build()
68
+ disableAudio()
72
69
  player.exoPlayer.setMediaItems(
73
70
  listOf(TrackFactory.toMedia3(TestFixtures.track(title = "a", src = src)))
74
71
  )
@@ -131,7 +128,7 @@ class PlayerSuppressionTest {
131
128
  audioManager.setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_FAILED)
132
129
 
133
130
  player.togglePlayback()
134
- shadowOf(Looper.getMainLooper()).idle()
131
+ idle()
135
132
  assertEquals(PlaybackState.PAUSED, player.playbackState)
136
133
  focus(AudioManager.AUDIOFOCUS_GAIN)
137
134
 
@@ -157,7 +154,7 @@ class PlayerSuppressionTest {
157
154
  val engine = player.exoPlayer
158
155
 
159
156
  player.setup(PlayerSetupOptions(maxBuffer = 120_000.0))
160
- shadowOf(Looper.getMainLooper()).idle()
157
+ idle()
161
158
 
162
159
  assertSame(engine, player.exoPlayer)
163
160
  assertSuppressed()
@@ -175,7 +172,7 @@ class PlayerSuppressionTest {
175
172
  player.setup(PlayerSetupOptions(maxBuffer = 120_000.0))
176
173
  // ExoPlayer requests focus on its playback thread and posts a refusal back.
177
174
  Thread.sleep(200)
178
- shadowOf(Looper.getMainLooper()).idle()
175
+ idle()
179
176
 
180
177
  assertSuppressed()
181
178
  audioManager.setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED)
@@ -200,7 +197,7 @@ class PlayerSuppressionTest {
200
197
  assertSame(engine, player.exoPlayer)
201
198
  drop()
202
199
 
203
- shadowOf(Looper.getMainLooper()).idle()
200
+ idle()
204
201
 
205
202
  assertNotSame(engine, player.exoPlayer)
206
203
  assertFalse(player.exoPlayer.playWhenReady)
@@ -219,7 +216,7 @@ class PlayerSuppressionTest {
219
216
  player.play()
220
217
  // The rebuild follows the play: it is posted, never run inside it.
221
218
  assertSame(engine, player.exoPlayer)
222
- shadowOf(Looper.getMainLooper()).idle()
219
+ idle()
223
220
 
224
221
  assertNotSame(engine, player.exoPlayer)
225
222
  idleUntil("playing") { player.playbackState == PlaybackState.PLAYING }
@@ -230,7 +227,7 @@ class PlayerSuppressionTest {
230
227
  focus(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT)
231
228
  // As a handover to a remote output does: the engine stops but keeps the intent.
232
229
  player.exoPlayer.stop()
233
- shadowOf(Looper.getMainLooper()).idle()
230
+ idle()
234
231
  val engine = player.exoPlayer
235
232
 
236
233
  player.setup(PlayerSetupOptions(maxBuffer = 120_000.0))
@@ -259,7 +256,7 @@ class PlayerSuppressionTest {
259
256
 
260
257
  remote.startSession()
261
258
  idleUntil("remote") { !player.localEngine.isActive }
262
- shadowOf(Looper.getMainLooper()).idle()
259
+ idle()
263
260
 
264
261
  assertNotSame(engine, player.exoPlayer)
265
262
  assertFalse(player.localEngine.isActive)
@@ -274,7 +271,7 @@ class PlayerSuppressionTest {
274
271
 
275
272
  // As a terminal error does: the engine idles with the intent and the suppression unchanged.
276
273
  player.exoPlayer.stop()
277
- shadowOf(Looper.getMainLooper()).idle()
274
+ idle()
278
275
 
279
276
  assertNotSame(engine, player.exoPlayer)
280
277
  }
@@ -319,7 +316,7 @@ class PlayerSuppressionTest {
319
316
  player.setup(PlayerSetupOptions(maxBuffer = 120_000.0))
320
317
 
321
318
  player.destroy()
322
- shadowOf(Looper.getMainLooper()).idle()
319
+ idle()
323
320
 
324
321
  assertSame(engine, player.exoPlayer)
325
322
  }
@@ -348,7 +345,21 @@ class PlayerSuppressionTest {
348
345
  "exo ${player.exoPlayer.playbackState}, ${player.exoPlayer.playerError}"
349
346
  )
350
347
  Thread.sleep(10)
351
- shadowOf(Looper.getMainLooper()).idle()
348
+ idle()
352
349
  }
353
350
  }
351
+
352
+ private fun idle() {
353
+ shadowOf(Looper.getMainLooper()).idle()
354
+ if (C.TRACK_TYPE_AUDIO !in player.exoPlayer.trackSelectionParameters.disabledTrackTypes)
355
+ disableAudio()
356
+ }
357
+
358
+ private fun disableAudio() {
359
+ player.exoPlayer.trackSelectionParameters =
360
+ player.exoPlayer.trackSelectionParameters
361
+ .buildUpon()
362
+ .setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, true)
363
+ .build()
364
+ }
354
365
  }
@@ -82,7 +82,9 @@ class RetryMaskingTest {
82
82
 
83
83
  @Test
84
84
  fun `the loop reconnects, and its idle engine and error reach no surface`() {
85
- play("http://127.0.0.1:${server.localPort}/live.mp3")
85
+ // The clock outruns a connection's real I/O: a slow one would bring a give-up into the test.
86
+ val noGiveUp = Duration.ofHours(1).toMillis()
87
+ play("http://127.0.0.1:${server.localPort}/live.mp3", RetryPolicy.Infinite(noGiveUp, noGiveUp))
86
88
  var held = 0
87
89
  stepUntil("the loop holding the idle engine a while") {
88
90
  if (player.exoPlayer.playbackState == MediaPlayer.STATE_IDLE) {
@@ -3,6 +3,7 @@ package com.audiobrowser.sonos
3
3
  import android.Manifest
4
4
  import android.content.ComponentName
5
5
  import android.content.pm.PackageManager
6
+ import androidx.mediarouter.media.MediaRouteProvider
6
7
  import androidx.mediarouter.media.MediaRouter
7
8
  import com.audiobrowser.RemoteOutputs
8
9
  import org.junit.After
@@ -57,6 +58,16 @@ class SonosRoutesTest {
57
58
  }
58
59
  }
59
60
 
61
+ @Test
62
+ fun `publishes the rooms with restricted visibility`() {
63
+ val routes = sonosRouteDescriptors(listOf(dining, living), null) { null }.routes
64
+
65
+ for (route in routes) {
66
+ assertFalse(route.isVisibilityPublic)
67
+ assertEquals(emptySet<String>(), route.allowedPackages)
68
+ }
69
+ }
70
+
60
71
  @Test
61
72
  fun `reports the selected room connected, and only that one`() {
62
73
  val routes = sonosRouteDescriptors(listOf(dining, living), "RINCON_C") { null }.routes
@@ -91,6 +102,27 @@ class SonosRoutesTest {
91
102
  provider.release()
92
103
  }
93
104
 
105
+ @Test
106
+ fun `serves a session for this app, and refuses one for another app`() {
107
+ val context = RuntimeEnvironment.getApplication()
108
+ SonosOutputs.select(living)
109
+ val provider = SonosRouteProvider(context)
110
+ SonosOutputs.unselect(living)
111
+
112
+ fun controllerFor(packageName: String) =
113
+ provider.onCreateRouteController(
114
+ "RINCON_C",
115
+ MediaRouteProvider.RouteControllerOptions.Builder()
116
+ .setClientPackageName(packageName)
117
+ .build(),
118
+ )
119
+
120
+ assertNull(controllerFor("com.example.other"))
121
+ controllerFor(context.packageName)!!.onSelect()
122
+ assertEquals(living, SonosOutputs.selected)
123
+ provider.release()
124
+ }
125
+
94
126
  @Test
95
127
  fun `a late unselect of a room left behind keeps the room selected since`() {
96
128
  SonosOutputs.select(dining)
@@ -74,6 +74,7 @@
74
74
  var track: Track
75
75
  var queue: [Track]
76
76
  var startIndex: Double
77
+ var startPosition: Double?
77
78
  }
78
79
 
79
80
  enum RepeatMode {
@@ -67,7 +67,12 @@ class TrackSelector {
67
67
  return .none
68
68
  }
69
69
 
70
- let event = TrackLoadEvent(track: track, queue: playback.queue, startIndex: Double(playback.index))
70
+ let event = TrackLoadEvent(
71
+ track: track,
72
+ queue: playback.queue,
73
+ startIndex: Double(playback.index),
74
+ startPosition: nil,
75
+ )
71
76
  if await browserManager.awaitTrackLoadHandler(event: event) {
72
77
  return .intercepted
73
78
  }
@@ -11,6 +11,12 @@ export interface TrackLoadEvent {
11
11
  queue: Track[];
12
12
  /** The index of the track in the queue */
13
13
  startIndex: number;
14
+ /**
15
+ * Where an Android media controller asked playback to start, in seconds: the
16
+ * player's current position when it asked to keep it, absent when it asked to
17
+ * reset or sent none.
18
+ */
19
+ startPosition?: number;
14
20
  }
15
21
  /**
16
22
  * Callback for handling track load events.
@@ -1 +1 @@
1
- {"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../../src/types/browser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../../src/types/browser.ts"],"names":[],"mappings":"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"}
@@ -62,6 +62,8 @@ namespace margelo::nitro::audiobrowser {
62
62
  jni::local_ref<jni::JArrayClass<JTrack>> queue = this->getFieldValue(fieldQueue);
63
63
  static const auto fieldStartIndex = clazz->getField<double>("startIndex");
64
64
  double startIndex = this->getFieldValue(fieldStartIndex);
65
+ static const auto fieldStartPosition = clazz->getField<jni::JDouble>("startPosition");
66
+ jni::local_ref<jni::JDouble> startPosition = this->getFieldValue(fieldStartPosition);
65
67
  return TrackLoadEvent(
66
68
  track->toCpp(),
67
69
  [&](auto&& __input) {
@@ -74,7 +76,8 @@ namespace margelo::nitro::audiobrowser {
74
76
  }
75
77
  return __vector;
76
78
  }(queue),
77
- startIndex
79
+ startIndex,
80
+ startPosition != nullptr ? std::make_optional(startPosition->value()) : std::nullopt
78
81
  );
79
82
  }
80
83
 
@@ -84,7 +87,7 @@ namespace margelo::nitro::audiobrowser {
84
87
  */
85
88
  [[maybe_unused]]
86
89
  static jni::local_ref<JTrackLoadEvent::javaobject> fromCpp(const TrackLoadEvent& value) {
87
- using JSignature = JTrackLoadEvent(jni::alias_ref<JTrack>, jni::alias_ref<jni::JArrayClass<JTrack>>, double);
90
+ using JSignature = JTrackLoadEvent(jni::alias_ref<JTrack>, jni::alias_ref<jni::JArrayClass<JTrack>>, double, jni::alias_ref<jni::JDouble>);
88
91
  static const auto clazz = javaClassStatic();
89
92
  static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
90
93
  return create(
@@ -100,7 +103,8 @@ namespace margelo::nitro::audiobrowser {
100
103
  }
101
104
  return __array;
102
105
  }(value.queue),
103
- value.startIndex
106
+ value.startIndex,
107
+ value.startPosition.has_value() ? jni::JDouble::valueOf(value.startPosition.value()) : nullptr
104
108
  );
105
109
  }
106
110
  };
@@ -26,7 +26,10 @@ data class TrackLoadEvent(
26
26
  val queue: Array<Track>,
27
27
  @DoNotStrip
28
28
  @Keep
29
- val startIndex: Double
29
+ val startIndex: Double,
30
+ @DoNotStrip
31
+ @Keep
32
+ val startPosition: Double?
30
33
  ) {
31
34
  /* primary constructor */
32
35
 
@@ -36,13 +39,15 @@ data class TrackLoadEvent(
36
39
  return Objects.deepEquals(this.track, other.track)
37
40
  && Objects.deepEquals(this.queue, other.queue)
38
41
  && Objects.deepEquals(this.startIndex, other.startIndex)
42
+ && Objects.deepEquals(this.startPosition, other.startPosition)
39
43
  }
40
44
 
41
45
  override fun hashCode(): Int {
42
46
  return arrayOf<Any?>(
43
47
  track,
44
48
  queue,
45
- startIndex
49
+ startIndex,
50
+ startPosition
46
51
  ).contentDeepHashCode()
47
52
  }
48
53
 
@@ -54,8 +59,8 @@ data class TrackLoadEvent(
54
59
  @Keep
55
60
  @Suppress("unused")
56
61
  @JvmStatic
57
- private fun fromCpp(track: Track, queue: Array<Track>, startIndex: Double): TrackLoadEvent {
58
- return TrackLoadEvent(track, queue, startIndex)
62
+ private fun fromCpp(track: Track, queue: Array<Track>, startIndex: Double, startPosition: Double?): TrackLoadEvent {
63
+ return TrackLoadEvent(track, queue, startIndex, startPosition)
59
64
  }
60
65
  }
61
66
  }
@@ -18,14 +18,20 @@ public extension TrackLoadEvent {
18
18
  /**
19
19
  * Create a new instance of `TrackLoadEvent`.
20
20
  */
21
- init(track: Track, queue: [Track], startIndex: Double) {
21
+ init(track: Track, queue: [Track], startIndex: Double, startPosition: Double?) {
22
22
  self.init(track, { () -> bridge.std__vector_Track_ in
23
23
  var __vector = bridge.create_std__vector_Track_(queue.count)
24
24
  for __item in queue {
25
25
  __vector.push_back(__item)
26
26
  }
27
27
  return __vector
28
- }(), startIndex)
28
+ }(), startIndex, { () -> bridge.std__optional_double_ in
29
+ if let __unwrappedValue = startPosition {
30
+ return bridge.create_std__optional_double_(__unwrappedValue)
31
+ } else {
32
+ return .init()
33
+ }
34
+ }())
29
35
  }
30
36
 
31
37
  @inline(__always)
@@ -42,4 +48,16 @@ public extension TrackLoadEvent {
42
48
  var startIndex: Double {
43
49
  return self.__startIndex
44
50
  }
51
+
52
+ @inline(__always)
53
+ var startPosition: Double? {
54
+ return { () -> Double? in
55
+ if bridge.has_value_std__optional_double_(self.__startPosition) {
56
+ let __unwrapped = bridge.get_std__optional_double_(self.__startPosition)
57
+ return __unwrapped
58
+ } else {
59
+ return nil
60
+ }
61
+ }()
62
+ }
45
63
  }
@@ -33,6 +33,7 @@ namespace margelo::nitro::audiobrowser { struct Track; }
33
33
 
34
34
  #include "Track.hpp"
35
35
  #include <vector>
36
+ #include <optional>
36
37
 
37
38
  namespace margelo::nitro::audiobrowser {
38
39
 
@@ -44,10 +45,11 @@ namespace margelo::nitro::audiobrowser {
44
45
  Track track SWIFT_PRIVATE;
45
46
  std::vector<Track> queue SWIFT_PRIVATE;
46
47
  double startIndex SWIFT_PRIVATE;
48
+ std::optional<double> startPosition SWIFT_PRIVATE;
47
49
 
48
50
  public:
49
51
  TrackLoadEvent() = default;
50
- explicit TrackLoadEvent(Track track, std::vector<Track> queue, double startIndex): track(track), queue(queue), startIndex(startIndex) {}
52
+ explicit TrackLoadEvent(Track track, std::vector<Track> queue, double startIndex, std::optional<double> startPosition): track(track), queue(queue), startIndex(startIndex), startPosition(startPosition) {}
51
53
 
52
54
  public:
53
55
  friend bool operator==(const TrackLoadEvent& lhs, const TrackLoadEvent& rhs) = default;
@@ -65,7 +67,8 @@ namespace margelo::nitro {
65
67
  return margelo::nitro::audiobrowser::TrackLoadEvent(
66
68
  JSIConverter<margelo::nitro::audiobrowser::Track>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "track"))),
67
69
  JSIConverter<std::vector<margelo::nitro::audiobrowser::Track>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "queue"))),
68
- JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "startIndex")))
70
+ JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "startIndex"))),
71
+ JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "startPosition")))
69
72
  );
70
73
  }
71
74
  static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::TrackLoadEvent& arg) {
@@ -73,6 +76,7 @@ namespace margelo::nitro {
73
76
  obj.setProperty(runtime, PropNameIDCache::get(runtime, "track"), JSIConverter<margelo::nitro::audiobrowser::Track>::toJSI(runtime, arg.track));
74
77
  obj.setProperty(runtime, PropNameIDCache::get(runtime, "queue"), JSIConverter<std::vector<margelo::nitro::audiobrowser::Track>>::toJSI(runtime, arg.queue));
75
78
  obj.setProperty(runtime, PropNameIDCache::get(runtime, "startIndex"), JSIConverter<double>::toJSI(runtime, arg.startIndex));
79
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "startPosition"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.startPosition));
76
80
  return obj;
77
81
  }
78
82
  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -86,6 +90,7 @@ namespace margelo::nitro {
86
90
  if (!JSIConverter<margelo::nitro::audiobrowser::Track>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "track")))) return false;
87
91
  if (!JSIConverter<std::vector<margelo::nitro::audiobrowser::Track>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "queue")))) return false;
88
92
  if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "startIndex")))) return false;
93
+ if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "startPosition")))) return false;
89
94
  return true;
90
95
  }
91
96
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-audio-browser",
3
- "version": "0.2.0-next.90",
3
+ "version": "0.2.0-next.92",
4
4
  "description": "react-native-audio-browser is a react native package built with Nitro",
5
5
  "keywords": [
6
6
  "react-native",
@@ -70,6 +70,7 @@
70
70
  "ios:test": "swift test --disable-sandbox",
71
71
  "lint": "oxlint --fix",
72
72
  "release": "semantic-release",
73
+ "stream-cases": "node scripts/stream-cases/index.ts",
73
74
  "stream-server": "node scripts/stream-server/index.ts",
74
75
  "test": "vitest run",
75
76
  "types": "tsc --noEmit",
@@ -12,6 +12,12 @@ export interface TrackLoadEvent {
12
12
  queue: Track[]
13
13
  /** The index of the track in the queue */
14
14
  startIndex: number
15
+ /**
16
+ * Where an Android media controller asked playback to start, in seconds: the
17
+ * player's current position when it asked to keep it, absent when it asked to
18
+ * reset or sent none.
19
+ */
20
+ startPosition?: number
15
21
  }
16
22
 
17
23
  /**
@@ -114,6 +114,25 @@ Kotlin), in its control filters. Only the
114
114
  selection is reported: the library keeps playing locally, and rendering the
115
115
  audio on the speaker is the provider's job.
116
116
 
117
+ `RemoteOutputs.routeDescriptorBuilder(id, name)` starts a route's descriptor
118
+ in the category and visible only to the app, from Android 14. Another app on the
119
+ library would otherwise list the route too, and report it as its output while
120
+ its own playback stays on the phone:
121
+
122
+ ```kotlin
123
+ val speaker =
124
+ RemoteOutputs.routeDescriptorBuilder("kitchen", "Kitchen")
125
+ .setPlaybackType(MediaRouter.RouteInfo.PLAYBACK_TYPE_REMOTE)
126
+ .setDeviceType(MediaRouter.RouteInfo.DEVICE_TYPE_SPEAKER)
127
+ .setEnabled(true)
128
+ .build()
129
+ ```
130
+
131
+ Before Android 14 every app lists the route regardless. A provider that serves
132
+ only its own app returns `null` from `onCreateRouteController(routeId, options)`
133
+ when `options.clientPackageName` is another package, as the library's Sonos
134
+ provider does: the other app's switch then fails.
135
+
117
136
  ### Google Cast (Android)
118
137
 
119
138
  With `remoteOutputs: { cast: true }`, selecting a Cast device in the switcher
@@ -291,8 +310,14 @@ Cast and Sonos play the queue the same way:
291
310
  Playing again loads the item there anew.
292
311
 
293
312
  The library's Sonos route provider service is exported, as the Output Switcher
294
- needs to bind it: another app on the phone can bind it too, list the rooms,
295
- select one and set its volume, as through any media route provider.
313
+ needs to bind it: another app on the phone can bind it too and list the rooms,
314
+ but the provider serves only the app's own sessions, so another app can't
315
+ select a room. Only an app that bypasses Android's hidden-API restrictions can
316
+ still set the volume of a room the app plays to.
317
+
318
+ When a Sonos room that another app's provider serves is selected, the library
319
+ unselects it: the output stays the phone, and the switcher stops offering
320
+ **Stop casting** for it.
296
321
 
297
322
  ## Opening the output picker
298
323
 
@@ -447,14 +447,14 @@ Tapping a row that's already in the current queue from the same page skips in pl
447
447
  import { configureBrowser, setQueue, play } from 'react-native-audio-browser'
448
448
 
449
449
  configureBrowser({
450
- handleTrackLoad: async ({ track, queue, startIndex }) => {
450
+ handleTrackLoad: async ({ track, queue, startIndex, startPosition }) => {
451
451
  if (isVideo(track)) {
452
452
  // your surface — return without touching the player; audio stays put
453
453
  openVideoPlayer(track)
454
454
  return
455
455
  }
456
456
  // audio: drive playback yourself — the library won't auto-play
457
- setQueue(queue, startIndex)
457
+ setQueue(queue, startIndex, startPosition)
458
458
  play()
459
459
  }
460
460
  })