react-native-audio-browser 1.0.0-next.4 → 1.0.0-next.6

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 (239) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +41 -6
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
  5. package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
  6. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  7. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  8. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
  9. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
  10. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  12. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
  15. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
  16. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  17. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  18. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  19. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  20. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  21. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  22. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  23. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  24. package/android/src/main/res/values/strings.xml +5 -2
  25. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  26. package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
  27. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  28. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  30. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  31. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  32. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
  33. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
  34. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  35. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  36. package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
  37. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  38. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
  39. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
  40. package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
  41. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  42. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
  43. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
  44. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  45. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  46. package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
  47. package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
  48. package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
  49. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  50. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  51. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  52. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  53. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
  54. package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
  55. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  56. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  57. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  58. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  59. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  60. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  61. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  62. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  63. package/ios/AVPlayerEngine.swift +2 -2
  64. package/ios/Browser/BrowserPathHelper.swift +11 -9
  65. package/ios/Browser/PageResolver.swift +1 -1
  66. package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
  67. package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
  68. package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
  69. package/ios/CarPlay/SectionPresentation.swift +7 -0
  70. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  71. package/ios/HybridAudioBrowser+Player.swift +3 -2
  72. package/ios/HybridAudioBrowser.swift +1 -1
  73. package/ios/Model/NitroTypeStubs.swift +15 -0
  74. package/ios/Model/PlayerUpdateOptions.swift +2 -1
  75. package/ios/PlaybackEvent.swift +20 -0
  76. package/ios/Player/Player.swift +17 -3
  77. package/ios/Player/QueueManager.swift +23 -41
  78. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  79. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  80. package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
  81. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  82. package/ios/Tests/GenerationMemoTests.swift +136 -0
  83. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  84. package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
  85. package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
  86. package/ios/Tests/PlayerPolicyTests.swift +51 -28
  87. package/ios/Tests/PlayerProgressTests.swift +0 -2
  88. package/ios/Tests/PlayerTests.swift +54 -0
  89. package/ios/Tests/QueueManagerTests.swift +111 -78
  90. package/ios/Tests/RequestLayerTests.swift +11 -0
  91. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  92. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  93. package/ios/Tests/SectionPresentationTests.swift +13 -0
  94. package/ios/Tests/Support/TestTypes.swift +23 -1
  95. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  96. package/ios/Util/AwaitCallback.swift +16 -10
  97. package/ios/Util/GenerationMemo.swift +81 -17
  98. package/ios/Util/JSCallbackError.swift +23 -0
  99. package/ios/Util/OutputPicker.swift +25 -5
  100. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  101. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  102. package/lib/commonjs/features/browser-config.js +3 -2
  103. package/lib/commonjs/features/browser-config.js.map +1 -1
  104. package/lib/commonjs/features/browser.js +7 -8
  105. package/lib/commonjs/features/browser.js.map +1 -1
  106. package/lib/commonjs/features/output.js +7 -3
  107. package/lib/commonjs/features/output.js.map +1 -1
  108. package/lib/commonjs/features/player/options.js.map +1 -1
  109. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  110. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  111. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  112. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  114. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  115. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  116. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  117. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  118. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  119. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  120. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  121. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  122. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  123. package/lib/module/features/browser-config.js +3 -2
  124. package/lib/module/features/browser-config.js.map +1 -1
  125. package/lib/module/features/browser.js +7 -8
  126. package/lib/module/features/browser.js.map +1 -1
  127. package/lib/module/features/output.js +7 -3
  128. package/lib/module/features/output.js.map +1 -1
  129. package/lib/module/features/player/options.js.map +1 -1
  130. package/lib/module/web/NativeAudioBrowser.js +43 -2
  131. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  132. package/lib/module/web/browser/BrowserManager.js +37 -66
  133. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  134. package/lib/module/web/browser/SearchManager.js +1 -5
  135. package/lib/module/web/browser/SearchManager.js.map +1 -1
  136. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  137. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  138. package/lib/module/web/player/NowPlayingManager.js +3 -22
  139. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  140. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  141. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  142. package/lib/module/web/util/GenerationMemo.js +87 -0
  143. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  144. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  145. package/lib/typescript/src/features/browser.d.ts +7 -8
  146. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  147. package/lib/typescript/src/features/output.d.ts +8 -4
  148. package/lib/typescript/src/features/output.d.ts.map +1 -1
  149. package/lib/typescript/src/features/player/options.d.ts +19 -1
  150. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  151. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  152. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  153. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  154. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  155. package/lib/typescript/src/types/browser.d.ts +55 -8
  156. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  157. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  158. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  159. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  160. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  161. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  162. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  163. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  164. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  165. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  166. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  167. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  168. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
  169. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  170. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  171. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  172. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  173. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  174. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  175. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
  176. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  177. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  178. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  179. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  180. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  181. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  182. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  183. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
  184. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  185. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  186. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  187. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
  188. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  189. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  190. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  191. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
  192. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  193. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  194. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  195. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  196. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  197. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  198. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  199. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  200. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  201. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  202. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  203. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  204. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
  205. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  206. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  207. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  208. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  209. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
  210. package/package.json +1 -1
  211. package/src/codegen-js-error-message.test.ts +78 -0
  212. package/src/features/browser-config.test.ts +7 -0
  213. package/src/features/browser-config.ts +3 -2
  214. package/src/features/browser.ts +7 -8
  215. package/src/features/output.ts +13 -5
  216. package/src/features/player/options.ts +19 -1
  217. package/src/specs/audio-browser.nitro.ts +16 -3
  218. package/src/types/browser-native.ts +4 -1
  219. package/src/types/browser.ts +60 -8
  220. package/src/web/NativeAudioBrowser.ts +43 -3
  221. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  222. package/src/web/browser/BrowserManager.ts +50 -79
  223. package/src/web/browser/SearchManager.ts +1 -8
  224. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  225. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  226. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  227. package/src/web/http/RequestConfigBuilder.ts +72 -57
  228. package/src/web/player/NowPlayingManager.test.ts +29 -0
  229. package/src/web/player/NowPlayingManager.ts +4 -27
  230. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  231. package/src/web/util/BrowserPathHelper.ts +6 -7
  232. package/src/web/util/GenerationMemo.test.ts +148 -0
  233. package/src/web/util/GenerationMemo.ts +103 -0
  234. package/website/guide/audio-output.md +34 -7
  235. package/website/guide/browser.md +21 -0
  236. package/website/guide/carplay.md +1 -1
  237. package/website/guide/configuration.md +10 -9
  238. package/website/guide/gate.md +1 -1
  239. package/website/guide/remote-controls.md +35 -0
@@ -196,10 +196,23 @@ internal class InterceptingPlayer(
196
196
  super.seekBack()
197
197
  }
198
198
 
199
- override fun seekTo(mediaItemIndex: Int, positionMs: Long) =
199
+ // The session withholds the command from controllers while the capability is off; this refuses
200
+ // one that arrives anyway. The app's own skips go to the wrapped player, not through here.
201
+ private fun refusesQueueItem(mediaItemIndex: Int): Boolean =
202
+ mediaItemIndex != currentMediaItemIndex &&
203
+ !optionsProvider().capabilities.isEnabled(Capability.SKIP_TO_QUEUE_ITEM)
204
+
205
+ override fun seekToDefaultPosition(mediaItemIndex: Int) {
206
+ if (refusesQueueItem(mediaItemIndex)) return
207
+ super.seekToDefaultPosition(mediaItemIndex)
208
+ }
209
+
210
+ override fun seekTo(mediaItemIndex: Int, positionMs: Long) {
211
+ if (refusesQueueItem(mediaItemIndex)) return
200
212
  intercept({ it.handleRemoteSeek(RemoteSeekEvent(position = positionMs.toDouble() / 1000.0)) }) {
201
213
  super.seekTo(mediaItemIndex, positionMs)
202
214
  }
215
+ }
203
216
 
204
217
  override fun seekTo(positionMs: Long) =
205
218
  intercept({ it.handleRemoteSeek(RemoteSeekEvent(position = positionMs.toDouble() / 1000.0)) }) {
@@ -1,6 +1,7 @@
1
1
  package com.audiobrowser.player
2
2
 
3
3
  import android.os.Bundle
4
+ import androidx.annotation.StringRes
4
5
  import androidx.core.content.ContextCompat
5
6
  import androidx.media3.common.C
6
7
  import androidx.media3.common.MediaItem
@@ -18,6 +19,7 @@ import com.audiobrowser.browser.handleTrackLoad
18
19
  import com.audiobrowser.browser.normalizedSections
19
20
  import com.audiobrowser.browser.styleResolvedSections
20
21
  import com.audiobrowser.browser.untitledSection
22
+ import com.audiobrowser.defaultFormattedError
21
23
  import com.audiobrowser.extension.indexOfTappedTrack
22
24
  import com.audiobrowser.extension.toTrack
23
25
  import com.audiobrowser.navigationErrorFor
@@ -31,6 +33,7 @@ import com.google.common.collect.ImmutableList
31
33
  import com.google.common.util.concurrent.FutureCallback
32
34
  import com.google.common.util.concurrent.Futures
33
35
  import com.google.common.util.concurrent.ListenableFuture
36
+ import com.google.common.util.concurrent.MoreExecutors
34
37
  import com.margelo.nitro.audiobrowser.FormattedNavigationError
35
38
  import com.margelo.nitro.audiobrowser.Gate
36
39
  import com.margelo.nitro.audiobrowser.GateEvent
@@ -42,11 +45,13 @@ import com.margelo.nitro.audiobrowser.PlayerCapabilities
42
45
  import com.margelo.nitro.audiobrowser.RemoteButtonLayout
43
46
  import com.margelo.nitro.audiobrowser.Section
44
47
  import com.margelo.nitro.audiobrowser.Track
48
+ import java.util.concurrent.Future
49
+ import java.util.concurrent.TimeoutException
50
+ import java.util.concurrent.atomic.AtomicReference
45
51
  import kotlinx.coroutines.CancellationException
46
52
  import kotlinx.coroutines.CoroutineScope
47
53
  import kotlinx.coroutines.Dispatchers
48
54
  import kotlinx.coroutines.SupervisorJob
49
- import kotlinx.coroutines.TimeoutCancellationException
50
55
  import kotlinx.coroutines.cancel
51
56
  import kotlinx.coroutines.guava.future
52
57
  import kotlinx.coroutines.launch
@@ -243,11 +248,19 @@ class MediaSessionCallback(private val player: Player) :
243
248
  "onGetChildren: {parentId: $parentId, page: $page, pageSize: $pageSize, isSpecialPath: ${BrowserPathHelper.isSpecialPath(parentId)} }"
244
249
  )
245
250
  return scope.future {
246
- children(session, browser, parentId, page, pageSize, params).also {
247
- if (parentId == BrowserPathHelper.ROOT_PATH && page == 0) {
248
- rootTile = deadEndTileOf(it.value.orEmpty())
251
+ try {
252
+ children(session, browser, parentId, page, pageSize, params)
253
+ } catch (e: Exception) {
254
+ if (e is CancellationException) throw e
255
+ Timber.e(e, "Browse of $parentId failed before it could be served")
256
+ sendBrowseError(session, browser, offline = false)
257
+ LibraryResult.ofItemList(ImmutableList.of(unservedBrowseErrorItem(e)), params)
258
+ }
259
+ .also {
260
+ if (parentId == BrowserPathHelper.ROOT_PATH && page == 0) {
261
+ rootTile = deadEndTileOf(it.value.orEmpty())
262
+ }
249
263
  }
250
- }
251
264
  }
252
265
  }
253
266
 
@@ -343,8 +356,8 @@ class MediaSessionCallback(private val player: Player) :
343
356
 
344
357
  LibraryResult.ofItemList(ImmutableList.copyOf(children.paginate(page, pageSize)), params)
345
358
  } catch (e: Exception) {
346
- // A cancelled browse (the controller left) is not a failure; awaitBrowser's timeout is.
347
- if (e is CancellationException && e !is TimeoutCancellationException) throw e
359
+ // A cancelled browse (the controller left) is not a failure.
360
+ if (e is CancellationException) throw e
348
361
  Timber.e(e, "Error getting children for parentId: $parentId")
349
362
  // A tile, not ofError(): see createErrorMediaItem and
350
363
  // https://github.com/androidx/media/issues/2901
@@ -363,22 +376,32 @@ class MediaSessionCallback(private val player: Player) :
363
376
  /**
364
377
  * Sends [browser] a non-fatal [SessionError] alongside the error tile. Current Android Auto
365
378
  * renders nothing for it (https://github.com/androidx/media/issues/2901); it is the correct
366
- * Media3 signal and shows if Android Auto starts reading it. Dispatched to Main: the session and
367
- * its legacy stub are application-thread bound.
379
+ * Media3 signal and shows if Android Auto starts reading it.
368
380
  */
369
- @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
370
381
  private fun sendBrowseError(
371
382
  session: MediaLibraryService.MediaLibrarySession,
372
383
  browser: MediaSession.ControllerInfo,
373
384
  offline: Boolean,
374
385
  ) {
375
- val message =
376
- player.context.getString(
377
- if (offline) com.audiobrowser.R.string.audio_browser_offline_error
378
- else com.audiobrowser.R.string.audio_browser_browse_error
379
- )
380
- val code = if (offline) SessionError.ERROR_IO else SessionError.ERROR_UNKNOWN
381
- scope.launch(Dispatchers.Main) { session.sendError(browser, SessionError(code, message)) }
386
+ val (code, message) =
387
+ if (offline) {
388
+ SessionError.ERROR_IO to com.audiobrowser.R.string.audio_browser_offline_error
389
+ } else {
390
+ SessionError.ERROR_UNKNOWN to com.audiobrowser.R.string.audio_browser_browse_error
391
+ }
392
+ sendSessionError(session, browser, code, message)
393
+ }
394
+
395
+ /** Dispatched to Main: the session and its legacy stub are application-thread bound. */
396
+ @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
397
+ private fun sendSessionError(
398
+ session: MediaSession,
399
+ controller: MediaSession.ControllerInfo,
400
+ code: Int,
401
+ @StringRes message: Int,
402
+ ) {
403
+ val text = player.context.getString(message)
404
+ scope.launch(Dispatchers.Main) { session.sendError(controller, SessionError(code, text)) }
382
405
  }
383
406
 
384
407
  /**
@@ -420,97 +443,111 @@ class MediaSessionCallback(private val player: Player) :
420
443
  ): ListenableFuture<LibraryResult<MediaItem>> {
421
444
  Timber.Forest.d("onGetItem: ${browser.packageName}, mediaId = $mediaId")
422
445
  return scope.future {
423
- if (mediaId == BrowserPathHelper.ROOT_PATH) {
424
- return@future LibraryResult.ofItem(
425
- MediaItem.Builder()
426
- .setMediaId(mediaId)
427
- .setMediaMetadata(
428
- MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
429
- )
430
- .build(),
431
- null,
432
- )
446
+ try {
447
+ item(mediaId)
448
+ } catch (e: Exception) {
449
+ if (e is CancellationException) throw e
450
+ // No SessionError, as for a failed resolve below: controllers look items up with no user
451
+ // action behind it.
452
+ Timber.e(e, "Item lookup of $mediaId failed before it could be served")
453
+ LibraryResult.ofError(SessionError.ERROR_UNKNOWN)
433
454
  }
455
+ }
456
+ }
434
457
 
435
- if (mediaId == BrowserPathHelper.OFFLINE_PATH) {
436
- return@future LibraryResult.ofItem(
437
- createOfflineMediaItem(
438
- player
439
- .awaitBrowser()
440
- .resolveFormattedError(offlineError(), BrowserPathHelper.OFFLINE_PATH)
441
- ),
442
- null,
443
- )
444
- }
458
+ private suspend fun item(mediaId: String): LibraryResult<MediaItem> {
459
+ if (mediaId == BrowserPathHelper.ROOT_PATH) {
460
+ return LibraryResult.ofItem(
461
+ MediaItem.Builder()
462
+ .setMediaId(mediaId)
463
+ .setMediaMetadata(
464
+ MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
465
+ )
466
+ .build(),
467
+ null,
468
+ )
469
+ }
445
470
 
446
- if (mediaId == BrowserPathHelper.ERROR_PATH) {
447
- return@future LibraryResult.ofItem(
448
- createBrowseErrorMediaItem(
449
- player
450
- .awaitBrowser()
451
- .resolveFormattedError(browseFailureError(), BrowserPathHelper.ERROR_PATH)
452
- ),
453
- null,
454
- )
455
- }
471
+ if (mediaId == BrowserPathHelper.OFFLINE_PATH) {
472
+ return LibraryResult.ofItem(
473
+ createOfflineMediaItem(
474
+ player
475
+ .awaitBrowser()
476
+ .resolveFormattedError(offlineError(), BrowserPathHelper.OFFLINE_PATH)
477
+ ),
478
+ null,
479
+ )
480
+ }
456
481
 
457
- if (mediaId == BrowserPathHelper.EMPTY_PATH) {
458
- return@future LibraryResult.ofItem(
459
- createEmptyMediaItem(
460
- player
461
- .awaitBrowser()
462
- .resolveFormattedError(emptyContentError(), BrowserPathHelper.EMPTY_PATH)
463
- ),
464
- null,
465
- )
466
- }
482
+ if (mediaId == BrowserPathHelper.ERROR_PATH) {
483
+ return LibraryResult.ofItem(
484
+ createBrowseErrorMediaItem(
485
+ player
486
+ .awaitBrowser()
487
+ .resolveFormattedError(browseFailureError(), BrowserPathHelper.ERROR_PATH)
488
+ ),
489
+ null,
490
+ )
491
+ }
467
492
 
468
- // No onGate: it fires where a browse or search is served, not on an item lookup.
469
- if (mediaId == BrowserPathHelper.GATE_PATH) {
470
- val outcome =
493
+ if (mediaId == BrowserPathHelper.EMPTY_PATH) {
494
+ return LibraryResult.ofItem(
495
+ createEmptyMediaItem(
471
496
  player
472
497
  .awaitBrowser()
473
- .gateDecision(
474
- NativeGateRequest(
475
- reason = GateReason.BROWSE,
476
- path = BrowserPathHelper.GATE_PATH,
477
- search = null,
478
- )
498
+ .resolveFormattedError(emptyContentError(), BrowserPathHelper.EMPTY_PATH)
499
+ ),
500
+ null,
501
+ )
502
+ }
503
+
504
+ // No onGate: it fires where a browse or search is served, not on an item lookup.
505
+ if (mediaId == BrowserPathHelper.GATE_PATH) {
506
+ val outcome =
507
+ player
508
+ .awaitBrowser()
509
+ .gateDecision(
510
+ NativeGateRequest(
511
+ reason = GateReason.BROWSE,
512
+ path = BrowserPathHelper.GATE_PATH,
513
+ search = null,
479
514
  )
480
- if (!outcome.gated) return@future LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
481
- return@future LibraryResult.ofItem(createGateMediaItem(outcome.chrome!!), null)
482
- }
515
+ )
516
+ if (!outcome.gated) return LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
517
+ return LibraryResult.ofItem(createGateMediaItem(outcome.chrome!!), null)
518
+ }
483
519
 
484
- val browserManager = player.awaitBrowser().browserManager
520
+ val browserManager = player.awaitBrowser().browserManager
485
521
 
486
- // Cache first: resolve() strips __trackId from a contextual mediaId and would answer with the
487
- // parent container's metadata.
488
- val browseAuthority =
489
- com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
490
- browserManager.getCachedTrack(mediaId)?.let { track ->
491
- return@future LibraryResult.ofItem(
492
- TrackFactory.toBrowseMediaItem(track, player.browseArtworkRegistry, browseAuthority),
493
- null,
494
- )
495
- }
522
+ // Cache first: resolve() strips __trackId from a contextual mediaId and would answer with the
523
+ // parent container's metadata.
524
+ val browseAuthority = com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
525
+ val track = browserManager.trackFor(mediaId)
526
+ if (track != null) {
527
+ return LibraryResult.ofItem(
528
+ TrackFactory.toBrowseMediaItem(track, player.browseArtworkRegistry, browseAuthority),
529
+ null,
530
+ )
531
+ }
532
+ if (browserManager.answersOnlyByFindTrack(mediaId))
533
+ return LibraryResult.ofError(SessionError.ERROR_BAD_VALUE)
496
534
 
497
- try {
498
- val resolvedTrack = browserManager.resolve(mediaId)
499
- // The same conversion as the cached path, so the item's tag is a Track, as fromMedia3
500
- // expects.
501
- LibraryResult.ofItem(
502
- TrackFactory.toBrowseMediaItem(
503
- resolvedTrack.toTrack(),
504
- player.browseArtworkRegistry,
505
- browseAuthority,
506
- ),
507
- null,
508
- )
509
- } catch (e: Exception) {
510
- if (e is CancellationException && e !is TimeoutCancellationException) throw e
511
- Timber.e(e, "Error getting item for mediaId: $mediaId")
512
- LibraryResult.ofError(SessionError.ERROR_UNKNOWN)
513
- }
535
+ return try {
536
+ val resolvedTrack = browserManager.resolve(mediaId)
537
+ // The same conversion as the cached path, so the item's tag is a Track, as fromMedia3
538
+ // expects.
539
+ LibraryResult.ofItem(
540
+ TrackFactory.toBrowseMediaItem(
541
+ resolvedTrack.toTrack(),
542
+ player.browseArtworkRegistry,
543
+ browseAuthority,
544
+ ),
545
+ null,
546
+ )
547
+ } catch (e: Exception) {
548
+ if (e is CancellationException) throw e
549
+ Timber.e(e, "Error getting item for mediaId: $mediaId")
550
+ LibraryResult.ofError(SessionError.ERROR_UNKNOWN)
514
551
  }
515
552
  }
516
553
 
@@ -592,7 +629,7 @@ class MediaSessionCallback(private val player: Player) :
592
629
  val audioBrowser =
593
630
  try {
594
631
  player.awaitBrowser()
595
- } catch (e: TimeoutCancellationException) {
632
+ } catch (e: TimeoutException) {
596
633
  Timber.w("Timed out waiting for browser - search not available")
597
634
  return@future LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED)
598
635
  }
@@ -657,7 +694,7 @@ class MediaSessionCallback(private val player: Player) :
657
694
 
658
695
  session.notifySearchResultChanged(browser, query, resultCount, params)
659
696
  } catch (e: Exception) {
660
- if (e is CancellationException && e !is TimeoutCancellationException) throw e
697
+ if (e is CancellationException) throw e
661
698
  Timber.e(e, "Error during search for query: $query")
662
699
  // Announces the browse-error tile: an ofError renders as nothing, and without the slot the
663
700
  // failure reads as "no results" by the time onGetSearchResult arrives.
@@ -677,7 +714,7 @@ class MediaSessionCallback(private val player: Player) :
677
714
  val browserManager =
678
715
  try {
679
716
  player.awaitBrowser().browserManager
680
- } catch (e: TimeoutCancellationException) {
717
+ } catch (e: TimeoutException) {
681
718
  Timber.w("Timed out waiting for browser - offline searches not re-announced")
682
719
  return
683
720
  }
@@ -703,7 +740,7 @@ class MediaSessionCallback(private val player: Player) :
703
740
  val audioBrowser =
704
741
  try {
705
742
  player.awaitBrowser()
706
- } catch (e: TimeoutCancellationException) {
743
+ } catch (e: TimeoutException) {
707
744
  Timber.w("Timed out waiting for browser - search not available")
708
745
  return@future LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED)
709
746
  }
@@ -776,7 +813,7 @@ class MediaSessionCallback(private val player: Player) :
776
813
  Timber.d("Returning ${paginatedItems.size} search results")
777
814
  LibraryResult.ofItemList(ImmutableList.copyOf(paginatedItems), params)
778
815
  } catch (e: Exception) {
779
- if (e is CancellationException && e !is TimeoutCancellationException) throw e
816
+ if (e is CancellationException) throw e
780
817
  Timber.e(e, "Error getting search results for query: $query")
781
818
  LibraryResult.ofError(SessionError.ERROR_UNKNOWN)
782
819
  }
@@ -800,9 +837,25 @@ class MediaSessionCallback(private val player: Player) :
800
837
  )
801
838
  }
802
839
 
803
- val startPosition = startPositionMs.takeIf { it != C.TIME_UNSET }?.let { it / 1000.0 }
840
+ return setMediaItems(mediaItems, startIndex, startPositionMs, player.playGeneration).also {
841
+ request ->
842
+ // Media3 does not queue play requests: an earlier one still finding its track would replace
843
+ // this one when it lands. A consumer's handleTrackLoad already running for it is not undone.
844
+ latestPlayRequest.getAndSet(request)?.cancel(true)
845
+ reportFailure(request, mediaSession, controller, mediaItems)
846
+ }
847
+ }
804
848
 
805
- return scope.future {
849
+ private val latestPlayRequest = AtomicReference<Future<*>?>(null)
850
+
851
+ private fun setMediaItems(
852
+ mediaItems: List<MediaItem>,
853
+ startIndex: Int,
854
+ startPositionMs: Long,
855
+ playGenerationAtRequest: Int,
856
+ ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> =
857
+ scope.future {
858
+ val startPosition = startPositionMs.takeIf { it != C.TIME_UNSET }?.let { it / 1000.0 }
806
859
  val audioBrowser = player.awaitBrowser()
807
860
 
808
861
  // Media3 sets whatever this returns: the controller's position would undo the handler's seek.
@@ -858,9 +911,7 @@ class MediaSessionCallback(private val player: Player) :
858
911
  val result =
859
912
  if (voiceSearch != null) {
860
913
  // A failed future leaves current playback untouched.
861
- val found =
862
- player.voiceSearch(voiceSearch)
863
- ?: throw IllegalStateException("Voice search gated or without a playable result")
914
+ val found = player.voiceSearch(voiceSearch)
864
915
  MediaSession.MediaItemsWithStartPosition(
865
916
  found.map { TrackFactory.toMedia3(it) },
866
917
  0,
@@ -875,6 +926,11 @@ class MediaSessionCallback(private val player: Player) :
875
926
  // default branch, where it means a reset.
876
927
  val handlerIndex = result.startIndex.takeIf { it != C.INDEX_UNSET } ?: 0
877
928
  val selectedTrack = tracks.getOrElse(handlerIndex) { tracks.first() }
929
+ // The app replaced what plays while this request was finding its tracks: the newer choice
930
+ // stands.
931
+ if (player.playGeneration != playGenerationAtRequest) {
932
+ throw CancellationException("Play request superseded by a queue change")
933
+ }
878
934
 
879
935
  handleTrackLoad(
880
936
  audioBrowser.configuration.handleTrackLoad,
@@ -893,6 +949,37 @@ class MediaSessionCallback(private val player: Player) :
893
949
  result
894
950
  }
895
951
  }
952
+
953
+ /** Media3 drops a failed future without a word, to the controller or the log. */
954
+ private fun reportFailure(
955
+ request: ListenableFuture<MediaSession.MediaItemsWithStartPosition>,
956
+ mediaSession: MediaSession,
957
+ controller: MediaSession.ControllerInfo,
958
+ mediaItems: List<MediaItem>,
959
+ ) {
960
+ Futures.addCallback(
961
+ request,
962
+ object : FutureCallback<MediaSession.MediaItemsWithStartPosition> {
963
+ override fun onSuccess(result: MediaSession.MediaItemsWithStartPosition) {}
964
+
965
+ override fun onFailure(t: Throwable) {
966
+ if (
967
+ t is CancellationException ||
968
+ t is RequestGatedException ||
969
+ t is VoiceSearchFailedException
970
+ )
971
+ return
972
+ Timber.e(t, "Play request failed: ${mediaItems.map { it.mediaId }}")
973
+ sendSessionError(
974
+ mediaSession,
975
+ controller,
976
+ SessionError.ERROR_UNKNOWN,
977
+ com.audiobrowser.R.string.audio_browser_play_error,
978
+ )
979
+ }
980
+ },
981
+ MoreExecutors.directExecutor(),
982
+ )
896
983
  }
897
984
 
898
985
  /**
@@ -1081,6 +1168,13 @@ internal fun emptyContentError(): NavigationError =
1081
1168
  internal fun offlineError(): NavigationError =
1082
1169
  NavigationError(NavigationErrorType.NETWORK_ERROR, "", null, null)
1083
1170
 
1171
+ /**
1172
+ * The browse-error tile for [e], a failure before the browse could be served, in the built-in copy:
1173
+ * the app's formatter needs the browser, which may never have registered.
1174
+ */
1175
+ internal fun unservedBrowseErrorItem(e: Exception): MediaItem =
1176
+ createBrowseErrorMediaItem(defaultFormattedError(navigationErrorFor(e)))
1177
+
1084
1178
  /** What a re-read of the browse-error tile formats under: its exception is gone. */
1085
1179
  internal fun browseFailureError(): NavigationError =
1086
1180
  NavigationError(NavigationErrorType.UNKNOWN_ERROR, "", null, null)
@@ -94,6 +94,7 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
94
94
  seekTo = null,
95
95
  skipToNext = null,
96
96
  skipToPrevious = null,
97
+ skipToQueueItem = null,
97
98
  jumpForward = null,
98
99
  jumpBackward = null,
99
100
  favorite = null,
@@ -124,6 +125,7 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
124
125
  MediaPlayer.COMMAND_SEEK_TO_PREVIOUS,
125
126
  MediaPlayer.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM,
126
127
  ),
128
+ Capability.SKIP_TO_QUEUE_ITEM to listOf(MediaPlayer.COMMAND_SEEK_TO_MEDIA_ITEM),
127
129
  Capability.JUMP_FORWARD to listOf(MediaPlayer.COMMAND_SEEK_FORWARD),
128
130
  Capability.JUMP_BACKWARD to listOf(MediaPlayer.COMMAND_SEEK_BACK),
129
131
  )
@@ -51,8 +51,9 @@ sealed interface PlaybackEvent {
51
51
  object PlaybackStateMachine {
52
52
 
53
53
  /** The states to set, in order, when [event] arrives in [current]; empty to keep [current]. */
54
- fun transitions(current: PlaybackState, event: PlaybackEvent): List<PlaybackState> =
55
- when (event) {
54
+ fun transitions(current: PlaybackState, event: PlaybackEvent): List<PlaybackState> {
55
+ if (current == PlaybackState.STOPPED) return fromStopped(event)
56
+ return when (event) {
56
57
  is PlaybackEvent.ExoPlaybackStateChanged ->
57
58
  when (event.exoState) {
58
59
  MediaPlayer.STATE_BUFFERING -> listOf(PlaybackState.BUFFERING)
@@ -62,40 +63,28 @@ object PlaybackStateMachine {
62
63
  // a load finished, so consumers can drop their loading indicator.
63
64
  if (event.shouldPlayWhenReady) emptyList() else listOf(PlaybackState.READY)
64
65
  MediaPlayer.STATE_IDLE ->
65
- // A terminal error, stop() and a pause during a retry all idle ExoPlayer; NONE would
66
- // clear the state the session shows.
67
- if (current in setOf(PlaybackState.ERROR, PlaybackState.STOPPED, PlaybackState.PAUSED))
68
- emptyList()
66
+ // A terminal error and a pause during a retry both idle ExoPlayer; NONE would clear
67
+ // the state the session shows.
68
+ if (current in setOf(PlaybackState.ERROR, PlaybackState.PAUSED)) emptyList()
69
69
  else listOf(PlaybackState.NONE)
70
- MediaPlayer.STATE_ENDED ->
71
- // An emptied queue also reports STATE_ENDED: nothing loaded, not played to the end.
72
- listOf(if (event.mediaItemCount > 0) PlaybackState.ENDED else PlaybackState.NONE)
70
+ MediaPlayer.STATE_ENDED -> endedOrNone(event)
73
71
  else -> emptyList()
74
72
  }
75
73
  is PlaybackEvent.MediaItemTransition ->
76
74
  when {
77
- // An emptied queue. STOPPED holds: the service clears the queue just before stop(), and
78
- // the events arrive after it.
79
- !event.hasTrack ->
80
- if (current == PlaybackState.STOPPED) emptyList() else listOf(PlaybackState.NONE)
81
- // Removing the current track after a stop, an error or a cancelled retry: play() loads
82
- // the new one. With the intent up PAUSED would read as playing; ERROR's toggle reloads.
75
+ !event.hasTrack -> listOf(PlaybackState.NONE)
76
+ // Removing the current track after an error or a cancelled retry: play() loads the new
77
+ // one. With the intent up PAUSED would read as playing; ERROR's toggle reloads.
83
78
  !event.loads ->
84
- if (current == PlaybackState.STOPPED || event.shouldPlayWhenReady) emptyList()
85
- else listOf(PlaybackState.PAUSED)
86
- // Already playing (gapless auto-advance): no IsPlayingChanged follows, so run the whole
87
- // sequence here or the state sticks on LOADING.
88
- event.isPlaying ->
89
- listOf(PlaybackState.LOADING, PlaybackState.READY, PlaybackState.PLAYING)
90
- else -> listOf(PlaybackState.LOADING)
79
+ if (event.shouldPlayWhenReady) emptyList() else listOf(PlaybackState.PAUSED)
80
+ else -> loading(event)
91
81
  }
92
82
  is PlaybackEvent.ShouldPlayWhenReadyChanged ->
93
83
  when {
94
- // stop() and a natural end both clear the intent themselves; STOPPED and ENDED must not
95
- // turn into PAUSED. A pause holds ERROR, as on iOS.
84
+ // A natural end clears the intent itself; ENDED must not turn into PAUSED. A pause holds
85
+ // ERROR, as on iOS.
96
86
  !event.shouldPlayWhenReady ->
97
- if (current in setOf(PlaybackState.STOPPED, PlaybackState.ENDED, PlaybackState.ERROR))
98
- emptyList()
87
+ if (current in setOf(PlaybackState.ENDED, PlaybackState.ERROR)) emptyList()
99
88
  else listOf(PlaybackState.PAUSED)
100
89
  // Resuming while ExoPlayer still buffers: no state change of its own follows, and the
101
90
  // READY after it is dropped while playing, so report the load now.
@@ -106,4 +95,44 @@ object PlaybackStateMachine {
106
95
  is PlaybackEvent.IsPlayingChanged ->
107
96
  if (event.isPlaying) listOf(PlaybackState.PLAYING) else emptyList()
108
97
  }
98
+ }
99
+
100
+ /**
101
+ * STOPPED leaves only for a load: a transition that loads, the engine buffering, a READY without
102
+ * the play intent, an end, or the intent rising over a buffering engine. stop() idles the engine
103
+ * and drops the intent, and the service clears the queue just before it: the events those cause
104
+ * arrive in STOPPED and hold it.
105
+ */
106
+ private fun fromStopped(event: PlaybackEvent): List<PlaybackState> =
107
+ when (event) {
108
+ is PlaybackEvent.ExoPlaybackStateChanged ->
109
+ when (event.exoState) {
110
+ MediaPlayer.STATE_BUFFERING -> listOf(PlaybackState.BUFFERING)
111
+ MediaPlayer.STATE_READY ->
112
+ if (event.shouldPlayWhenReady) emptyList() else listOf(PlaybackState.READY)
113
+ MediaPlayer.STATE_ENDED -> endedOrNone(event)
114
+ else -> emptyList()
115
+ }
116
+ // A transition nothing loads leaves the track for play() to load.
117
+ is PlaybackEvent.MediaItemTransition ->
118
+ if (event.hasTrack && event.loads) loading(event) else emptyList()
119
+ // IsPlayingChanged does not leave STOPPED, so a play over an engine that already buffers
120
+ // reports it here.
121
+ is PlaybackEvent.ShouldPlayWhenReadyChanged ->
122
+ if (event.shouldPlayWhenReady && event.exoState == MediaPlayer.STATE_BUFFERING)
123
+ listOf(PlaybackState.BUFFERING)
124
+ else emptyList()
125
+ // A play reaches PLAYING through BUFFERING.
126
+ is PlaybackEvent.IsPlayingChanged -> emptyList()
127
+ }
128
+
129
+ // An emptied queue also reports STATE_ENDED: nothing loaded, not played to the end.
130
+ private fun endedOrNone(event: PlaybackEvent.ExoPlaybackStateChanged) =
131
+ listOf(if (event.mediaItemCount > 0) PlaybackState.ENDED else PlaybackState.NONE)
132
+
133
+ // Already playing (gapless auto-advance): no IsPlayingChanged follows, so run the whole sequence
134
+ // here or the state sticks on LOADING.
135
+ private fun loading(event: PlaybackEvent.MediaItemTransition) =
136
+ if (event.isPlaying) listOf(PlaybackState.LOADING, PlaybackState.READY, PlaybackState.PLAYING)
137
+ else listOf(PlaybackState.LOADING)
109
138
  }