react-native-audio-browser 0.2.0-next.9 → 0.2.0-next.90
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/AudioBrowser.podspec +1 -1
- package/README.md +68 -39
- package/android/build.gradle +53 -14
- package/android/gradle.properties +3 -3
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +213 -0
- package/android/src/main/AndroidManifest.xml +14 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +578 -456
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +34 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +16 -2
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +126 -0
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +163 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +101 -104
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +15 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +30 -14
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +358 -541
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +36 -66
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +228 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +86 -64
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +52 -28
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +10 -18
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -11
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +18 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +11 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +25 -17
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +28 -42
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +23 -0
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +12 -13
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +32 -27
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +65 -0
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +67 -0
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +16 -19
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +113 -50
- package/android/src/main/java/com/audiobrowser/player/LiveStreamExtractor.kt +65 -0
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +49 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +75 -65
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +590 -343
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +108 -153
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +110 -116
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +62 -38
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +119 -132
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +686 -600
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +18 -28
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +171 -178
- package/android/src/main/java/com/audiobrowser/player/ReconnectPacer.kt +96 -0
- package/android/src/main/java/com/audiobrowser/player/RetryFocus.kt +126 -0
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +65 -210
- package/android/src/main/java/com/audiobrowser/player/RetryLocks.kt +52 -0
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +310 -0
- package/android/src/main/java/com/audiobrowser/player/RetryView.kt +31 -0
- package/android/src/main/java/com/audiobrowser/player/SessionViewListener.kt +168 -0
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +24 -0
- package/android/src/main/java/com/audiobrowser/player/SilenceBudget.kt +89 -0
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +53 -68
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +65 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +104 -0
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +42 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +117 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +742 -0
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +105 -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 +91 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +98 -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 +538 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +97 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +200 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +15 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +67 -0
- package/android/src/main/java/com/audiobrowser/sonos/SpeakerXml.kt +26 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +68 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +61 -0
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +70 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +62 -43
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +151 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +53 -18
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +26 -13
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +231 -77
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +39 -0
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +13 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +45 -0
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +50 -93
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +25 -24
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +10 -10
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +25 -56
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +39 -46
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -7
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +96 -83
- package/android/src/main/res/values/strings.xml +25 -5
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +16 -0
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +38 -0
- package/android/src/test/java/com/audiobrowser/AudioFixtures.kt +32 -0
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +151 -0
- package/android/src/test/java/com/audiobrowser/GateDecisionTest.kt +128 -0
- package/android/src/test/java/com/audiobrowser/LaunchSettledTest.kt +81 -0
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +90 -0
- package/android/src/test/java/com/audiobrowser/NetworkFixtures.kt +25 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +39 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +93 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +24 -4
- package/android/src/test/java/com/audiobrowser/ServiceFixtures.kt +48 -0
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +290 -0
- package/android/src/test/java/com/audiobrowser/SessionPositionUpdatesTest.kt +114 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -42
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +143 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +172 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +87 -25
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +356 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +69 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +292 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +163 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +116 -53
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +149 -0
- package/android/src/test/java/com/audiobrowser/browser/TrackLoadHandlerTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +37 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +36 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +70 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +35 -0
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +459 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +4 -14
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +87 -0
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +12 -9
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +109 -0
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +182 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +137 -0
- package/android/src/test/java/com/audiobrowser/player/LiveStreamEndTest.kt +316 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +102 -0
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingFormatterTest.kt +75 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +251 -21
- package/android/src/test/java/com/audiobrowser/player/PlayFromSearchTest.kt +108 -0
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +90 -38
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +50 -0
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerBrowserTest.kt +62 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +172 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerDestroyTest.kt +60 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +66 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerRemoteOutputsSeekTest.kt +105 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +607 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupEndedTest.kt +195 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +147 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSleepTimerTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +235 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +354 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerTrackChangeTest.kt +222 -0
- package/android/src/test/java/com/audiobrowser/player/RetryCaseTest.kt +125 -0
- package/android/src/test/java/com/audiobrowser/player/RetryFocusTest.kt +97 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +93 -200
- package/android/src/test/java/com/audiobrowser/player/RetryLocksTest.kt +48 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoopCaseTest.kt +181 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoopTest.kt +221 -0
- package/android/src/test/java/com/audiobrowser/player/RetryMaskingTest.kt +176 -0
- package/android/src/test/java/com/audiobrowser/player/SessionPlayTest.kt +212 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewListenerTest.kt +225 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewRulesTest.kt +62 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +234 -0
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +72 -0
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +149 -0
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +61 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +309 -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 +1037 -0
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +201 -0
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +89 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +70 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +134 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +169 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +176 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +690 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +129 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +167 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosStreamUriTest.kt +64 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +200 -0
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +97 -0
- package/android/src/test/java/com/audiobrowser/sonos/ZoneGroupStateTest.kt +139 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +181 -15
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +315 -8
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +298 -0
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +78 -1
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +136 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +51 -16
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/JsPromise.kt +44 -0
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +154 -0
- package/android/src/test/java/com/audiobrowser/util/NetworkConnectivityMonitorTest.kt +108 -0
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +97 -0
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -10
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +11 -13
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +91 -1
- 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 +80 -0
- package/ios/AVPlayerEngine.swift +363 -0
- package/ios/AVPlayerEngineCallbacks.swift +12 -0
- package/ios/Browser/BrowseGate.swift +70 -0
- package/ios/Browser/BrowserConfig.swift +123 -104
- package/ios/Browser/BrowserError.swift +15 -0
- package/ios/Browser/BrowserManager.swift +153 -675
- package/ios/Browser/BrowserPathHelper.swift +54 -117
- package/ios/Browser/FavoriteSet.swift +43 -0
- package/ios/Browser/InertStyleDiagnostic.swift +231 -0
- package/ios/Browser/JsonModels.swift +244 -335
- package/ios/Browser/NavigationErrorState.swift +42 -0
- package/ios/Browser/PageResolver.swift +132 -0
- package/ios/Browser/RequestLayer.swift +185 -0
- package/ios/Browser/RequestPipeline.swift +295 -0
- package/ios/Browser/SearchDrillIn.swift +10 -16
- package/ios/Browser/SectionScope.swift +73 -26
- package/ios/Browser/SimpleRouter.swift +76 -154
- package/ios/Browser/StyleResolver.swift +41 -0
- package/ios/Browser/TabBarEntries.swift +8 -7
- package/ios/Browser/TrackIdTemplate.swift +29 -0
- package/ios/CarPlay/CPInterfaceController+Safe.swift +102 -61
- package/ios/CarPlay/CarPlayArtworkResolver.swift +32 -83
- package/ios/CarPlay/CarPlayController.swift +37 -1297
- package/ios/CarPlay/CarPlayImageLoader.swift +85 -172
- package/ios/CarPlay/CarPlayListItemFactory.swift +240 -104
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +147 -218
- package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +93 -0
- package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
- package/ios/CarPlay/CarPlaySession+TabBar.swift +185 -0
- package/ios/CarPlay/CarPlaySession.swift +203 -0
- package/ios/CarPlay/CarPlayTemplates.swift +62 -0
- package/ios/CarPlay/IntentHandlers.swift +94 -0
- package/ios/CarPlay/MediaIntentCriteria.swift +91 -0
- package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +15 -17
- package/ios/CarPlay/MediaIntentPlayback.swift +86 -0
- package/ios/CarPlay/NowPlayingButtonRules.swift +34 -0
- package/ios/CarPlay/RNABAudioBrowser.m +7 -15
- package/ios/CarPlay/SectionPresentation.swift +67 -0
- package/ios/CarPlay/TopTemplateReplacer.swift +95 -0
- package/ios/Extension/Capability+RemoteCommand.swift +22 -69
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +17 -10
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -16
- package/ios/Extension/Promise+AwaitCallback.swift +33 -0
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +14 -22
- package/ios/Extension/SearchParams+Query.swift +28 -0
- package/ios/Extension/Section+Copying.swift +26 -0
- package/ios/Extension/String+IcyCharset.swift +21 -0
- package/ios/Extension/TimedMetadata+AVFoundation.swift +10 -14
- package/ios/Extension/Track+AVPlayer.swift +1 -18
- package/ios/Extension/Track+Copying.swift +13 -21
- package/ios/Extension/Track+Identity.swift +20 -0
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +19 -0
- package/ios/Extension/UIImage+Adaptive.swift +12 -0
- package/ios/Extension/URLError+Connectivity.swift +15 -0
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +73 -167
- package/ios/HybridAudioBrowser+Browser.swift +134 -0
- package/ios/HybridAudioBrowser+Options.swift +116 -0
- package/ios/HybridAudioBrowser+Player.swift +347 -0
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +156 -0
- package/ios/HybridAudioBrowser+Stubs.swift +44 -0
- package/ios/HybridAudioBrowser.swift +147 -1718
- package/ios/Model/NitroTypeStubs.swift +265 -32
- package/ios/Model/PlayerUpdateOptions.swift +13 -19
- package/ios/Model/RemoteCommand.swift +6 -78
- package/ios/Model/TrackPlayerError.swift +12 -21
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +28 -82
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +92 -0
- package/ios/Observer/PlayerObserver.swift +59 -0
- package/ios/Option/SessionCategories.swift +41 -92
- package/ios/PlaybackEvent.swift +4 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +190 -0
- package/ios/Player/DeferredSeek.swift +73 -0
- package/ios/Player/ErrorStatus.swift +56 -0
- package/ios/Player/MediaLoader.swift +73 -98
- package/ios/Player/NowPlayingLines.swift +49 -0
- package/ios/Player/NowPlayingUpdater.swift +180 -105
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +121 -0
- package/ios/Player/PlaybackPersistence.swift +72 -0
- package/ios/Player/PlaybackStateMachine.swift +15 -14
- package/ios/Player/PlaybackTimer.swift +11 -8
- package/ios/Player/Player.swift +1030 -0
- package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
- package/ios/Player/PlayerEngine.swift +109 -0
- package/ios/Player/PlayerStatusTypes.swift +1 -6
- package/ios/Player/QueueManager.swift +80 -98
- package/ios/Player/ReconnectPacer.swift +83 -0
- package/ios/Player/RetryLoop.swift +374 -0
- package/ios/Player/ShuffleOrder.swift +36 -43
- package/ios/Player/SilenceBudget.swift +78 -0
- package/ios/Player/SleepTimerManager.swift +25 -42
- package/ios/Player/VolumeFader.swift +20 -15
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -20
- package/ios/RemoteCommand/RemoteCommandController.swift +99 -337
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/ArtworkFreshnessTests.swift +67 -0
- package/ios/Tests/AwaitCallbackTests.swift +210 -0
- package/ios/Tests/BrowseGateTests.swift +50 -0
- package/ios/Tests/BrowserPathHelperTests.swift +89 -18
- package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
- package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
- package/ios/Tests/ConcurrentMapTests.swift +42 -0
- package/ios/Tests/ConnectivityTests.swift +13 -0
- package/ios/Tests/DeferredSeekTests.swift +76 -0
- package/ios/Tests/EmitterTests.swift +22 -39
- package/ios/Tests/ErrorStatusTests.swift +50 -0
- package/ios/Tests/FavoriteSetTests.swift +61 -0
- package/ios/Tests/GenerationMemoTests.swift +178 -0
- package/ios/Tests/InertStyleDiagnosticTests.swift +203 -0
- package/ios/Tests/JsonModelsTests.swift +189 -3
- package/ios/Tests/LRUCacheTests.swift +106 -0
- package/ios/Tests/MediaIntentCriteriaTests.swift +58 -52
- package/ios/Tests/MediaIntentDeadlineTests.swift +75 -0
- package/ios/Tests/MediaLoaderTests.swift +38 -78
- package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
- package/ios/Tests/NowPlayingLinesTests.swift +66 -0
- package/ios/Tests/ObserverTests.swift +88 -0
- package/ios/Tests/PlaybackErrorTests.swift +74 -0
- package/ios/Tests/PlaybackFailureTests.swift +188 -0
- package/ios/Tests/PlaybackPersistenceTests.swift +94 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +7 -22
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerInvalidTrackTests.swift +65 -0
- package/ios/Tests/PlayerPolicyTests.swift +1386 -0
- package/ios/Tests/PlayerTests.swift +1677 -0
- package/ios/Tests/PlayingStateTests.swift +41 -0
- package/ios/Tests/QueueManagerTests.swift +205 -174
- package/ios/Tests/ReadyValueTests.swift +73 -0
- package/ios/Tests/RemoteCommandControllerTests.swift +65 -48
- package/ios/Tests/RequestLayerTests.swift +228 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -37
- package/ios/Tests/RetryCaseTests.swift +146 -0
- package/ios/Tests/RetryLoopTests.swift +486 -0
- package/ios/Tests/SearchDrillInTests.swift +16 -17
- package/ios/Tests/SearchParamsQueryTests.swift +48 -0
- package/ios/Tests/SectionPresentationTests.swift +85 -0
- package/ios/Tests/SectionScopeTests.swift +136 -54
- package/ios/Tests/SimpleRouterTests.swift +39 -8
- package/ios/Tests/SleepTimerManagerTests.swift +68 -47
- package/ios/Tests/StyleResolverTests.swift +123 -0
- package/ios/Tests/SupersedingTaskTests.swift +148 -0
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +236 -93
- package/ios/Tests/Support/TimeLimit.swift +43 -0
- package/ios/Tests/TabBarEntriesTests.swift +18 -20
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +43 -2
- package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
- package/ios/Tests/TrackIdTemplateTests.swift +63 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +157 -34
- package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
- package/ios/TrackSelector.swift +62 -77
- package/ios/Util/ArtworkFreshness.swift +42 -0
- package/ios/Util/ArtworkImageFetcher.swift +143 -6
- package/ios/Util/AwaitCallback.swift +80 -0
- package/ios/Util/ConcurrentMap.swift +19 -0
- package/ios/Util/Connectivity.swift +12 -0
- package/ios/Util/Deadline.swift +38 -0
- package/ios/Util/Emitter.swift +45 -22
- package/ios/Util/GenerationMemo.swift +43 -0
- package/ios/Util/LRUCache.swift +23 -159
- package/ios/Util/NetworkMonitor.swift +31 -33
- package/ios/Util/OutputPicker.swift +48 -0
- package/ios/Util/ReadyValue.swift +57 -0
- package/ios/Util/SFSymbolRenderer.swift +64 -49
- package/ios/Util/SVGProcessor.swift +9 -16
- package/ios/Util/SupersedingTask.swift +45 -0
- package/lib/commonjs/AudioBrowser.js +11 -0
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/CLAUDE.md +57 -0
- package/lib/commonjs/features/battery.js +16 -12
- package/lib/commonjs/features/battery.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +13 -9
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +78 -20
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +3 -4
- package/lib/commonjs/features/carConnection.js.map +1 -1
- package/lib/commonjs/features/equalizer.js +9 -5
- package/lib/commonjs/features/equalizer.js.map +1 -1
- package/lib/commonjs/features/errors.js +35 -21
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/favorites.js +28 -23
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +27 -6
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +61 -11
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +5 -1
- package/lib/commonjs/features/network.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js +28 -14
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/output.js +9 -4
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +13 -6
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +6 -5
- package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
- package/lib/commonjs/features/playback/playing.js +5 -3
- package/lib/commonjs/features/playback/playing.js.map +1 -1
- package/lib/commonjs/features/playback/progress.js +13 -6
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/rate.js +8 -1
- package/lib/commonjs/features/playback/rate.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +5 -6
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +6 -5
- package/lib/commonjs/features/playback/volume.js.map +1 -1
- package/lib/commonjs/features/player/options.js +20 -10
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +44 -43
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +3 -4
- package/lib/commonjs/features/player/validateOptions.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +14 -4
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +56 -21
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +2 -1
- package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
- package/lib/commonjs/features/queue/shuffle.js +0 -1
- package/lib/commonjs/features/queue/shuffle.js.map +1 -1
- package/lib/commonjs/features/remoteControls.js +59 -35
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +23 -6
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
- package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
- package/lib/commonjs/utils/LazyNativeEmitter.js +18 -10
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +32 -16
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +26 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useDebug.js +16 -3
- package/lib/commonjs/utils/useDebug.js.map +1 -1
- package/lib/commonjs/utils/useNativeUpdatedValue.js +12 -20
- package/lib/commonjs/utils/useNativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +38 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +207 -84
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/Player.js +256 -40
- package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +34 -14
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +175 -100
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js +3 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +18 -23
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
- package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
- package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +60 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +2 -4
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/CLAUDE.md +57 -0
- package/lib/module/features/battery.js +16 -12
- package/lib/module/features/battery.js.map +1 -1
- package/lib/module/features/browser-config.js +13 -9
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +78 -20
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +3 -4
- package/lib/module/features/carConnection.js.map +1 -1
- package/lib/module/features/equalizer.js +9 -5
- package/lib/module/features/equalizer.js.map +1 -1
- package/lib/module/features/errors.js +35 -21
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/favorites.js +28 -23
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +27 -6
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +59 -11
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +5 -1
- package/lib/module/features/network.js.map +1 -1
- package/lib/module/features/nowPlaying.js +28 -14
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/output.js +9 -4
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +13 -6
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +6 -5
- package/lib/module/features/playback/playWhenReady.js.map +1 -1
- package/lib/module/features/playback/playing.js +5 -3
- package/lib/module/features/playback/playing.js.map +1 -1
- package/lib/module/features/playback/progress.js +13 -6
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/rate.js +8 -1
- package/lib/module/features/playback/rate.js.map +1 -1
- package/lib/module/features/playback/state.js +5 -6
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +6 -1
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +6 -5
- package/lib/module/features/playback/volume.js.map +1 -1
- package/lib/module/features/player/options.js +20 -10
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +44 -43
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +3 -4
- package/lib/module/features/player/validateOptions.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +14 -4
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +56 -21
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +2 -1
- package/lib/module/features/queue/repeatMode.js.map +1 -1
- package/lib/module/features/queue/shuffle.js +0 -1
- package/lib/module/features/queue/shuffle.js.map +1 -1
- package/lib/module/features/remoteControls.js +59 -35
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +24 -7
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/test-utils/reactNativeStub.js +58 -0
- package/lib/module/test-utils/reactNativeStub.js.map +1 -0
- package/lib/module/utils/LazyNativeEmitter.js +18 -10
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +32 -16
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +22 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useDebug.js +16 -3
- package/lib/module/utils/useDebug.js.map +1 -1
- package/lib/module/utils/useNativeUpdatedValue.js +13 -21
- package/lib/module/utils/useNativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/useNativeValueRefreshedBy.js +34 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +207 -84
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
- package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/module/web/TrackPlayer/Player.js +256 -40
- package/lib/module/web/TrackPlayer/Player.js.map +1 -1
- package/lib/module/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/module/web/TrackPlayer/QueuePlayer.js +34 -14
- package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +175 -100
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/NavigationErrorManager.js +3 -1
- package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +18 -23
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/module/web/browser/parseSearchResponse.js +3 -4
- package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/module/web/browser/sections.js +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/http/RequestConfigBuilder.js +110 -27
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/http/followMediaRedirect.js +215 -0
- package/lib/module/web/http/followMediaRedirect.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +60 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/package.json +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/features/battery.d.ts +17 -12
- package/lib/typescript/src/features/battery.d.ts.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +67 -19
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +3 -4
- package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +9 -5
- package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts +37 -22
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/favorites.d.ts +28 -23
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +29 -8
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +65 -14
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +5 -1
- package/lib/typescript/src/features/network.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +28 -14
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +9 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +13 -6
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
- package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +16 -3
- package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +11 -5
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/rate.d.ts +8 -1
- package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +10 -6
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +6 -5
- package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +73 -56
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +129 -73
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +50 -19
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +0 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +58 -25
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +15 -7
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +3 -4
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
- package/lib/typescript/src/types/browser-native.d.ts +3 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +401 -143
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +242 -173
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +13 -17
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +17 -20
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +20 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/resolveAssetSource.d.ts +1 -2
- package/lib/typescript/src/utils/resolveAssetSource.d.ts.map +1 -1
- package/lib/typescript/src/utils/useDebug.d.ts +16 -3
- package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
- package/lib/typescript/src/utils/useNativeUpdatedValue.d.ts +4 -4
- package/lib/typescript/src/utils/useNativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +20 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
- package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
- package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
- package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
- 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 +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +18 -6
- package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +4 -7
- package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
- package/nitrogen/generated/android/c++/JGate.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
- package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +77 -44
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +4 -3
- package/nitrogen/generated/android/c++/JIOSCategory.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryPolicy.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JImageContext.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageQueryParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
- package/nitrogen/generated/android/c++/JImageSource.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaReference.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JMediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeAndroidSetupOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +48 -21
- package/nitrogen/generated/android/c++/JNativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeIOSSetupOptions.hpp +10 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +16 -4
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +21 -12
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
- package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
- package/nitrogen/generated/android/c++/JOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
- package/nitrogen/generated/android/c++/JOutputType.hpp +8 -2
- package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
- package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +10 -10
- package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteOutputsOptions.hpp +66 -0
- package/nitrogen/generated/android/c++/JRemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +67 -59
- package/nitrogen/generated/android/c++/JRetryConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JSection.hpp +116 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
- package/nitrogen/generated/android/c++/JSleepTimer.hpp +4 -4
- package/nitrogen/generated/android/c++/JSleepTimerEndOfTrack.hpp +2 -2
- package/nitrogen/generated/android/c++/JSleepTimerTime.hpp +2 -2
- package/nitrogen/generated/android/c++/JStallReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrack.hpp +27 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +18 -12
- package/nitrogen/generated/android/c++/JTrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +47 -19
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JVariant_Boolean_AndroidAudioOffloadSettings.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_Boolean_RetryConfig.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_Double.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
- package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +7 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageContext.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageQueryParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageSource.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaRequestConfig.kt +35 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaTransformParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeAndroidSetupOptions.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +51 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeGateRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeIOSSetupOptions.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeRouteEntry.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +39 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +3 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteOutputsOptions.kt +61 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlayIdEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlaySearchEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSeekEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSkipEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RepeatModeChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RequestConfig.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +67 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RetryConfig.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SearchParams.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +86 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimer.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerEndOfTrack.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerTime.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TimedMetadata.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +55 -12
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackMetadata.kt +43 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +58 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TransformableRequestConfig.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_AndroidAudioOffloadSettings.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_RetryConfig.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_Double.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
- package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +800 -644
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +31 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +41 -12
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/BrowseResult.swift +12 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
- package/nitrogen/generated/ios/swift/FormatNavigationErrorParams.swift +7 -2
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
- package/nitrogen/generated/ios/swift/GridTile.swift +48 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +2 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +20 -2
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
- package/nitrogen/generated/ios/swift/NativeSetupPlayerOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/OutputType.swift +8 -0
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/RemoteOutputsOptions.swift +78 -0
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
- package/nitrogen/generated/ios/swift/Section.swift +82 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
- package/nitrogen/generated/ios/swift/SleepTimer.swift +13 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +28 -63
- package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
- package/nitrogen/generated/ios/swift/Variant_Bool_AndroidAudioOffloadSettings.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_Bool_RetryConfig.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_Double.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_RemoteButtonLayout.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
- package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
- package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +2 -1
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +2 -1
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
- package/nitrogen/generated/shared/c++/NativeSetupPlayerOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/OutputType.hpp +9 -1
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/RemoteOutputsOptions.hpp +92 -0
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
- package/nitrogen/generated/shared/c++/Section.hpp +102 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +18 -30
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
- package/package.json +26 -13
- package/src/AudioBrowser.ts +2 -4
- package/src/CLAUDE.md +57 -0
- package/src/docs-floors.test.ts +71 -0
- package/src/features/battery.test.ts +79 -0
- package/src/features/battery.ts +17 -13
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +13 -9
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +69 -20
- package/src/features/carConnection.ts +3 -4
- package/src/features/equalizer.ts +9 -5
- package/src/features/errors.ts +37 -22
- package/src/features/favorites.ts +28 -23
- package/src/features/gate.ts +29 -8
- package/src/features/hook-wiring.test.ts +302 -0
- package/src/features/metadata.ts +80 -14
- package/src/features/network.ts +5 -1
- package/src/features/nowPlaying.ts +28 -14
- package/src/features/output.ts +9 -4
- package/src/features/playback/controls.ts +13 -6
- package/src/features/playback/playWhenReady.ts +6 -5
- package/src/features/playback/playing.ts +16 -3
- package/src/features/playback/progress.test.ts +169 -0
- package/src/features/playback/progress.ts +13 -6
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +10 -6
- package/src/features/playback/trackPlaybackTime.test.ts +1 -5
- package/src/features/playback/trackPlaybackTime.ts +9 -2
- package/src/features/playback/volume.ts +6 -5
- package/src/features/player/options.ts +81 -62
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +141 -76
- package/src/features/player/validateOptions.ts +3 -4
- package/src/features/queue/activeTrack.ts +14 -4
- package/src/features/queue/queue.ts +56 -21
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +0 -1
- package/src/features/remoteControls.ts +59 -35
- package/src/features/sleepTimer.test.ts +171 -0
- package/src/features/sleepTimer.ts +24 -8
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +48 -24
- package/src/specs/audio-browser.nitro.ts +15 -8
- package/src/style-resolution.test.ts +210 -0
- package/src/test-utils/reactNativeStub.ts +60 -0
- package/src/types/browser-native.ts +7 -3
- package/src/types/browser-nodes.ts +417 -151
- package/src/types/browser.ts +248 -177
- package/src/utils/LazyNativeEmitter.ts +17 -10
- package/src/utils/NativeUpdatedValue.ts +30 -16
- package/src/utils/getTrackIdentity.ts +22 -0
- package/src/utils/useDebug.test.ts +182 -0
- package/src/utils/useDebug.ts +16 -3
- package/src/utils/useNativeUpdatedValue.test.ts +111 -0
- package/src/utils/useNativeUpdatedValue.ts +13 -17
- package/src/utils/useNativeValueRefreshedBy.test.ts +68 -0
- package/src/utils/useNativeValueRefreshedBy.ts +45 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
- package/src/web/NativeAudioBrowser.ts +247 -92
- package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
- package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
- package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
- package/src/web/TrackPlayer/Player.dispatch.test.ts +50 -5
- package/src/web/TrackPlayer/Player.load.test.ts +137 -1
- package/src/web/TrackPlayer/Player.ts +286 -38
- package/src/web/TrackPlayer/PlayingStateFactory.test.ts +1 -1
- package/src/web/TrackPlayer/PlayingStateFactory.ts +1 -1
- package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
- package/src/web/TrackPlayer/QueueManager.ts +14 -0
- package/src/web/TrackPlayer/QueuePlayer.ts +34 -16
- package/src/web/__tests__/lifecycle.test.ts +345 -0
- package/src/web/__tests__/lifecycleHarness.ts +351 -0
- package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
- package/src/web/__tests__/loadSupersession.test.ts +175 -0
- package/src/web/__tests__/retry.test.ts +169 -0
- package/src/web/browser/BrowserManager.ts +209 -111
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/NavigationErrorManager.ts +3 -1
- package/src/web/browser/SearchManager.test.ts +75 -0
- package/src/web/browser/SearchManager.ts +25 -28
- package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
- package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
- package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/parseSearchResponse.ts +3 -4
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/http/RequestConfigBuilder.test.ts +241 -1
- package/src/web/http/RequestConfigBuilder.ts +140 -33
- package/src/web/http/followMediaRedirect.test.ts +289 -0
- package/src/web/http/followMediaRedirect.ts +253 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +68 -0
- package/src/web/util/BrowserPathHelper.ts +68 -13
- package/website/guide/android-auto.md +126 -0
- package/website/guide/android-certificates.md +488 -0
- package/website/guide/artwork.md +300 -0
- package/website/guide/audio-output.md +357 -0
- package/website/guide/automotive.md +91 -0
- package/website/guide/basic-usage.md +154 -0
- package/website/guide/battery.md +142 -0
- package/website/guide/browser.md +674 -0
- package/website/guide/carplay.md +733 -0
- package/website/guide/configuration.md +215 -0
- package/website/guide/equalizer.md +235 -0
- package/website/guide/errors.md +359 -0
- package/website/guide/favorites.md +164 -0
- package/website/guide/gate.md +157 -0
- package/website/guide/getting-started.md +99 -0
- package/website/guide/hooks.md +247 -0
- package/website/guide/live-streams.md +189 -0
- package/website/guide/metadata.md +289 -0
- package/website/guide/migrating-from-track-player.md +289 -0
- package/website/guide/native-callback-fetch.md +137 -0
- package/website/guide/network.md +103 -0
- package/website/guide/now-playing.md +203 -0
- package/website/guide/playback.md +405 -0
- package/website/guide/queue.md +334 -0
- package/website/guide/remote-controls.md +314 -0
- package/website/guide/search.md +270 -0
- package/website/guide/sleep-timer.md +289 -0
- package/website/guide/track.md +271 -0
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +0 -50
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -68
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +0 -40
- package/ios/Bridge.h +0 -8
- package/ios/Browser/BrowserManager+URLResolution.swift +0 -380
- package/ios/Browser/MediaResolveComposer.swift +0 -114
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/ios/CarPlay/RNABMediaAddHandler.swift +0 -75
- package/ios/CarPlay/RNABMediaAffinityHandler.swift +0 -69
- package/ios/Model/MediaURL.swift +0 -67
- package/ios/Model/SourceType.swift +0 -6
- package/ios/NowPlayingInfo/MediaItemProperty.swift +0 -78
- package/ios/NowPlayingInfo/NowPlayingInfoKeyValue.swift +0 -6
- package/ios/NowPlayingInfo/NowPlayingInfoProperty.swift +0 -220
- package/ios/Observer/PlayerItemNotificationObserver.swift +0 -119
- package/ios/Observer/PlayerItemPropertyObserver.swift +0 -133
- package/ios/Observer/PlayerStateObserver.swift +0 -50
- package/ios/Observer/PlayerTimeObserver.swift +0 -55
- package/ios/Option/PitchAlgorithms.swift +0 -17
- package/ios/Option/TimeEventFrequency.swift +0 -18
- package/ios/Player/EndOfTrackJudgement.swift +0 -32
- package/ios/Player/LoadSeekCoordinator.swift +0 -99
- package/ios/Player/MediaIntentCriteria.swift +0 -139
- package/ios/Player/MediaLoaderDelegate.swift +0 -11
- package/ios/Player/PlaybackCoordinator.swift +0 -754
- package/ios/Player/PlaybackEffectHandler.swift +0 -54
- package/ios/Player/PlaybackErrorHandler.swift +0 -175
- package/ios/Player/PlaybackStateStore.swift +0 -27
- package/ios/Player/PlayingStateManager.swift +0 -33
- package/ios/Player/RetryManager.swift +0 -323
- package/ios/Player/SeekCompletionHandler.swift +0 -3
- package/ios/Player/SleepTimerHandling.swift +0 -15
- package/ios/Support/RNTrackPlayer-Bridging-Header.h +0 -7
- package/ios/Tests/EndOfTrackJudgementTests.swift +0 -35
- package/ios/Tests/LoadSeekCoordinatorTests.swift +0 -327
- package/ios/Tests/MediaResolveTests.swift +0 -126
- package/ios/Tests/OnceValueTests.swift +0 -79
- package/ios/Tests/PlaybackCoordinatorTests.swift +0 -1260
- package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
- package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
- package/ios/Tests/PlayingStateManagerTests.swift +0 -57
- package/ios/Tests/RemoteCommandTests.swift +0 -67
- package/ios/Tests/RetryManagerTests.swift +0 -89
- package/ios/TrackPlayer.swift +0 -1014
- package/ios/TrackPlayerCallbacks.swift +0 -53
- package/ios/Util/MetadataAdapter.swift +0 -131
- package/ios/Util/OnceValue.swift +0 -104
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JFavoritesMatchMode.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
|
@@ -2,12 +2,16 @@ package com.audiobrowser.player
|
|
|
2
2
|
|
|
3
3
|
import android.annotation.SuppressLint
|
|
4
4
|
import android.content.Context
|
|
5
|
+
import android.media.AudioManager
|
|
5
6
|
import android.os.Handler
|
|
6
7
|
import android.os.Looper
|
|
8
|
+
import android.os.SystemClock
|
|
7
9
|
import androidx.core.net.toUri
|
|
8
10
|
import androidx.media3.common.C
|
|
9
|
-
import androidx.media3.common.
|
|
11
|
+
import androidx.media3.common.MediaItem
|
|
10
12
|
import androidx.media3.common.MediaMetadata
|
|
13
|
+
import androidx.media3.common.PlaybackException
|
|
14
|
+
import androidx.media3.common.Player as MediaPlayer
|
|
11
15
|
import androidx.media3.database.StandaloneDatabaseProvider
|
|
12
16
|
import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
|
|
13
17
|
import androidx.media3.datasource.cache.SimpleCache
|
|
@@ -18,15 +22,30 @@ import com.audiobrowser.AudioBrowser
|
|
|
18
22
|
import com.audiobrowser.Callbacks
|
|
19
23
|
import com.audiobrowser.browser.displayArtworkSource
|
|
20
24
|
import com.audiobrowser.browser.resolveArtworkUrl
|
|
25
|
+
import com.audiobrowser.browser.resolveMediaUrl
|
|
21
26
|
import com.audiobrowser.browser.unattributedArtworkSource
|
|
27
|
+
import com.audiobrowser.cast.createCastRemote
|
|
22
28
|
import com.audiobrowser.extension.NumberExt.Companion.toSeconds
|
|
29
|
+
import com.audiobrowser.extension.identity
|
|
23
30
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
24
31
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
32
|
+
import com.audiobrowser.model.RetryPolicy
|
|
33
|
+
import com.audiobrowser.remote.RemoteOutputsController
|
|
34
|
+
import com.audiobrowser.remote.RemotePlayback
|
|
35
|
+
import com.audiobrowser.remote.RemoteUrls
|
|
36
|
+
import com.audiobrowser.sonos.SonosRemote
|
|
37
|
+
import com.audiobrowser.util.ArtworkRoutes
|
|
38
|
+
import com.audiobrowser.util.ArtworkUris
|
|
39
|
+
import com.audiobrowser.util.Automotive
|
|
25
40
|
import com.audiobrowser.util.CoilBitmapLoader
|
|
26
41
|
import com.audiobrowser.util.NetworkConnectivityMonitor
|
|
27
42
|
import com.audiobrowser.util.PlayingStateFactory
|
|
28
43
|
import com.audiobrowser.util.RepeatModeFactory
|
|
44
|
+
import com.audiobrowser.util.SvgArtworkRenderer
|
|
29
45
|
import com.audiobrowser.util.TrackFactory
|
|
46
|
+
import com.audiobrowser.util.TrackFactory.setFavorite
|
|
47
|
+
import com.audiobrowser.util.awaitOrTimeout
|
|
48
|
+
import com.audiobrowser.util.isAutomotive
|
|
30
49
|
import com.margelo.nitro.audiobrowser.AppKilledPlaybackBehavior
|
|
31
50
|
import com.margelo.nitro.audiobrowser.FavoriteChangedEvent
|
|
32
51
|
import com.margelo.nitro.audiobrowser.GateEvent
|
|
@@ -36,7 +55,6 @@ import com.margelo.nitro.audiobrowser.ImageSource
|
|
|
36
55
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
37
56
|
import com.margelo.nitro.audiobrowser.NowPlayingMetadata
|
|
38
57
|
import com.margelo.nitro.audiobrowser.Playback
|
|
39
|
-
import com.margelo.nitro.audiobrowser.PlaybackActiveTrackChangedEvent
|
|
40
58
|
import com.margelo.nitro.audiobrowser.PlaybackError
|
|
41
59
|
import com.margelo.nitro.audiobrowser.PlaybackPlayWhenReadyChangedEvent
|
|
42
60
|
import com.margelo.nitro.audiobrowser.PlaybackProgressUpdatedEvent
|
|
@@ -51,20 +69,50 @@ import java.io.IOException
|
|
|
51
69
|
import java.util.concurrent.TimeUnit
|
|
52
70
|
import kotlin.time.Duration.Companion.seconds
|
|
53
71
|
import kotlinx.coroutines.CompletableDeferred
|
|
72
|
+
import kotlinx.coroutines.CoroutineScope
|
|
54
73
|
import kotlinx.coroutines.Dispatchers
|
|
55
74
|
import kotlinx.coroutines.MainScope
|
|
56
75
|
import kotlinx.coroutines.TimeoutCancellationException
|
|
76
|
+
import kotlinx.coroutines.currentCoroutineContext
|
|
77
|
+
import kotlinx.coroutines.ensureActive
|
|
57
78
|
import kotlinx.coroutines.withContext
|
|
58
79
|
import kotlinx.coroutines.withTimeout
|
|
59
80
|
import timber.log.Timber
|
|
60
81
|
|
|
61
82
|
@SuppressLint("RestrictedApi")
|
|
62
|
-
class Player
|
|
83
|
+
class Player
|
|
84
|
+
internal constructor(
|
|
85
|
+
internal val context: Context,
|
|
86
|
+
castRemote: (Context, String?) -> RemotePlayback?,
|
|
87
|
+
sonosRemote: (Context, CoroutineScope) -> RemotePlayback,
|
|
88
|
+
) {
|
|
89
|
+
constructor(context: Context) : this(context, ::createCastRemote, ::SonosRemote)
|
|
90
|
+
|
|
63
91
|
val appKilledPlaybackBehavior: AppKilledPlaybackBehavior
|
|
64
92
|
get() = options.appKilledPlaybackBehavior
|
|
65
93
|
|
|
66
94
|
private var options = PlayerUpdateOptions()
|
|
67
95
|
private val mainHandler = Handler(Looper.getMainLooper())
|
|
96
|
+
|
|
97
|
+
/** Audio focus while [retryLoop] keeps the engine idle; see [RetryFocus]. */
|
|
98
|
+
internal val retryFocus: RetryFocus =
|
|
99
|
+
RetryFocus(
|
|
100
|
+
RetryFocus.Platform(
|
|
101
|
+
context.getSystemService(Context.AUDIO_SERVICE) as AudioManager,
|
|
102
|
+
mainHandler,
|
|
103
|
+
) {
|
|
104
|
+
exoPlayer.audioAttributes.audioAttributesV21.audioAttributes
|
|
105
|
+
},
|
|
106
|
+
// A permanent loss pauses, as media3 does while playing.
|
|
107
|
+
onLoss = { playWhenReady = false },
|
|
108
|
+
onSuppressionChanged = {
|
|
109
|
+
// Posted: it changes the play intent the loop is reporting from.
|
|
110
|
+
mainHandler.post {
|
|
111
|
+
retryLoop?.playIntentChanged(shouldPlayWhenReady)
|
|
112
|
+
refreshPlayingState()
|
|
113
|
+
}
|
|
114
|
+
},
|
|
115
|
+
)
|
|
68
116
|
internal var callbacks: Callbacks? = null
|
|
69
117
|
private lateinit var mediaSession: MediaSession
|
|
70
118
|
val networkMonitor: NetworkConnectivityMonitor = NetworkConnectivityMonitor(context)
|
|
@@ -72,7 +120,9 @@ class Player(internal val context: Context) {
|
|
|
72
120
|
EqualizerController(onSettingsChanged = { settings -> callbacks?.onEqualizerChanged(settings) })
|
|
73
121
|
private val mediaSessionCallback = MediaSessionCallback(this)
|
|
74
122
|
internal val playbackStateStore = PlaybackStateStore(this)
|
|
75
|
-
|
|
123
|
+
// Fades the local engine only: a remote receiver keeps its own volume.
|
|
124
|
+
internal val volumeFader =
|
|
125
|
+
VolumeFader(getVolume = { exoPlayer.volume }, setVolume = { exoPlayer.volume = it })
|
|
76
126
|
internal val sleepTimer =
|
|
77
127
|
SleepTimerManager(
|
|
78
128
|
volumeFader,
|
|
@@ -80,27 +130,89 @@ class Player(internal val context: Context) {
|
|
|
80
130
|
onChanged = { callbacks?.onSleepTimerChanged(it) },
|
|
81
131
|
)
|
|
82
132
|
|
|
83
|
-
|
|
84
|
-
lateinit var
|
|
85
|
-
|
|
86
|
-
@Volatile internal var playWhenReadyCache = false
|
|
133
|
+
/** The local engine. Rebuilt when the engine options change. */
|
|
134
|
+
internal lateinit var exoPlayer: ExoPlayer
|
|
135
|
+
private set
|
|
87
136
|
|
|
88
137
|
/**
|
|
89
|
-
*
|
|
90
|
-
*
|
|
91
|
-
*
|
|
92
|
-
*
|
|
138
|
+
* What plays: [exoPlayer], or while a remote output is on, the remote-switching player around it.
|
|
139
|
+
* Every playback read and command goes here. Local-only work that would disturb a remote (retry,
|
|
140
|
+
* reconnect, stuck recovery, the shuffle order) goes through [localEngine]; the equalizer,
|
|
141
|
+
* skip-silence, buffering and the volume fade act on [exoPlayer] alone.
|
|
93
142
|
*/
|
|
94
|
-
|
|
143
|
+
lateinit var sessionPlayer: MediaPlayer
|
|
144
|
+
private set
|
|
145
|
+
|
|
146
|
+
/** [sessionPlayer] behind the remote-command seam: what the MediaSession wraps. */
|
|
147
|
+
internal lateinit var forwardingPlayer: InterceptingPlayer
|
|
148
|
+
|
|
149
|
+
private val remoteOutputs =
|
|
150
|
+
RemoteOutputsController(
|
|
151
|
+
context,
|
|
152
|
+
::resolveRemoteUrls,
|
|
153
|
+
castRemote,
|
|
154
|
+
sonosRemote,
|
|
155
|
+
localHeld = { retryLoop?.reconnecting == true },
|
|
156
|
+
)
|
|
157
|
+
|
|
158
|
+
internal val localEngine =
|
|
159
|
+
LocalEngine({ exoPlayer }, isRemote = { remoteOutputs.player?.isRemote == true })
|
|
160
|
+
|
|
161
|
+
private var keepSessionAliveOnError = true
|
|
162
|
+
|
|
163
|
+
/** Automatic retry for the local engine; null when the setup turns retry off. */
|
|
164
|
+
internal var retryLoop: RetryLoop? = null
|
|
165
|
+
private set
|
|
166
|
+
|
|
167
|
+
/** What the wake mode holds while [retryLoop] keeps the engine idle; see [RetryLocks]. */
|
|
168
|
+
internal var retryLocks: RetryLocks? = null
|
|
169
|
+
private set
|
|
170
|
+
|
|
171
|
+
/** The playing item's id, for the load error policy on ExoPlayer's playback thread. */
|
|
172
|
+
@Volatile internal var playingMediaId: String? = null
|
|
173
|
+
|
|
174
|
+
/** The last recoverable load failure, the cause of a give-up that has no player error in hand. */
|
|
175
|
+
@Volatile private var lastLoadFailure: IOException? = null
|
|
176
|
+
|
|
177
|
+
private val retryEngine =
|
|
178
|
+
object : RetryLoop.Engine {
|
|
179
|
+
override fun reconnect() =
|
|
180
|
+
retryFocus.handOver { localEngine.retry(toLiveEdge = isCurrentItemLive) }
|
|
181
|
+
|
|
182
|
+
// A play after a pause over a retry connects nothing until then: no failure shows it.
|
|
183
|
+
override fun holdChanged(held: Boolean, kept: Boolean) {
|
|
184
|
+
retryLocks?.hold(held)
|
|
185
|
+
// A suppressed request outlives the intent it dropped: it waits for the focus to return.
|
|
186
|
+
if (held) retryFocus.hold() else if (!kept || !retryFocus.suppressed) retryFocus.release()
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
override fun awaitNetwork() =
|
|
190
|
+
showRetryingError(
|
|
191
|
+
PlaybackErrorClassifier.retryingLoadError(lastLoadFailure ?: IOException(), false)
|
|
192
|
+
)
|
|
193
|
+
|
|
194
|
+
override fun giveUp(cause: PlaybackException?) {
|
|
195
|
+
// A remote output took over before the listener heard it: the loop is done either way.
|
|
196
|
+
if (!localEngine.isActive) return
|
|
197
|
+
// ERROR first: the state machine holds it through the IDLE the stop brings.
|
|
198
|
+
playerListener.surfaceTerminal(
|
|
199
|
+
cause
|
|
200
|
+
?: PlaybackException(
|
|
201
|
+
"No audio within the retry budget",
|
|
202
|
+
lastLoadFailure,
|
|
203
|
+
PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
|
|
204
|
+
)
|
|
205
|
+
)
|
|
206
|
+
exoPlayer.stop()
|
|
207
|
+
}
|
|
208
|
+
}
|
|
95
209
|
|
|
96
|
-
/** Last playWhenReady value emitted to JS — see [emitPlayWhenReadyChanged]. */
|
|
97
210
|
private var lastEmittedPlayWhenReady: Boolean? = null
|
|
98
211
|
|
|
99
212
|
/**
|
|
100
|
-
* Emits
|
|
101
|
-
*
|
|
102
|
-
*
|
|
103
|
-
* makes on its own, e.g. audio focus); the guard deduplicates their overlap.
|
|
213
|
+
* Emits a playWhenReady change to JS once per value. Both the synchronous clear at ENDED in
|
|
214
|
+
* [setPlaybackState] and the media3 listener (changes ExoPlayer makes itself, e.g. audio focus)
|
|
215
|
+
* call it; their overlap is dropped.
|
|
104
216
|
*/
|
|
105
217
|
internal fun emitPlayWhenReadyChanged(value: Boolean) {
|
|
106
218
|
if (lastEmittedPlayWhenReady == value) return
|
|
@@ -112,42 +224,45 @@ class Player(internal val context: Context) {
|
|
|
112
224
|
private lateinit var loadControl: DynamicLoadControl
|
|
113
225
|
private var automaticBufferManager: AutomaticBufferManager? = null
|
|
114
226
|
|
|
115
|
-
|
|
116
|
-
* Tracks whether a network-related retry is pending. When true, network restoration will trigger
|
|
117
|
-
* an immediate retry via exoPlayer.prepare().
|
|
118
|
-
*/
|
|
119
|
-
@Volatile private var pendingNetworkRetry = false
|
|
120
|
-
|
|
121
|
-
private var browserRegistered = CompletableDeferred<AudioBrowser>()
|
|
227
|
+
@Volatile private var browserRegistered = CompletableDeferred<AudioBrowser>()
|
|
122
228
|
private var _coilBitmapLoader: CoilBitmapLoader? = null
|
|
123
229
|
|
|
230
|
+
/** For SVG pre-rendering of Android Auto browse items. Set by the service. */
|
|
231
|
+
var imageLoader: coil3.ImageLoader? = null
|
|
232
|
+
|
|
124
233
|
/**
|
|
125
|
-
*
|
|
126
|
-
* creation.
|
|
234
|
+
* Called on the main thread when a resumption meant to start playback fails. Set by the service.
|
|
127
235
|
*/
|
|
128
|
-
var
|
|
236
|
+
var onPlaybackResumptionFailed: () -> Unit = {}
|
|
129
237
|
|
|
130
|
-
/**
|
|
238
|
+
/** Maps the browse content provider's content:// tokens to artwork URLs. */
|
|
131
239
|
val browseArtworkRegistry = com.audiobrowser.browser.BrowseArtworkRegistry()
|
|
132
240
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
241
|
+
init {
|
|
242
|
+
Automotive.device = context.isAutomotive
|
|
243
|
+
TrackFactory.favoriteEnabled = options.capabilities.favoriteEnabled
|
|
244
|
+
TrackFactory.artworkRoutes =
|
|
245
|
+
ArtworkRoutes(browseArtworkRegistry, ArtworkUris.authorityFor(context.packageName))
|
|
246
|
+
}
|
|
247
|
+
|
|
136
248
|
var coilBitmapLoader: CoilBitmapLoader?
|
|
137
249
|
get() = _coilBitmapLoader
|
|
138
250
|
set(value) {
|
|
139
251
|
_coilBitmapLoader = value
|
|
140
252
|
}
|
|
141
253
|
|
|
142
|
-
// NOTE: setting the browser does NOT complete browserRegistered.
|
|
143
|
-
// Configuration (routes/tabs) must be set before Android Auto can browse.
|
|
144
|
-
// Call notifyBrowserConfigurationReady() after configuration is set.
|
|
145
254
|
var browser: AudioBrowser? = null
|
|
255
|
+
set(value) {
|
|
256
|
+
// A completed registration is the previous browser's; an open one keeps its waiters.
|
|
257
|
+
if (browserRegistered.isCompleted) {
|
|
258
|
+
browserRegistered = CompletableDeferred()
|
|
259
|
+
}
|
|
260
|
+
field = value
|
|
261
|
+
}
|
|
146
262
|
|
|
147
263
|
/**
|
|
148
|
-
*
|
|
149
|
-
*
|
|
150
|
-
* browse content.
|
|
264
|
+
* Marks the browser's routes and tabs configured: completes [awaitBrowser] and lets Android Auto
|
|
265
|
+
* browse. Call after setting [browser] and its configuration.
|
|
151
266
|
*/
|
|
152
267
|
fun notifyBrowserConfigurationReady() {
|
|
153
268
|
val audioBrowser = browser ?: return
|
|
@@ -155,15 +270,13 @@ class Player(internal val context: Context) {
|
|
|
155
270
|
if (!browserRegistered.isCompleted) {
|
|
156
271
|
Timber.d("Browser configuration ready - completing deferred")
|
|
157
272
|
browserRegistered.complete(audioBrowser)
|
|
158
|
-
//
|
|
159
|
-
// This handles the cold-start case where AA subscribed before browser was ready
|
|
273
|
+
// Android Auto may have subscribed on a cold start before the browser was ready.
|
|
160
274
|
mediaSessionCallback.notifyBrowserReady()
|
|
161
275
|
}
|
|
162
276
|
|
|
163
|
-
// Update MediaSession commands when browser becomes available with search configured
|
|
164
|
-
// Only update if search is available, since default state is "no search"
|
|
165
277
|
if (::mediaSession.isInitialized) {
|
|
166
278
|
val searchAvailable = audioBrowser.browserManager.config.hasSearch
|
|
279
|
+
// The session starts without search, so only a configured search needs an update.
|
|
167
280
|
if (searchAvailable) {
|
|
168
281
|
mediaSessionCallback.updateMediaSession(
|
|
169
282
|
mediaSession,
|
|
@@ -178,25 +291,25 @@ class Player(internal val context: Context) {
|
|
|
178
291
|
}
|
|
179
292
|
|
|
180
293
|
/**
|
|
181
|
-
*
|
|
294
|
+
* The browser [notifyBrowserConfigurationReady] registered, waiting for it if none is.
|
|
182
295
|
*
|
|
183
|
-
* @throws TimeoutCancellationException if
|
|
296
|
+
* @throws TimeoutCancellationException if it is not registered within 10 seconds
|
|
184
297
|
*/
|
|
185
298
|
suspend fun awaitBrowser(): AudioBrowser =
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
}
|
|
299
|
+
try {
|
|
300
|
+
withTimeout(10.seconds) { browserRegistered.await() }
|
|
301
|
+
} catch (e: TimeoutCancellationException) {
|
|
302
|
+
Timber.e("Timed out waiting for browser registration (10s)")
|
|
303
|
+
throw e
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
internal lateinit var playerListener: PlayerListener
|
|
307
|
+
private set
|
|
196
308
|
|
|
197
|
-
private lateinit var playerListener: PlayerListener
|
|
198
309
|
private var cache: SimpleCache? = null
|
|
199
310
|
|
|
311
|
+
private var destroyed = false
|
|
312
|
+
|
|
200
313
|
private val progressTimer: PlaybackTimer by lazy {
|
|
201
314
|
PlaybackTimer(
|
|
202
315
|
isActive = {
|
|
@@ -223,7 +336,7 @@ class Player(internal val context: Context) {
|
|
|
223
336
|
private set
|
|
224
337
|
|
|
225
338
|
val currentTrack: Track?
|
|
226
|
-
get() =
|
|
339
|
+
get() = sessionPlayer.currentMediaItem?.let { TrackFactory.fromMedia3(it) }
|
|
227
340
|
|
|
228
341
|
internal var lastTrack: Track? = null
|
|
229
342
|
internal var lastIndex: Int? = null
|
|
@@ -243,13 +356,11 @@ class Player(internal val context: Context) {
|
|
|
243
356
|
}
|
|
244
357
|
|
|
245
358
|
/**
|
|
246
|
-
* Re-derives [playingState] from
|
|
247
|
-
*
|
|
248
|
-
* state machine ([setPlaybackState]) and from [PlayerListener.onPlayWhenReadyChanged], the change
|
|
249
|
-
* points of its two inputs.
|
|
359
|
+
* Re-derives [playingState] from [shouldPlayWhenReady] and [playbackState], emitting when it
|
|
360
|
+
* changed. Its only writer: call it wherever either input changes.
|
|
250
361
|
*/
|
|
251
362
|
internal fun refreshPlayingState() {
|
|
252
|
-
val newPlayingState = PlayingStateFactory.derive(
|
|
363
|
+
val newPlayingState = PlayingStateFactory.derive(shouldPlayWhenReady, playbackState)
|
|
253
364
|
if (newPlayingState == playingState) return
|
|
254
365
|
Timber.d(
|
|
255
366
|
"PlayingState changed: playing=${newPlayingState.playing}, buffering=${newPlayingState.buffering}"
|
|
@@ -259,106 +370,120 @@ class Player(internal val context: Context) {
|
|
|
259
370
|
}
|
|
260
371
|
|
|
261
372
|
var playWhenReady: Boolean
|
|
262
|
-
get() =
|
|
373
|
+
get() = sessionPlayer.playWhenReady
|
|
263
374
|
set(value) {
|
|
264
|
-
//
|
|
265
|
-
//
|
|
266
|
-
//
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
if (value && exoPlayer.playbackState == ExoPlayer.STATE_ENDED) {
|
|
270
|
-
exoPlayer.seekToDefaultPosition()
|
|
375
|
+
// ExoPlayer's setPlayWhenReady(true) neither restarts an ended engine (media3 replays only on
|
|
376
|
+
// its media-button path) nor loads an idle one. Here in the setter so every writer plays
|
|
377
|
+
// alike: play(), togglePlayback(), JS, the session.
|
|
378
|
+
if (value && sessionPlayer.playbackState == MediaPlayer.STATE_ENDED) {
|
|
379
|
+
sessionPlayer.seekToDefaultPosition()
|
|
271
380
|
}
|
|
272
|
-
|
|
273
|
-
|
|
381
|
+
sessionPlayer.playWhenReady = value
|
|
382
|
+
// No-op unless the engine is idle, so this reconnects only after a stop, an error, a
|
|
383
|
+
// cancelled retry or a rebuild, and never re-buffers a healthy stream. Reconnecting is also
|
|
384
|
+
// how a live stream rejoins its live edge. Not while the retry loop paces the reconnect.
|
|
385
|
+
if (
|
|
386
|
+
value &&
|
|
387
|
+
currentTrack != null &&
|
|
388
|
+
retryView(sessionPlayer.playbackState) == MediaPlayer.STATE_IDLE
|
|
389
|
+
)
|
|
390
|
+
sessionPlayer.prepare()
|
|
274
391
|
}
|
|
275
392
|
|
|
393
|
+
/**
|
|
394
|
+
* The intent a setup carries, raised without loading: a setup repeats, as on a JS reload, and
|
|
395
|
+
* would otherwise start a stopped or failed queue. A play loads.
|
|
396
|
+
*/
|
|
397
|
+
internal fun applySetupPlayWhenReady(value: Boolean) {
|
|
398
|
+
sessionPlayer.playWhenReady = value
|
|
399
|
+
}
|
|
400
|
+
|
|
276
401
|
val duration: Long
|
|
277
|
-
get() = if (
|
|
402
|
+
get() = if (sessionPlayer.duration == C.TIME_UNSET) 0 else sessionPlayer.duration
|
|
278
403
|
|
|
279
404
|
internal var oldPosition = 0L
|
|
280
405
|
|
|
281
406
|
val position: Long
|
|
282
407
|
get() =
|
|
283
|
-
if (
|
|
408
|
+
if (sessionPlayer.currentPosition == C.INDEX_UNSET.toLong()) 0
|
|
409
|
+
else sessionPlayer.currentPosition
|
|
284
410
|
|
|
285
411
|
val bufferedPosition: Long
|
|
286
412
|
get() =
|
|
287
|
-
if (
|
|
413
|
+
if (sessionPlayer.bufferedPosition == C.INDEX_UNSET.toLong()) 0
|
|
414
|
+
else sessionPlayer.bufferedPosition
|
|
288
415
|
|
|
416
|
+
/** From 0 to 1: the local engine's, or while remote, the receiver's. */
|
|
289
417
|
var volume: Float
|
|
290
|
-
get() =
|
|
418
|
+
get() = sessionPlayer.volume
|
|
291
419
|
set(value) {
|
|
292
|
-
|
|
420
|
+
sessionPlayer.volume = value
|
|
293
421
|
}
|
|
294
422
|
|
|
295
423
|
var playbackSpeed: Float
|
|
296
|
-
get() =
|
|
424
|
+
get() = sessionPlayer.playbackParameters.speed
|
|
297
425
|
set(value) {
|
|
298
|
-
|
|
426
|
+
sessionPlayer.setPlaybackSpeed(value)
|
|
299
427
|
}
|
|
300
428
|
|
|
301
429
|
val isPlaying
|
|
302
|
-
get() =
|
|
430
|
+
get() = sessionPlayer.isPlaying
|
|
431
|
+
|
|
432
|
+
/**
|
|
433
|
+
* False while ExoPlayer suppresses output (a transient audio focus loss) though [playWhenReady]
|
|
434
|
+
* stays raised to resume on; mirrors media3's `ExoPlayerImplInternal.shouldPlayWhenReady`.
|
|
435
|
+
*/
|
|
436
|
+
internal val shouldPlayWhenReady: Boolean
|
|
437
|
+
get() =
|
|
438
|
+
sessionPlayer.playWhenReady &&
|
|
439
|
+
sessionPlayer.playbackSuppressionReason == MediaPlayer.PLAYBACK_SUPPRESSION_REASON_NONE &&
|
|
440
|
+
!retryFocus.suppressed
|
|
303
441
|
|
|
304
442
|
var repeatMode: RepeatMode
|
|
305
|
-
get() = RepeatModeFactory.fromMedia3(
|
|
443
|
+
get() = RepeatModeFactory.fromMedia3(sessionPlayer.repeatMode)
|
|
306
444
|
internal set(value) {
|
|
307
|
-
|
|
445
|
+
sessionPlayer.repeatMode = RepeatModeFactory.toMedia3(value)
|
|
308
446
|
}
|
|
309
447
|
|
|
310
448
|
val currentIndex: Int?
|
|
311
449
|
get() =
|
|
312
|
-
if (
|
|
313
|
-
else
|
|
450
|
+
if (sessionPlayer.currentMediaItemIndex == C.INDEX_UNSET) null
|
|
451
|
+
else sessionPlayer.currentMediaItemIndex
|
|
314
452
|
|
|
315
453
|
var shuffleMode: Boolean
|
|
316
|
-
get() =
|
|
454
|
+
get() = sessionPlayer.shuffleModeEnabled
|
|
317
455
|
set(value) {
|
|
318
|
-
|
|
456
|
+
sessionPlayer.shuffleModeEnabled = value
|
|
319
457
|
}
|
|
320
458
|
|
|
321
459
|
val trackCount: Int
|
|
322
|
-
get() =
|
|
460
|
+
get() = sessionPlayer.mediaItemCount
|
|
323
461
|
|
|
324
462
|
val isEmpty: Boolean
|
|
325
|
-
get() =
|
|
463
|
+
get() = sessionPlayer.mediaItemCount == 0
|
|
326
464
|
|
|
327
465
|
val tracks: Array<Track>
|
|
328
466
|
get() =
|
|
329
|
-
(0 until
|
|
330
|
-
.map { index -> TrackFactory.fromMedia3(
|
|
467
|
+
(0 until sessionPlayer.mediaItemCount)
|
|
468
|
+
.map { index -> TrackFactory.fromMedia3(sessionPlayer.getMediaItemAt(index)) }
|
|
331
469
|
.toTypedArray()
|
|
332
470
|
|
|
333
|
-
/**
|
|
334
|
-
* Whether nothing follows the current item in *playback order* — shuffle- and repeat-aware via
|
|
335
|
-
* media3's own order computation (the linear `currentMediaItemIndex == count - 1` check missed a
|
|
336
|
-
* shuffled queue whose playback order ends on a different linear index). Matches iOS's
|
|
337
|
-
* `isLastInPlaybackOrder`.
|
|
338
|
-
*/
|
|
471
|
+
/** In playback order, so shuffle and repeat count; not the last linear index. */
|
|
339
472
|
val isLastInPlaybackOrder: Boolean
|
|
340
|
-
get() =
|
|
473
|
+
get() = sessionPlayer.nextMediaItemIndex == C.INDEX_UNSET
|
|
341
474
|
|
|
342
|
-
/**
|
|
343
|
-
* The source path from which the current queue was expanded (e.g., from a contextual URL). Used
|
|
344
|
-
* to avoid re-expanding the queue when selecting tracks from the same source.
|
|
345
|
-
*/
|
|
475
|
+
/** The path the queue was expanded from, so selecting from the same source skips re-expanding. */
|
|
346
476
|
var queueSourcePath: String? = null
|
|
347
477
|
internal set
|
|
348
478
|
|
|
349
|
-
/**
|
|
350
|
-
* Get track at index with bounds checking.
|
|
351
|
-
*
|
|
352
|
-
* @param index The index of the track to retrieve.
|
|
353
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
354
|
-
*/
|
|
479
|
+
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
355
480
|
fun getTrack(index: Int): Track {
|
|
356
|
-
if (index < 0 || index >=
|
|
481
|
+
if (index < 0 || index >= sessionPlayer.mediaItemCount) {
|
|
357
482
|
throw IllegalArgumentException(
|
|
358
|
-
"Track index $index is out of bounds (size: ${
|
|
483
|
+
"Track index $index is out of bounds (size: ${sessionPlayer.mediaItemCount})"
|
|
359
484
|
)
|
|
360
485
|
}
|
|
361
|
-
return TrackFactory.fromMedia3(
|
|
486
|
+
return TrackFactory.fromMedia3(sessionPlayer.getMediaItemAt(index))
|
|
362
487
|
}
|
|
363
488
|
|
|
364
489
|
var skipSilence: Boolean
|
|
@@ -367,20 +492,65 @@ class Player(internal val context: Context) {
|
|
|
367
492
|
exoPlayer.skipSilenceEnabled = value
|
|
368
493
|
}
|
|
369
494
|
|
|
495
|
+
private var engineOptions: PlayerSetupOptions? = null
|
|
496
|
+
|
|
497
|
+
private var deferredSetup: PlayerSetupOptions? = null
|
|
498
|
+
|
|
370
499
|
/**
|
|
371
|
-
*
|
|
372
|
-
*
|
|
500
|
+
* Builds the ExoPlayer on the first call, and rebuilds it only when the engine options changed. A
|
|
501
|
+
* rebuild carries over the queue, the position and the play intent. During a transient audio
|
|
502
|
+
* focus loss with the intent up, the rebuild waits until focus returns, the intent drops, or a
|
|
503
|
+
* play asks for focus again.
|
|
373
504
|
*/
|
|
374
505
|
fun setup(setupOptions: PlayerSetupOptions) {
|
|
375
|
-
Timber.Forest.d("Setting up player with new options")
|
|
376
|
-
|
|
377
506
|
nowPlaying.enabled = setupOptions.autoUpdateNowPlayingMetadata
|
|
378
|
-
//
|
|
379
|
-
// bridge types; the double-await depth is unchanged (invoke -> bridge Promise -> JS promise).
|
|
507
|
+
// Unwrapped from the Nitro Func so the updater never touches bridge types.
|
|
380
508
|
nowPlaying.formatter =
|
|
381
|
-
setupOptions.nowPlayingMetadataFormatter?.let { f ->
|
|
509
|
+
setupOptions.nowPlayingMetadataFormatter?.let { f ->
|
|
510
|
+
{ params -> f.invoke(params).awaitOrTimeout() }
|
|
511
|
+
}
|
|
382
512
|
|
|
383
|
-
|
|
513
|
+
deferredSetup = setupOptions.takeIf { it.engineOptions() != engineOptions }
|
|
514
|
+
rebuildIfDue()
|
|
515
|
+
if (remoteOutputs.apply(setupOptions.remoteOutputs, exoPlayer)) attachSessionPlayer()
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
/**
|
|
519
|
+
* Runs a [deferredSetup] rebuild unless the engine waits out a transient focus loss with the
|
|
520
|
+
* intent up: the new engine would ask for focus at once, taking it from the app that holds it, or
|
|
521
|
+
* lose the intent when refused, as during a call. Call when the engine's state, intent or
|
|
522
|
+
* suppression changes.
|
|
523
|
+
*/
|
|
524
|
+
internal fun rebuildIfDue() {
|
|
525
|
+
val options = deferredSetup ?: return
|
|
526
|
+
// A stopped engine keeps the suppression but holds no focus, and is carried unprepared.
|
|
527
|
+
if (
|
|
528
|
+
engineOptions != null &&
|
|
529
|
+
exoPlayer.playbackState != MediaPlayer.STATE_IDLE &&
|
|
530
|
+
exoPlayer.playWhenReady &&
|
|
531
|
+
exoPlayer.playbackSuppressionReason ==
|
|
532
|
+
MediaPlayer.PLAYBACK_SUPPRESSION_REASON_TRANSIENT_AUDIO_FOCUS_LOSS
|
|
533
|
+
) {
|
|
534
|
+
return
|
|
535
|
+
}
|
|
536
|
+
deferredSetup = null
|
|
537
|
+
buildEngine(options)
|
|
538
|
+
engineOptions = options.engineOptions()
|
|
539
|
+
}
|
|
540
|
+
|
|
541
|
+
/**
|
|
542
|
+
* [rebuildIfDue] once the current command returns: ExoPlayer reports an intent change from inside
|
|
543
|
+
* the command, and a rebuild there would land between its steps, as between stop()'s drop of the
|
|
544
|
+
* intent and its stop.
|
|
545
|
+
*/
|
|
546
|
+
internal fun rebuildIfDueLater() {
|
|
547
|
+
if (deferredSetup != null) mainHandler.post(::rebuildIfDue)
|
|
548
|
+
}
|
|
549
|
+
|
|
550
|
+
private fun buildEngine(setupOptions: PlayerSetupOptions) {
|
|
551
|
+
Timber.Forest.d("Setting up player with new options")
|
|
552
|
+
val isInitialSetup = engineOptions == null
|
|
553
|
+
val carried = if (isInitialSetup) null else EnginePlayback.of(exoPlayer)
|
|
384
554
|
|
|
385
555
|
if (!isInitialSetup) {
|
|
386
556
|
forwardingPlayer.removeListener(playerListener)
|
|
@@ -389,15 +559,15 @@ class Player(internal val context: Context) {
|
|
|
389
559
|
}
|
|
390
560
|
|
|
391
561
|
if (setupOptions.maxCacheSize > 0) {
|
|
392
|
-
// SimpleCache locks its folder
|
|
393
|
-
// instance first or the constructor throws.
|
|
562
|
+
// SimpleCache locks its folder: the constructor throws until the previous one is released.
|
|
394
563
|
cache?.release()
|
|
395
564
|
cache =
|
|
396
565
|
SimpleCache(
|
|
397
566
|
File(context.cacheDir, "RNAB"),
|
|
398
567
|
LeastRecentlyUsedCacheEvictor(
|
|
568
|
+
// MB to bytes
|
|
399
569
|
setupOptions.maxCacheSize.toLong() * 1_000_000
|
|
400
|
-
),
|
|
570
|
+
),
|
|
401
571
|
StandaloneDatabaseProvider(context),
|
|
402
572
|
)
|
|
403
573
|
} else {
|
|
@@ -405,75 +575,78 @@ class Player(internal val context: Context) {
|
|
|
405
575
|
cache = null
|
|
406
576
|
}
|
|
407
577
|
|
|
408
|
-
// One engine generation: load control, media factory, ExoPlayer (pure construction —
|
|
409
|
-
// see buildPlayerEngine; lifecycle and wiring stay here).
|
|
410
578
|
val engine =
|
|
411
579
|
buildPlayerEngine(
|
|
412
580
|
context,
|
|
413
581
|
setupOptions,
|
|
414
582
|
cache,
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
onRetryPending = { exception, isNetworkError ->
|
|
419
|
-
// Track pending network retries for acceleration when connectivity returns
|
|
420
|
-
pendingNetworkRetry = isNetworkError
|
|
421
|
-
if (isNetworkError) {
|
|
422
|
-
Timber.d("Network retry pending, will accelerate on connectivity restoration")
|
|
423
|
-
}
|
|
424
|
-
reportRetryingError(exception)
|
|
425
|
-
},
|
|
426
|
-
resolveMediaConfig = { url -> browser?.getMediaRequestConfig(url) },
|
|
583
|
+
onLoadFailure = ::onLoadFailure,
|
|
584
|
+
isCurrent = { it.mediaId == playingMediaId },
|
|
585
|
+
resolveMediaConfig = { url, track -> browser?.getMediaRequestConfig(url, track) },
|
|
427
586
|
)
|
|
428
587
|
loadControl = engine.loadControl
|
|
429
588
|
mediaFactory = engine.mediaFactory
|
|
430
589
|
exoPlayer = engine.exoPlayer
|
|
590
|
+
// A reconnect the old loop held between connections: the engine is carried idle and unprepared.
|
|
591
|
+
val heldIdle = retryLoop?.reconnecting == true && localEngine.isActive
|
|
592
|
+
retryLoop?.suspend()
|
|
593
|
+
// Before the listener and the session are attached, so neither hears the playback replayed.
|
|
594
|
+
carried?.restoreTo(exoPlayer)
|
|
595
|
+
remoteOutputs.setLocal(exoPlayer)
|
|
596
|
+
keepSessionAliveOnError = setupOptions.keepSessionAliveOnError
|
|
597
|
+
|
|
598
|
+
if (isInitialSetup) playerListener = PlayerListener(this)
|
|
599
|
+
attachSessionPlayer()
|
|
600
|
+
if (heldIdle && exoPlayer.playbackState == ExoPlayer.STATE_IDLE && exoPlayer.mediaItemCount > 0)
|
|
601
|
+
exoPlayer.prepare()
|
|
602
|
+
playerListener.engineAttached()
|
|
603
|
+
retryLoop = newRetryLoop(setupOptions)
|
|
604
|
+
playingMediaId = exoPlayer.currentMediaItem?.mediaId
|
|
431
605
|
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
if (
|
|
436
|
-
|
|
437
|
-
|
|
606
|
+
if (isInitialSetup) {
|
|
607
|
+
callbacks?.onPlaybackChanged(Playback(PlaybackState.NONE, null))
|
|
608
|
+
equalizer.initialize(exoPlayer.audioSessionId)
|
|
609
|
+
} else if (localEngine.isActive) {
|
|
610
|
+
// No listener heard the restore. Its prepare() leaves the engine buffering; an unprepared one
|
|
611
|
+
// keeps its state. While remote, the receiver plays on unchanged.
|
|
612
|
+
if (exoPlayer.playbackState != ExoPlayer.STATE_IDLE) setPlaybackState(PlaybackState.BUFFERING)
|
|
613
|
+
// The new engine starts unsuppressed: an unchanged state would not re-derive it.
|
|
614
|
+
refreshPlayingState()
|
|
438
615
|
}
|
|
439
616
|
|
|
440
|
-
|
|
617
|
+
setupAutomaticBufferManager(setupOptions.automaticBuffer)
|
|
618
|
+
}
|
|
619
|
+
|
|
620
|
+
// Call whenever [exoPlayer] or the remote player changes.
|
|
621
|
+
private fun attachSessionPlayer() {
|
|
622
|
+
if (::forwardingPlayer.isInitialized) forwardingPlayer.removeListener(playerListener)
|
|
623
|
+
sessionPlayer = remoteOutputs.player ?: exoPlayer
|
|
441
624
|
forwardingPlayer =
|
|
442
625
|
InterceptingPlayer(
|
|
443
|
-
|
|
626
|
+
sessionPlayer,
|
|
444
627
|
{ callbacks },
|
|
445
628
|
{ options },
|
|
446
|
-
keepSessionAliveOnError
|
|
629
|
+
keepSessionAliveOnError,
|
|
630
|
+
playerState = { playbackState },
|
|
631
|
+
engineView = ::retryView,
|
|
632
|
+
masksPlaying = { retryMasksPlaying },
|
|
633
|
+
playPlayer = ::play,
|
|
634
|
+
stopPlayer = ::stop,
|
|
447
635
|
)
|
|
636
|
+
forwardingPlayer.addEngineListener(playerListener)
|
|
637
|
+
if (::mediaSession.isInitialized) mediaSession.player = forwardingPlayer
|
|
638
|
+
}
|
|
448
639
|
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
equalizer.initialize(exoPlayer.audioSessionId)
|
|
457
|
-
} else {
|
|
458
|
-
// Re-setup - re-add listener and update MediaSession
|
|
459
|
-
forwardingPlayer.addListener(playerListener)
|
|
460
|
-
|
|
461
|
-
// Update MediaSession with new forwardingPlayer reference if MediaSession exists
|
|
462
|
-
if (::mediaSession.isInitialized) {
|
|
463
|
-
Timber.Forest.d("Updating MediaSession with new forwardingPlayer reference")
|
|
464
|
-
mediaSession.player = forwardingPlayer
|
|
465
|
-
}
|
|
466
|
-
|
|
467
|
-
setPlaybackState(PlaybackState.NONE)
|
|
468
|
-
}
|
|
469
|
-
|
|
470
|
-
// Set up automatic buffer management if enabled
|
|
471
|
-
setupAutomaticBufferManager(setupOptions.automaticBuffer)
|
|
640
|
+
private suspend fun resolveRemoteUrls(track: Track): RemoteUrls {
|
|
641
|
+
val src = checkNotNull(track.src) { "The track has no src" }
|
|
642
|
+
val browserManager = browser?.browserManager
|
|
643
|
+
return RemoteUrls(
|
|
644
|
+
url = browserManager?.resolveMediaUrl(src, track)?.url() ?: src,
|
|
645
|
+
artworkUrl = browserManager?.resolveArtworkUrl(track)?.uri,
|
|
646
|
+
)
|
|
472
647
|
}
|
|
473
648
|
|
|
474
|
-
/** Sets up or tears down the automatic buffer manager based on the enabled flag. */
|
|
475
649
|
private fun setupAutomaticBufferManager(enabled: Boolean) {
|
|
476
|
-
// Detach existing manager if any
|
|
477
650
|
automaticBufferManager?.detach()
|
|
478
651
|
|
|
479
652
|
if (enabled) {
|
|
@@ -487,168 +660,90 @@ class Player(internal val context: Context) {
|
|
|
487
660
|
}
|
|
488
661
|
}
|
|
489
662
|
|
|
490
|
-
/**
|
|
491
|
-
* Starts observing network connectivity changes and invokes the callback when state changes. Also
|
|
492
|
-
* handles accelerating pending network retries when connectivity is restored.
|
|
493
|
-
*
|
|
494
|
-
* @param scope The coroutine scope to use for observation
|
|
495
|
-
*/
|
|
496
663
|
fun observeNetworkConnectivity(scope: kotlinx.coroutines.CoroutineScope) {
|
|
497
664
|
networkMonitor.observeOnline(scope) { isOnline ->
|
|
498
665
|
callbacks?.onOnlineChanged(isOnline)
|
|
666
|
+
retryLoop?.onlineChanged(isOnline)
|
|
499
667
|
|
|
500
|
-
//
|
|
501
|
-
// connectivity immediately, not only on the next playback transition.
|
|
668
|
+
// The formatter tells a stall from being offline, so it renders on a connectivity change too.
|
|
502
669
|
nowPlaying.render()
|
|
503
|
-
|
|
504
|
-
// Accelerate pending network retry when connectivity is restored
|
|
505
|
-
if (isOnline && pendingNetworkRetry) {
|
|
506
|
-
Timber.d("Network restored with pending retry, triggering immediate retry")
|
|
507
|
-
pendingNetworkRetry = false
|
|
508
|
-
// Only retry if player is still expecting to play
|
|
509
|
-
if (playWhenReadyCache) {
|
|
510
|
-
exoPlayer.prepare()
|
|
511
|
-
}
|
|
512
|
-
}
|
|
513
670
|
}
|
|
514
671
|
}
|
|
515
672
|
|
|
516
|
-
/**
|
|
517
|
-
* Loads a track into the player. If there is a current track, it will be replaced. If the queue
|
|
518
|
-
* is empty, the track will be added.
|
|
519
|
-
*
|
|
520
|
-
* @param track The [Track] to load.
|
|
521
|
-
*/
|
|
673
|
+
/** Replaces the current track, keeping the rest of the queue; on an empty queue, adds it. */
|
|
522
674
|
fun load(track: Track) {
|
|
523
|
-
if (
|
|
675
|
+
if (sessionPlayer.mediaItemCount == 0) {
|
|
524
676
|
add(track)
|
|
525
677
|
} else {
|
|
526
|
-
val index =
|
|
678
|
+
val index = sessionPlayer.currentMediaItemIndex
|
|
527
679
|
replaceTrack(index, track)
|
|
528
|
-
|
|
529
|
-
|
|
680
|
+
sessionPlayer.seekTo(index, C.TIME_UNSET)
|
|
681
|
+
sessionPlayer.prepare()
|
|
530
682
|
}
|
|
531
683
|
}
|
|
532
684
|
|
|
533
|
-
|
|
534
|
-
* Add a single track to the queue. If the AudioPlayer has no track loaded, it will load the
|
|
535
|
-
* `track`.
|
|
536
|
-
*
|
|
537
|
-
* @param track The [Track] to add.
|
|
538
|
-
*/
|
|
539
|
-
fun add(track: Track) {
|
|
540
|
-
val mediaItem = TrackFactory.toMedia3(track)
|
|
541
|
-
exoPlayer.addMediaItem(mediaItem)
|
|
542
|
-
exoPlayer.prepare()
|
|
543
|
-
}
|
|
544
|
-
|
|
545
|
-
/**
|
|
546
|
-
* Add multiple tracks to the queue. If the AudioPlayer has no track loaded, it will load the
|
|
547
|
-
* first track in the list.
|
|
548
|
-
*
|
|
549
|
-
* @param tracks The [Track]s to add.
|
|
550
|
-
*/
|
|
551
|
-
fun add(tracks: Array<Track>) {
|
|
552
|
-
val mediaItems = TrackFactory.toMedia3(tracks)
|
|
553
|
-
exoPlayer.addMediaItems(mediaItems.toList())
|
|
554
|
-
exoPlayer.prepare()
|
|
555
|
-
}
|
|
685
|
+
fun add(track: Track) = add(arrayOf(track))
|
|
556
686
|
|
|
557
687
|
/**
|
|
558
|
-
*
|
|
688
|
+
* Loads only into an empty queue: a queue that had tracks keeps its current one as it was, idle
|
|
689
|
+
* after a stop or a cancelled retry.
|
|
559
690
|
*
|
|
560
|
-
* @
|
|
561
|
-
* @param atIndex Index to insert tracks at. Use -1 to append to the end of the queue.
|
|
562
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
691
|
+
* @throws IllegalArgumentException unless [atIndex] is within the queue, or -1 to append.
|
|
563
692
|
*/
|
|
564
|
-
fun add(tracks: Array<Track>, atIndex: Int) {
|
|
693
|
+
fun add(tracks: Array<Track>, atIndex: Int = -1) {
|
|
565
694
|
validateInsertIndex(atIndex)
|
|
566
|
-
val
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
/**
|
|
573
|
-
* Remove a track from the queue.
|
|
574
|
-
*
|
|
575
|
-
* @param index The index of the track to remove.
|
|
576
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
577
|
-
*/
|
|
578
|
-
fun remove(index: Int) {
|
|
579
|
-
validateIndex(index)
|
|
580
|
-
exoPlayer.removeMediaItem(index)
|
|
695
|
+
val count = sessionPlayer.mediaItemCount
|
|
696
|
+
sessionPlayer.addMediaItems(
|
|
697
|
+
if (atIndex == -1) count else atIndex,
|
|
698
|
+
TrackFactory.toMedia3(tracks),
|
|
699
|
+
)
|
|
700
|
+
if (count == 0) sessionPlayer.prepare()
|
|
581
701
|
}
|
|
582
702
|
|
|
583
|
-
/**
|
|
584
|
-
* Remove tracks from the queue.
|
|
585
|
-
*
|
|
586
|
-
* @param indexes The indexes of the tracks to remove.
|
|
587
|
-
* @throws IllegalArgumentException if any index is out of bounds or if duplicate indexes are
|
|
588
|
-
* provided.
|
|
589
|
-
*/
|
|
703
|
+
/** @throws IllegalArgumentException if an index is out of bounds or repeated. */
|
|
590
704
|
fun remove(indexes: List<Int>) {
|
|
591
705
|
if (indexes.toSet().size != indexes.size) {
|
|
592
706
|
throw IllegalArgumentException("Duplicate indexes provided")
|
|
593
707
|
}
|
|
594
708
|
indexes.forEach { validateIndex(it) }
|
|
595
|
-
val
|
|
596
|
-
|
|
709
|
+
val removesCurrent = sessionPlayer.currentMediaItemIndex in indexes
|
|
710
|
+
indexes.sortedDescending().forEach { sessionPlayer.removeMediaItem(it) }
|
|
711
|
+
// Loads the new current track on an engine an error left idle; a no-op otherwise.
|
|
712
|
+
if (removesCurrent && playWhenReady) prepare()
|
|
597
713
|
}
|
|
598
714
|
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
*/
|
|
603
|
-
fun next() {
|
|
604
|
-
exoPlayer.seekToNextMediaItem()
|
|
605
|
-
exoPlayer.prepare()
|
|
606
|
-
}
|
|
715
|
+
fun next() = loadAfter { sessionPlayer.seekToNextMediaItem() }
|
|
716
|
+
|
|
717
|
+
fun previous() = loadAfter { sessionPlayer.seekToPreviousMediaItem() }
|
|
607
718
|
|
|
608
719
|
/**
|
|
609
|
-
*
|
|
610
|
-
*
|
|
720
|
+
* Runs [move] and prepares an idle engine, unless the queue ended and stays where it was: a
|
|
721
|
+
* rebuild carries an ended engine idle, and it stays ended as an ended engine does.
|
|
611
722
|
*/
|
|
612
|
-
fun
|
|
613
|
-
|
|
614
|
-
|
|
723
|
+
private inline fun loadAfter(move: () -> Unit) {
|
|
724
|
+
val index = sessionPlayer.currentMediaItemIndex
|
|
725
|
+
move()
|
|
726
|
+
if (playbackState == PlaybackState.ENDED && sessionPlayer.currentMediaItemIndex == index) return
|
|
727
|
+
sessionPlayer.prepare()
|
|
615
728
|
}
|
|
616
729
|
|
|
617
730
|
/**
|
|
618
|
-
*
|
|
731
|
+
* A [toIndex] past the end moves the track to the end.
|
|
619
732
|
*
|
|
620
|
-
* @
|
|
621
|
-
* @param toIndex The index to move the track to. If the index is larger than the size of the
|
|
622
|
-
* queue, the track is moved to the end of the queue instead.
|
|
623
|
-
* @throws IllegalArgumentException if fromIndex is out of bounds.
|
|
733
|
+
* @throws IllegalArgumentException if [fromIndex] is out of bounds.
|
|
624
734
|
*/
|
|
625
735
|
fun move(fromIndex: Int, toIndex: Int) {
|
|
626
736
|
validateIndex(fromIndex)
|
|
627
|
-
|
|
737
|
+
sessionPlayer.moveMediaItem(fromIndex, toIndex)
|
|
628
738
|
}
|
|
629
739
|
|
|
630
|
-
/**
|
|
631
|
-
* Skips to a track in the queue.
|
|
632
|
-
*
|
|
633
|
-
* @param index the index to skip to
|
|
634
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
635
|
-
*/
|
|
740
|
+
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
636
741
|
fun skipTo(index: Int) {
|
|
637
742
|
validateIndex(index)
|
|
638
|
-
|
|
639
|
-
|
|
743
|
+
sessionPlayer.seekTo(index, C.TIME_UNSET)
|
|
744
|
+
sessionPlayer.prepare()
|
|
640
745
|
}
|
|
641
746
|
|
|
642
|
-
/**
|
|
643
|
-
* Sets the queue with new tracks, optionally starting at a specific index and position. This is
|
|
644
|
-
* more efficient than calling clear() + add() + skipTo() separately.
|
|
645
|
-
*
|
|
646
|
-
* @param tracks The tracks to set as the new queue.
|
|
647
|
-
* @param startIndex The index to start playback from (default: 0).
|
|
648
|
-
* @param startPositionMs The position in milliseconds to start from (default: 0).
|
|
649
|
-
* @param sourcePath Optional path from which this queue was expanded (for contextual URL
|
|
650
|
-
* optimization).
|
|
651
|
-
*/
|
|
652
747
|
fun setQueue(
|
|
653
748
|
tracks: Array<Track>,
|
|
654
749
|
startIndex: Int = 0,
|
|
@@ -656,89 +751,58 @@ class Player(internal val context: Context) {
|
|
|
656
751
|
sourcePath: String? = null,
|
|
657
752
|
) {
|
|
658
753
|
val mediaItems = TrackFactory.toMedia3(tracks).toMutableList()
|
|
659
|
-
|
|
754
|
+
sessionPlayer.setMediaItems(mediaItems, startIndex, startPositionMs)
|
|
755
|
+
// While remote, the queue plays in list order.
|
|
756
|
+
if (mediaItems.isNotEmpty()) {
|
|
757
|
+
localEngine.setShuffleOrder(shuffleOrderLedBy(startIndex, mediaItems.size))
|
|
758
|
+
}
|
|
660
759
|
queueSourcePath = sourcePath
|
|
661
|
-
|
|
760
|
+
sessionPlayer.prepare()
|
|
662
761
|
}
|
|
663
762
|
|
|
664
|
-
/**
|
|
665
|
-
* Replaces track at index in queue.
|
|
666
|
-
*
|
|
667
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
668
|
-
*/
|
|
763
|
+
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
669
764
|
fun replaceTrack(index: Int, track: Track) {
|
|
670
765
|
validateIndex(index)
|
|
671
|
-
|
|
766
|
+
val isCurrent = index == currentIndex
|
|
767
|
+
if (isCurrent) nowPlaying.forgetPublished()
|
|
768
|
+
sessionPlayer.replaceMediaItem(index, TrackFactory.toMedia3(track))
|
|
769
|
+
if (isCurrent) nowPlaying.render()
|
|
672
770
|
}
|
|
673
771
|
|
|
674
772
|
/**
|
|
675
|
-
*
|
|
676
|
-
*
|
|
773
|
+
* @return false only when there is no current track, so MediaSession callers can report an
|
|
774
|
+
* invalid state instead of a success the controller then watches revert.
|
|
677
775
|
*/
|
|
678
|
-
fun setActiveTrackFavorited(favorited: Boolean) {
|
|
679
|
-
val currentTrack = this.currentTrack ?: return
|
|
776
|
+
fun setActiveTrackFavorited(favorited: Boolean): Boolean {
|
|
777
|
+
val currentTrack = this.currentTrack ?: return false
|
|
680
778
|
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
currentTrack.src?.let { src -> browser?.browserManager?.updateFavorite(src, favorited) }
|
|
779
|
+
currentTrack.identity?.let { identity ->
|
|
780
|
+
browser?.browserManager?.updateFavorite(identity, favorited)
|
|
781
|
+
}
|
|
685
782
|
|
|
686
|
-
val index =
|
|
687
|
-
|
|
783
|
+
val index = sessionPlayer.currentMediaItemIndex
|
|
784
|
+
// Still applied: the favorite is persisted above, and there is no heart to revert.
|
|
785
|
+
if (index == C.INDEX_UNSET) return true
|
|
688
786
|
|
|
689
|
-
// Create updated Track with new favorited state
|
|
690
787
|
val updatedTrack = currentTrack.copy(favorited = favorited)
|
|
788
|
+
restampMediaItem(index, updatedTrack) { setFavorite(favorited) }
|
|
691
789
|
|
|
692
|
-
// Use buildUpon() on the existing MediaItem to update only the metadata
|
|
693
|
-
// This preserves internal references and avoids playback interruption
|
|
694
|
-
// Note: setTag() requires setUri() to be called, so we must re-set the URI
|
|
695
|
-
val currentMediaItem = exoPlayer.getMediaItemAt(index)
|
|
696
|
-
val updatedMetadata =
|
|
697
|
-
currentMediaItem.mediaMetadata.buildUpon().setUserRating(HeartRating(favorited)).build()
|
|
698
|
-
val updatedMediaItem =
|
|
699
|
-
currentMediaItem
|
|
700
|
-
.buildUpon()
|
|
701
|
-
.setUri(currentMediaItem.localConfiguration?.uri)
|
|
702
|
-
.setMediaMetadata(updatedMetadata)
|
|
703
|
-
.setTag(updatedTrack)
|
|
704
|
-
.build()
|
|
705
|
-
|
|
706
|
-
exoPlayer.replaceMediaItem(index, updatedMediaItem)
|
|
707
|
-
|
|
708
|
-
// Update the heart button icon in notification/Android Auto
|
|
709
790
|
updateFavoriteButtonState(favorited)
|
|
710
791
|
|
|
711
|
-
//
|
|
792
|
+
// The only emit: a favorite toggle mutates the active track in place, so the track and queue
|
|
793
|
+
// change events stay transition-only.
|
|
712
794
|
callbacks?.onFavoriteChanged(FavoriteChangedEvent(updatedTrack, favorited))
|
|
713
|
-
|
|
714
|
-
// Emit active track changed so useActiveTrack() hook updates
|
|
715
|
-
val activeTrackEvent =
|
|
716
|
-
PlaybackActiveTrackChangedEvent(
|
|
717
|
-
lastIndex = index.toDouble(),
|
|
718
|
-
lastTrack = currentTrack,
|
|
719
|
-
lastPosition = exoPlayer.currentPosition.toSeconds(),
|
|
720
|
-
index = index.toDouble(),
|
|
721
|
-
track = updatedTrack,
|
|
722
|
-
)
|
|
723
|
-
callbacks?.onPlaybackActiveTrackChanged(activeTrackEvent)
|
|
724
|
-
|
|
725
|
-
// Emit queue changed so useQueue() hook updates
|
|
726
|
-
callbacks?.onPlaybackQueueChanged(tracks)
|
|
795
|
+
return true
|
|
727
796
|
}
|
|
728
797
|
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
setActiveTrackFavorited(currentTrack.favorited != true)
|
|
798
|
+
fun toggleActiveTrackFavorited(): Boolean {
|
|
799
|
+
val currentTrack = this.currentTrack ?: return false
|
|
800
|
+
return setActiveTrackFavorited(currentTrack.favorited != true)
|
|
733
801
|
}
|
|
734
802
|
|
|
735
803
|
// MARK: - Now Playing Metadata
|
|
736
804
|
|
|
737
|
-
/**
|
|
738
|
-
* Now Playing rendering (flash/override/formatter precedence, dedupe, stale guards, artwork
|
|
739
|
-
* keying) lives in [NowPlayingUpdater]; this object is its platform surface — current playback
|
|
740
|
-
* reads plus MediaItem stamping via [replaceMediaItem], and artwork resolution via the browser.
|
|
741
|
-
*/
|
|
805
|
+
/** [NowPlayingUpdater] does the rendering; this is its platform surface. */
|
|
742
806
|
val nowPlaying: NowPlayingUpdater =
|
|
743
807
|
NowPlayingUpdater(
|
|
744
808
|
object : NowPlayingSurface {
|
|
@@ -755,7 +819,7 @@ class Player(internal val context: Context) {
|
|
|
755
819
|
get() = this@Player.playbackError
|
|
756
820
|
|
|
757
821
|
override val playWhenReady
|
|
758
|
-
get() =
|
|
822
|
+
get() = shouldPlayWhenReady
|
|
759
823
|
|
|
760
824
|
override val isRebuffering
|
|
761
825
|
get() = loadControl.isRebuffering
|
|
@@ -777,9 +841,8 @@ class Player(internal val context: Context) {
|
|
|
777
841
|
setTitle(title)
|
|
778
842
|
.setDisplayTitle(title)
|
|
779
843
|
.setArtist(secondaryLine)
|
|
780
|
-
// Android Auto reads DISPLAY_SUBTITLE
|
|
781
|
-
//
|
|
782
|
-
// notification.
|
|
844
|
+
// Android Auto reads DISPLAY_SUBTITLE, not ARTIST, once DISPLAY_TITLE is set;
|
|
845
|
+
// `artist` still drives the lock screen and notification.
|
|
783
846
|
.setSubtitle(secondaryLine)
|
|
784
847
|
.setAlbumTitle(album)
|
|
785
848
|
}
|
|
@@ -798,11 +861,12 @@ class Player(internal val context: Context) {
|
|
|
798
861
|
null
|
|
799
862
|
}
|
|
800
863
|
val uri = resolved?.uri?.takeIf { it.isNotEmpty() } ?: return null
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
//
|
|
804
|
-
|
|
805
|
-
|
|
864
|
+
val published =
|
|
865
|
+
TrackFactory.sessionArtworkUri(uri, resolved.headers, SvgArtworkRenderer.isSvgUrl(uri))
|
|
866
|
+
// Media3 hands this URI back to the bitmap loader, which re-resolves it with the
|
|
867
|
+
// nowPlayingArtwork config rather than the global artwork config.
|
|
868
|
+
browserManager.artworkResolutions.register(published, track, config)
|
|
869
|
+
return published
|
|
806
870
|
}
|
|
807
871
|
|
|
808
872
|
override fun emitNowPlayingChanged(metadata: NowPlayingMetadata) {
|
|
@@ -812,50 +876,129 @@ class Player(internal val context: Context) {
|
|
|
812
876
|
MainScope(),
|
|
813
877
|
)
|
|
814
878
|
|
|
815
|
-
/**
|
|
879
|
+
/**
|
|
880
|
+
* One replacement for the whole queue: each separate one is a timeline change and a queue event
|
|
881
|
+
* to JS.
|
|
882
|
+
*/
|
|
883
|
+
private fun restampFavorites() {
|
|
884
|
+
if (!::sessionPlayer.isInitialized || sessionPlayer.mediaItemCount == 0) return
|
|
885
|
+
val items =
|
|
886
|
+
(0 until sessionPlayer.mediaItemCount).map { index ->
|
|
887
|
+
val item = sessionPlayer.getMediaItemAt(index)
|
|
888
|
+
val track = item.localConfiguration?.tag as? Track ?: return@map item
|
|
889
|
+
item.restamped(track) { setFavorite(track.favorited) }
|
|
890
|
+
}
|
|
891
|
+
sessionPlayer.replaceMediaItems(0, items.size, items)
|
|
892
|
+
}
|
|
893
|
+
|
|
816
894
|
private fun restampMediaItem(
|
|
817
895
|
index: Int,
|
|
818
896
|
track: Track,
|
|
819
897
|
mutate: MediaMetadata.Builder.() -> MediaMetadata.Builder,
|
|
820
898
|
) {
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
899
|
+
sessionPlayer.replaceMediaItem(
|
|
900
|
+
index,
|
|
901
|
+
sessionPlayer.getMediaItemAt(index).restamped(track, mutate),
|
|
902
|
+
)
|
|
903
|
+
}
|
|
904
|
+
|
|
905
|
+
/** Keeps the uri so ExoPlayer updates the item in place instead of reloading it. */
|
|
906
|
+
private fun MediaItem.restamped(
|
|
907
|
+
track: Track,
|
|
908
|
+
mutate: MediaMetadata.Builder.() -> MediaMetadata.Builder,
|
|
909
|
+
): MediaItem =
|
|
910
|
+
buildUpon()
|
|
911
|
+
.setUri(localConfiguration?.uri)
|
|
912
|
+
.setMediaMetadata(mediaMetadata.buildUpon().mutate().build())
|
|
913
|
+
.setTag(track)
|
|
914
|
+
.build()
|
|
915
|
+
|
|
916
|
+
private fun newRetryLoop(options: PlayerSetupOptions): RetryLoop? {
|
|
917
|
+
val (maxRetries, recoveryMs, firstConnectMs) =
|
|
918
|
+
when (val policy = options.retryPolicy) {
|
|
919
|
+
RetryPolicy.Default -> return null
|
|
920
|
+
is RetryPolicy.Infinite ->
|
|
921
|
+
Triple(null, policy.maxRetryDurationMs, policy.firstConnectMaxRetryDurationMs)
|
|
922
|
+
is RetryPolicy.Limited ->
|
|
923
|
+
Triple(
|
|
924
|
+
policy.maxRetries,
|
|
925
|
+
policy.maxRetryDurationMs,
|
|
926
|
+
policy.firstConnectMaxRetryDurationMs,
|
|
927
|
+
)
|
|
928
|
+
}
|
|
929
|
+
val recovery = recoveryMs ?: 120_000
|
|
930
|
+
val firstConnect = firstConnectMs ?: 12_000
|
|
931
|
+
retryLocks =
|
|
932
|
+
RetryLocks(context, options.wakeMode, maxHoldMs = recovery + firstConnect, mainHandler)
|
|
933
|
+
return RetryLoop(
|
|
934
|
+
clock = SystemClock::elapsedRealtime,
|
|
935
|
+
timer = { delayMs, action ->
|
|
936
|
+
val runnable = Runnable(action)
|
|
937
|
+
mainHandler.postDelayed(runnable, delayMs)
|
|
938
|
+
val cancel: () -> Unit = { mainHandler.removeCallbacks(runnable) }
|
|
939
|
+
cancel
|
|
940
|
+
},
|
|
941
|
+
engine = retryEngine,
|
|
942
|
+
maxRetries = maxRetries,
|
|
943
|
+
recoveryMs = recovery,
|
|
944
|
+
firstConnectMs = firstConnect,
|
|
945
|
+
online = networkMonitor.getOnline(),
|
|
946
|
+
)
|
|
947
|
+
.also {
|
|
948
|
+
it.playIntentChanged(shouldPlayWhenReady)
|
|
949
|
+
if (localEngine.isActive && exoPlayer.playbackState != MediaPlayer.STATE_IDLE) {
|
|
950
|
+
it.loadStarted()
|
|
951
|
+
it.isPlayingChanged(exoPlayer.isPlaying)
|
|
952
|
+
} else {
|
|
953
|
+
it.suspend()
|
|
954
|
+
}
|
|
955
|
+
}
|
|
830
956
|
}
|
|
831
957
|
|
|
832
958
|
/**
|
|
833
|
-
*
|
|
959
|
+
* A new Load for the retry loop (ADR 0014): a track change, or the phone taking over playback.
|
|
834
960
|
*/
|
|
961
|
+
internal fun startRetryLoad() {
|
|
962
|
+
playingMediaId = exoPlayer.currentMediaItem?.mediaId
|
|
963
|
+
val loop = retryLoop ?: return
|
|
964
|
+
if (!localEngine.isActive) return loop.suspend()
|
|
965
|
+
lastLoadFailure = null
|
|
966
|
+
if (exoPlayer.playbackState == MediaPlayer.STATE_IDLE) {
|
|
967
|
+
// Nothing connects an idle engine's new track but a prepare, and leaving idle starts its
|
|
968
|
+
// Load.
|
|
969
|
+
val held = loop.reconnecting
|
|
970
|
+
loop.suspend()
|
|
971
|
+
if (held) exoPlayer.prepare()
|
|
972
|
+
return
|
|
973
|
+
}
|
|
974
|
+
loop.loadStarted()
|
|
975
|
+
loop.isPlayingChanged(exoPlayer.isPlaying)
|
|
976
|
+
}
|
|
977
|
+
|
|
835
978
|
/**
|
|
836
|
-
*
|
|
837
|
-
*
|
|
838
|
-
* single silent attempt — the same behavior as re-selecting the track (ADR 0004). Hooked off the
|
|
839
|
-
* player error clearing: every recovery path (retry(), play(), the transport controls' idle-error
|
|
840
|
-
* recovery) goes through exoPlayer.prepare(), which clears the error.
|
|
979
|
+
* The engine state the listener and the session are shown: the retry loop's idle engine reads
|
|
980
|
+
* buffering, and so does a READY blip before a failed connection's error surfaces.
|
|
841
981
|
*/
|
|
842
|
-
internal fun
|
|
843
|
-
|
|
844
|
-
|
|
982
|
+
internal fun retryView(@MediaPlayer.State engineState: Int): Int {
|
|
983
|
+
val loop = retryLoop?.takeIf { localEngine.isActive } ?: return engineState
|
|
984
|
+
return RetryView.engineState(
|
|
985
|
+
engineState,
|
|
986
|
+
loop.reconnecting,
|
|
987
|
+
loop.failurePending,
|
|
988
|
+
exoPlayer.totalBufferedDuration,
|
|
989
|
+
)
|
|
845
990
|
}
|
|
846
991
|
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
992
|
+
/** Whether the engine's playing is a blip the retry loop hides; see [retryView]. */
|
|
993
|
+
internal val retryMasksPlaying: Boolean
|
|
994
|
+
get() =
|
|
995
|
+
localEngine.isActive &&
|
|
996
|
+
RetryView.isBlip(retryLoop?.failurePending == true, exoPlayer.totalBufferedDuration)
|
|
850
997
|
|
|
851
|
-
/**
|
|
852
|
-
* Finds the queue Track whose published artwork URI matches [uri], for display-time artwork
|
|
853
|
-
* resolution of app-supplied queue tracks that never went through browse (so they are not in the
|
|
854
|
-
* resolution registry). Must run on the main thread (ExoPlayer access).
|
|
855
|
-
*/
|
|
998
|
+
/** Main thread only (ExoPlayer access). */
|
|
856
999
|
private fun findQueueTrackByArtworkUri(uri: String): Track? {
|
|
857
|
-
for (i in 0 until
|
|
858
|
-
val item =
|
|
1000
|
+
for (i in 0 until sessionPlayer.mediaItemCount) {
|
|
1001
|
+
val item = sessionPlayer.getMediaItemAt(i)
|
|
859
1002
|
if (item.mediaMetadata.artworkUri?.toString() == uri) {
|
|
860
1003
|
return item.localConfiguration?.tag as? Track
|
|
861
1004
|
}
|
|
@@ -864,10 +1007,8 @@ class Player(internal val context: Context) {
|
|
|
864
1007
|
}
|
|
865
1008
|
|
|
866
1009
|
/**
|
|
867
|
-
*
|
|
868
|
-
*
|
|
869
|
-
* header-only fallback for unattributable URIs (registry eviction / process-death restore). Null
|
|
870
|
-
* means "fetch the URI as-is".
|
|
1010
|
+
* For [CoilBitmapLoader]: the resolution registry, then the queue track that published [uri],
|
|
1011
|
+
* then headers alone for a URI nothing attributes. Null means fetch the URI as-is.
|
|
871
1012
|
*/
|
|
872
1013
|
suspend fun resolveDisplayArtwork(uri: String, sizeHintPixels: Int?): ImageSource? {
|
|
873
1014
|
val browserManager = browser?.browserManager ?: return null
|
|
@@ -876,6 +1017,14 @@ class Player(internal val context: Context) {
|
|
|
876
1017
|
browserManager.displayArtworkSource(uri, imageContext)?.let {
|
|
877
1018
|
return it
|
|
878
1019
|
}
|
|
1020
|
+
// On Android Automotive OS the queue publishes provider URIs; the resolutions are keyed by URL.
|
|
1021
|
+
TrackFactory.artworkRoutes
|
|
1022
|
+
?.publicUrl(uri.toUri())
|
|
1023
|
+
?.takeIf { it != uri }
|
|
1024
|
+
?.let { browserManager.displayArtworkSource(it, imageContext) }
|
|
1025
|
+
?.let {
|
|
1026
|
+
return it
|
|
1027
|
+
}
|
|
879
1028
|
withContext(Dispatchers.Main) { findQueueTrackByArtworkUri(uri) }
|
|
880
1029
|
?.let { track ->
|
|
881
1030
|
return browserManager.resolveArtworkUrl(track, null, imageContext)
|
|
@@ -883,58 +1032,48 @@ class Player(internal val context: Context) {
|
|
|
883
1032
|
return browserManager.unattributedArtworkSource(uri)
|
|
884
1033
|
}
|
|
885
1034
|
|
|
886
|
-
/**
|
|
887
|
-
* Updates the favorite button icon in the notification/Android Auto. Call this when track changes
|
|
888
|
-
* or favorite state changes.
|
|
889
|
-
*/
|
|
890
1035
|
internal fun updateFavoriteButtonState(favorited: Boolean?) {
|
|
891
1036
|
if (!::mediaSession.isInitialized) return
|
|
892
1037
|
mediaSessionCallback.commandManager.updateFavoriteState(mediaSession, favorited)
|
|
893
1038
|
}
|
|
894
1039
|
|
|
895
|
-
|
|
1040
|
+
internal fun updateLiveState(live: Boolean) {
|
|
1041
|
+
if (!::mediaSession.isInitialized) return
|
|
1042
|
+
mediaSessionCallback.commandManager.updateLiveState(mediaSession, live)
|
|
1043
|
+
}
|
|
1044
|
+
|
|
896
1045
|
fun removeUpcomingTracks() {
|
|
897
|
-
val index =
|
|
1046
|
+
val index = sessionPlayer.currentMediaItemIndex
|
|
898
1047
|
if (index == C.INDEX_UNSET) return
|
|
899
|
-
val lastIndex =
|
|
1048
|
+
val lastIndex = sessionPlayer.mediaItemCount
|
|
900
1049
|
val fromIndex = index + 1
|
|
901
1050
|
|
|
902
|
-
|
|
1051
|
+
sessionPlayer.removeMediaItems(fromIndex, lastIndex)
|
|
903
1052
|
}
|
|
904
1053
|
|
|
905
1054
|
fun play() {
|
|
906
|
-
// Through the setter so the STATE_ENDED replay handling applies
|
|
907
|
-
// (ExoPlayer.play() is only setPlayWhenReady(true)).
|
|
908
1055
|
playWhenReady = true
|
|
909
|
-
if (currentTrack != null) {
|
|
910
|
-
// No-op unless the player is STATE_IDLE (ExoPlayer.prepare early-returns
|
|
911
|
-
// otherwise), so this only reconnects after a stop() or error and never
|
|
912
|
-
// re-buffers a healthy stream. Reconnecting is also how live streams
|
|
913
|
-
// rejoin the live edge on resume.
|
|
914
|
-
exoPlayer.prepare()
|
|
915
|
-
}
|
|
916
1056
|
}
|
|
917
1057
|
|
|
918
|
-
/**
|
|
1058
|
+
/**
|
|
1059
|
+
* No-op unless the track declares `live`; ExoPlayer never marks progressive ICY radio live. A
|
|
1060
|
+
* stream with a live window seeks to its edge; anything else reconnects, which for a non-seekable
|
|
1061
|
+
* stream is the live edge.
|
|
1062
|
+
*/
|
|
919
1063
|
fun seekToLiveEdge() {
|
|
920
|
-
if (
|
|
921
|
-
|
|
922
|
-
|
|
1064
|
+
if (currentTrack?.live != true) return
|
|
1065
|
+
// A receiver loads a live stream again on a seek to its default position.
|
|
1066
|
+
if (!localEngine.reconnectAtLiveEdge()) sessionPlayer.seekToDefaultPosition()
|
|
923
1067
|
}
|
|
924
1068
|
|
|
925
1069
|
/**
|
|
926
|
-
*
|
|
927
|
-
*
|
|
928
|
-
*
|
|
929
|
-
* @param params The structured search parameters (mode, query, artist, album, etc.)
|
|
930
|
-
* @return true if search succeeded and playback started, false otherwise
|
|
1070
|
+
* @return whether a result started playing: false when gated (after onGate), with no results, or
|
|
1071
|
+
* on any error, the browser's registration timeout included.
|
|
931
1072
|
*/
|
|
932
1073
|
suspend fun playFromSearch(params: SearchParams): Boolean {
|
|
933
1074
|
return try {
|
|
934
1075
|
val audioBrowser = awaitBrowser()
|
|
935
|
-
//
|
|
936
|
-
// the gate (mirrors the iOS play-media intent guard). Resolved per request; a gated decision
|
|
937
|
-
// fires onGate(search) and refuses.
|
|
1076
|
+
// Gated like browsing, or voice search would be a way around the gate.
|
|
938
1077
|
val gateOutcome =
|
|
939
1078
|
audioBrowser.gateDecision(
|
|
940
1079
|
NativeGateRequest(reason = GateReason.SEARCH, path = null, search = params)
|
|
@@ -961,61 +1100,60 @@ class Player(internal val context: Context) {
|
|
|
961
1100
|
false
|
|
962
1101
|
}
|
|
963
1102
|
} catch (e: Exception) {
|
|
1103
|
+
currentCoroutineContext().ensureActive()
|
|
964
1104
|
Timber.e(e, "Error handling voice search: ${params}")
|
|
965
1105
|
false
|
|
966
1106
|
}
|
|
967
1107
|
}
|
|
968
1108
|
|
|
1109
|
+
/** An ended queue stays ended, as on an ended engine. */
|
|
969
1110
|
fun prepare() {
|
|
970
|
-
if (currentTrack != null)
|
|
971
|
-
exoPlayer.prepare()
|
|
972
|
-
}
|
|
1111
|
+
if (currentTrack != null && playbackState != PlaybackState.ENDED) sessionPlayer.prepare()
|
|
973
1112
|
}
|
|
974
1113
|
|
|
975
1114
|
fun pause() {
|
|
976
|
-
// Through the setter so the eager playWhenReadyCache write holds for the
|
|
977
|
-
// drop direction too — the retry policy reads it off-main before
|
|
978
|
-
// ExoPlayer's listener round-trip syncs it.
|
|
979
1115
|
playWhenReady = false
|
|
980
1116
|
}
|
|
981
1117
|
|
|
982
1118
|
fun togglePlayback() {
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
|
|
1119
|
+
when {
|
|
1120
|
+
// Suppressed with the intent raised: ExoPlayer resumes when focus returns. play() would
|
|
1121
|
+
// request focus again, and during a call that refusal drops the intent.
|
|
1122
|
+
playWhenReady && !shouldPlayWhenReady -> Unit
|
|
1123
|
+
PlayingStateFactory.derive(shouldPlayWhenReady, playbackState).playing -> pause()
|
|
1124
|
+
else -> play()
|
|
987
1125
|
}
|
|
988
1126
|
}
|
|
989
1127
|
|
|
990
|
-
/**
|
|
991
|
-
* Stops playback, without clearing the active track. Calling this method will cause the playback
|
|
992
|
-
* state to transition to State.NONE and the player will release the loaded media and resources
|
|
993
|
-
* required for playback.
|
|
994
|
-
*/
|
|
1128
|
+
/** Keeps the queue; the state becomes STOPPED. */
|
|
995
1129
|
fun stop() {
|
|
996
|
-
|
|
997
|
-
//
|
|
998
|
-
// is emitted (direct field assignment bypasses events — see its docstring).
|
|
1130
|
+
nowPlaying.clearTimedMetadata()
|
|
1131
|
+
// State first, so the state machine's STOPPED guard swallows the PAUSED the drop below causes.
|
|
999
1132
|
setPlaybackState(PlaybackState.STOPPED)
|
|
1133
|
+
val ended = sessionPlayer.playbackState == MediaPlayer.STATE_ENDED
|
|
1000
1134
|
playWhenReady = false
|
|
1001
|
-
|
|
1135
|
+
// The next play is a new Load.
|
|
1136
|
+
retryLoop?.suspend()
|
|
1137
|
+
sessionPlayer.stop()
|
|
1138
|
+
playerListener.fenceOutgoingMetadata()
|
|
1139
|
+
// Idle at its end, the next prepare would end it again at once.
|
|
1140
|
+
if (ended) sessionPlayer.seekToDefaultPosition()
|
|
1002
1141
|
}
|
|
1003
1142
|
|
|
1004
1143
|
fun clear() {
|
|
1005
|
-
|
|
1144
|
+
sessionPlayer.clearMediaItems()
|
|
1006
1145
|
queueSourcePath = null
|
|
1007
1146
|
}
|
|
1008
1147
|
|
|
1009
|
-
/**
|
|
1010
|
-
* Stops and destroys the player. Only call this when you are finished using the player, otherwise
|
|
1011
|
-
* use [pause].
|
|
1012
|
-
*/
|
|
1148
|
+
/** Idempotent. */
|
|
1013
1149
|
fun destroy() {
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
//
|
|
1018
|
-
|
|
1150
|
+
if (destroyed) return
|
|
1151
|
+
destroyed = true
|
|
1152
|
+
deferredSetup = null
|
|
1153
|
+
// stop() saves only if playing; before it, so its STOPPED doesn't defeat the ENDED guard.
|
|
1154
|
+
playbackStateStore.stopPeriodicSave()
|
|
1155
|
+
// An armed timer would fire pause() into the released player. Cleared before the release,
|
|
1156
|
+
// while a mid-ramp fade can still restore the volume.
|
|
1019
1157
|
sleepTimer.clear()
|
|
1020
1158
|
stop()
|
|
1021
1159
|
nowPlaying.destroy()
|
|
@@ -1023,6 +1161,7 @@ class Player(internal val context: Context) {
|
|
|
1023
1161
|
forwardingPlayer.removeListener(playerListener)
|
|
1024
1162
|
automaticBufferManager?.detach()
|
|
1025
1163
|
automaticBufferManager = null
|
|
1164
|
+
remoteOutputs.release()
|
|
1026
1165
|
exoPlayer.release()
|
|
1027
1166
|
cache?.release()
|
|
1028
1167
|
cache = null
|
|
@@ -1032,56 +1171,88 @@ class Player(internal val context: Context) {
|
|
|
1032
1171
|
|
|
1033
1172
|
fun seekTo(duration: Long, unit: TimeUnit) {
|
|
1034
1173
|
val positionMs = TimeUnit.MILLISECONDS.convert(duration, unit)
|
|
1035
|
-
|
|
1174
|
+
sessionPlayer.seekTo(positionMs)
|
|
1036
1175
|
}
|
|
1037
1176
|
|
|
1038
1177
|
fun seekBy(offset: Long, unit: TimeUnit) {
|
|
1039
|
-
val positionMs =
|
|
1040
|
-
|
|
1178
|
+
val positionMs = sessionPlayer.currentPosition + TimeUnit.MILLISECONDS.convert(offset, unit)
|
|
1179
|
+
sessionPlayer.seekTo(positionMs)
|
|
1041
1180
|
}
|
|
1042
1181
|
|
|
1043
1182
|
/**
|
|
1044
|
-
*
|
|
1045
|
-
*
|
|
1046
|
-
* read on ExoPlayer's loader thread.
|
|
1183
|
+
* Bumped on track change so an [onLoadFailure] post for the outgoing track is dropped. Written on
|
|
1184
|
+
* main, read on ExoPlayer's playback thread.
|
|
1047
1185
|
*/
|
|
1048
1186
|
@Volatile private var retryingErrorGeneration = 0
|
|
1049
1187
|
|
|
1050
1188
|
/**
|
|
1051
|
-
*
|
|
1052
|
-
*
|
|
1053
|
-
*
|
|
1054
|
-
*
|
|
1189
|
+
* A recoverable load failure, on ExoPlayer's playback thread. Posted to main ahead of the state
|
|
1190
|
+
* changes it causes, so the retry loop holds the engine before its READY blip or error arrives.
|
|
1191
|
+
* It also attaches the failure to the current state, for UIs to show over the spinner: not an
|
|
1192
|
+
* ERROR and not [Callbacks.onPlaybackError], which stays terminal.
|
|
1055
1193
|
*/
|
|
1056
|
-
|
|
1194
|
+
internal fun onLoadFailure(exception: IOException, inPlace: Boolean) {
|
|
1195
|
+
val atMs = SystemClock.elapsedRealtime()
|
|
1196
|
+
lastLoadFailure = exception
|
|
1057
1197
|
val error = PlaybackErrorClassifier.retryingLoadError(exception, networkMonitor.getOnline())
|
|
1058
1198
|
val generation = retryingErrorGeneration
|
|
1059
1199
|
mainHandler.post {
|
|
1060
|
-
// The track changed while this post was in flight — the error belongs to the old one.
|
|
1061
1200
|
if (generation != retryingErrorGeneration) return@post
|
|
1062
|
-
|
|
1063
|
-
|
|
1064
|
-
// any state change — an advisory attached there would never clear.
|
|
1065
|
-
if (
|
|
1066
|
-
playbackState != PlaybackState.LOADING &&
|
|
1067
|
-
playbackState != PlaybackState.BUFFERING &&
|
|
1068
|
-
playbackState != PlaybackState.PAUSED
|
|
1069
|
-
) {
|
|
1070
|
-
return@post
|
|
1071
|
-
}
|
|
1072
|
-
// Each failed attempt re-reports; identical repeats add nothing (and would
|
|
1073
|
-
// re-render now-playing every backoff tick).
|
|
1074
|
-
if (playbackError == error) return@post
|
|
1075
|
-
playbackError = error
|
|
1076
|
-
callbacks?.onPlaybackChanged(Playback(playbackState, error))
|
|
1077
|
-
nowPlaying.render()
|
|
1201
|
+
if (localEngine.isActive) retryLoop?.connectionFailed(inPlace, atMs)
|
|
1202
|
+
showRetryingError(error)
|
|
1078
1203
|
}
|
|
1079
1204
|
}
|
|
1080
1205
|
|
|
1206
|
+
private fun showRetryingError(error: PlaybackError) {
|
|
1207
|
+
// Paused, the retry would run unseen and its failure be terminal. STOPPED, ERROR and ENDED
|
|
1208
|
+
// reach here only from a post that raced them.
|
|
1209
|
+
if (
|
|
1210
|
+
!playWhenReady &&
|
|
1211
|
+
playbackState !in setOf(PlaybackState.STOPPED, PlaybackState.ERROR, PlaybackState.ENDED)
|
|
1212
|
+
) {
|
|
1213
|
+
return stopRetrying()
|
|
1214
|
+
}
|
|
1215
|
+
// Only over a spinner: while PLAYING, buffered audio still plays and ExoPlayer's in-place
|
|
1216
|
+
// retry can succeed with no state change, so an error attached there would never clear.
|
|
1217
|
+
if (
|
|
1218
|
+
playbackState != PlaybackState.LOADING &&
|
|
1219
|
+
playbackState != PlaybackState.BUFFERING &&
|
|
1220
|
+
playbackState != PlaybackState.PAUSED
|
|
1221
|
+
) {
|
|
1222
|
+
return
|
|
1223
|
+
}
|
|
1224
|
+
// Each backoff tick re-reports the same error.
|
|
1225
|
+
if (playbackError == error) return
|
|
1226
|
+
playbackError = error
|
|
1227
|
+
callbacks?.onPlaybackChanged(Playback(playbackState, error))
|
|
1228
|
+
nowPlaying.render()
|
|
1229
|
+
}
|
|
1230
|
+
|
|
1231
|
+
/**
|
|
1232
|
+
* Cancels the retry a dropped play intent leaves scheduled. No-op unless a retrying error shows.
|
|
1233
|
+
*/
|
|
1234
|
+
internal fun cancelRetry() {
|
|
1235
|
+
// The ENDED path drops the intent before it clears the error.
|
|
1236
|
+
if (playbackError?.retrying != true || playbackState == PlaybackState.ENDED) return
|
|
1237
|
+
stopRetrying()
|
|
1238
|
+
}
|
|
1239
|
+
|
|
1240
|
+
/**
|
|
1241
|
+
* Gives up a load ExoPlayer would retry. The engine idles in PAUSED, where the next prepare()
|
|
1242
|
+
* reloads where it failed.
|
|
1243
|
+
*/
|
|
1244
|
+
private fun stopRetrying() {
|
|
1245
|
+
// Before the stop: the state machine holds PAUSED through the IDLE that follows.
|
|
1246
|
+
setPlaybackState(PlaybackState.PAUSED)
|
|
1247
|
+
clearRetryingError()
|
|
1248
|
+
exoPlayer.stop()
|
|
1249
|
+
// An engine the loop already holds idle leaves no IDLE for the listener to see.
|
|
1250
|
+
retryLoop?.engineStopped()
|
|
1251
|
+
}
|
|
1252
|
+
|
|
1081
1253
|
/**
|
|
1082
|
-
* Drops
|
|
1083
|
-
*
|
|
1084
|
-
* error would linger over the new one's spinner.
|
|
1254
|
+
* Drops the retrying error of a track that is gone. The new track may stay LOADING or BUFFERING
|
|
1255
|
+
* with no state change to emit the clear.
|
|
1085
1256
|
*/
|
|
1086
1257
|
internal fun clearRetryingError() {
|
|
1087
1258
|
retryingErrorGeneration++
|
|
@@ -1091,56 +1262,36 @@ class Player(internal val context: Context) {
|
|
|
1091
1262
|
nowPlaying.render()
|
|
1092
1263
|
}
|
|
1093
1264
|
|
|
1094
|
-
/**
|
|
1095
|
-
* Updates the player state and emits a state change event if the state has changed. Only emits an
|
|
1096
|
-
* event if the new state differs from the current state.
|
|
1097
|
-
*
|
|
1098
|
-
* IMPORTANT: This method also triggers the queue ended event when the player reaches State.ENDED
|
|
1099
|
-
* and is on the last track. All state transitions should go through this method to ensure proper
|
|
1100
|
-
* event dispatching. Direct assignments to playerState will bypass event emission.
|
|
1101
|
-
*
|
|
1102
|
-
* @param state The new player state to set
|
|
1103
|
-
*/
|
|
1265
|
+
/** Every state change goes through here: it emits the change and the events that follow it. */
|
|
1104
1266
|
internal fun setPlaybackState(state: PlaybackState) {
|
|
1105
1267
|
if (state != playbackState) {
|
|
1106
1268
|
val oldState = playbackState
|
|
1107
1269
|
playbackState = state
|
|
1108
1270
|
|
|
1109
|
-
|
|
1110
|
-
//
|
|
1111
|
-
if (state == PlaybackState.
|
|
1112
|
-
hasPlayedCache = true
|
|
1113
|
-
}
|
|
1271
|
+
forwardingPlayer.onStateChanged(oldState)
|
|
1272
|
+
// Whatever restarts playback from it starts a new Load.
|
|
1273
|
+
if (state == PlaybackState.ERROR) retryLoop?.suspend()
|
|
1114
1274
|
|
|
1115
|
-
// A natural end exhausts the play intent
|
|
1116
|
-
//
|
|
1117
|
-
//
|
|
1118
|
-
// periodic position save running. Cleared and emitted before the state /
|
|
1119
|
-
// queue-ended callbacks so JS observes the native order (intent → state →
|
|
1120
|
-
// queueEnded); the media3 listener's later echo is deduplicated by
|
|
1121
|
-
// emitPlayWhenReadyChanged. The state machine's ENDED guard keeps the drop
|
|
1122
|
-
// from re-reporting the state as PAUSED.
|
|
1275
|
+
// A natural end exhausts the play intent; held, it inverts the toggle, keeps audio focus and
|
|
1276
|
+
// the periodic save. Emitted before the state and queue-ended callbacks, matching iOS. The
|
|
1277
|
+
// state machine's ENDED guard keeps the drop from reporting PAUSED.
|
|
1123
1278
|
if (state == PlaybackState.ENDED && playWhenReady) {
|
|
1124
1279
|
playWhenReady = false
|
|
1125
1280
|
emitPlayWhenReadyChanged(false)
|
|
1126
1281
|
}
|
|
1127
1282
|
|
|
1128
|
-
// The last track fires no AUTO
|
|
1129
|
-
// end-of-track sleep timer would stay set forever and pause the next
|
|
1130
|
-
// track played instead.
|
|
1283
|
+
// The last track fires no AUTO transition, so the end-of-track sleep timer would stay armed.
|
|
1131
1284
|
if (state == PlaybackState.ENDED) {
|
|
1132
1285
|
sleepTimer.onTrackEnd()
|
|
1133
1286
|
}
|
|
1134
1287
|
|
|
1135
|
-
// Clear error when transitioning away from error state
|
|
1136
1288
|
if (oldState == PlaybackState.ERROR) {
|
|
1137
1289
|
playbackError = null
|
|
1138
1290
|
callbacks?.onPlaybackError(null)
|
|
1139
1291
|
}
|
|
1140
1292
|
|
|
1141
|
-
// A retrying error rides
|
|
1142
|
-
//
|
|
1143
|
-
// it, before the Playback below is built so the emitted event is already clean.
|
|
1293
|
+
// A retrying error rides through LOADING, BUFFERING and PAUSED; any other state proves
|
|
1294
|
+
// recovery or abandons the attempt.
|
|
1144
1295
|
if (
|
|
1145
1296
|
playbackError?.retrying == true &&
|
|
1146
1297
|
state != PlaybackState.LOADING &&
|
|
@@ -1153,25 +1304,16 @@ class Player(internal val context: Context) {
|
|
|
1153
1304
|
val playback = Playback(state, playbackError)
|
|
1154
1305
|
callbacks?.onPlaybackChanged(playback)
|
|
1155
1306
|
|
|
1156
|
-
//
|
|
1157
|
-
// `playbackState` (plus isRebuffering / isOnline / error), so any transition can change its
|
|
1158
|
-
// output — the live song while paused, a "Reconnecting…" line on a rebuffer, an offline/error
|
|
1159
|
-
// line. The publish-dedupe in applyNowPlayingFields drops redundant updates, so re-running
|
|
1160
|
-
// through the rapid startup sequence (none→loading→buffering→ready→playing) is cheap.
|
|
1307
|
+
// The formatter sees the state, so any transition can change what it renders.
|
|
1161
1308
|
nowPlaying.render()
|
|
1162
1309
|
|
|
1163
|
-
//
|
|
1164
|
-
// conceptually end the queue (matches web's endsQueue()): an ENDED that surfaces while
|
|
1165
|
-
// repeating (e.g. a seek to the end) must not read as "playlist over".
|
|
1166
|
-
// This coupling ensures queue ended events are always triggered consistently with state
|
|
1167
|
-
// changes
|
|
1310
|
+
// A repeat mode never ends the queue, even on an ENDED from a seek to the end.
|
|
1168
1311
|
if (state == PlaybackState.ENDED && isLastInPlaybackOrder && repeatMode == RepeatMode.OFF) {
|
|
1169
1312
|
currentIndex?.let { index ->
|
|
1170
1313
|
val event =
|
|
1171
1314
|
PlaybackQueueEndedEvent(track = index.toDouble(), position = position.toSeconds())
|
|
1172
1315
|
callbacks?.onPlaybackQueueEnded(event)
|
|
1173
1316
|
}
|
|
1174
|
-
// Reset saved position to 0 so resumption starts from beginning
|
|
1175
1317
|
playbackStateStore.savePositionZero()
|
|
1176
1318
|
}
|
|
1177
1319
|
|
|
@@ -1181,11 +1323,7 @@ class Player(internal val context: Context) {
|
|
|
1181
1323
|
}
|
|
1182
1324
|
}
|
|
1183
1325
|
|
|
1184
|
-
/**
|
|
1185
|
-
* Sets the progress update interval.
|
|
1186
|
-
*
|
|
1187
|
-
* @param interval The interval in seconds, or null to disable progress updates
|
|
1188
|
-
*/
|
|
1326
|
+
/** [interval] in seconds; null stops the progress events. */
|
|
1189
1327
|
fun setProgressUpdateInterval(interval: Double?) {
|
|
1190
1328
|
progressTimer.setInterval(interval)
|
|
1191
1329
|
}
|
|
@@ -1194,21 +1332,11 @@ class Player(internal val context: Context) {
|
|
|
1194
1332
|
intervalTimer.setInterval(if (enabled) 1.0 else null)
|
|
1195
1333
|
}
|
|
1196
1334
|
|
|
1197
|
-
/**
|
|
1198
|
-
* Applies update options with change detection. Only updates properties that have actually
|
|
1199
|
-
* changed and emits events accordingly.
|
|
1200
|
-
*
|
|
1201
|
-
* @param options The new options to apply
|
|
1202
|
-
* @param mediaSession The MediaSession to update when capabilities change
|
|
1203
|
-
*/
|
|
1204
1335
|
fun applyOptions(options: PlayerUpdateOptions) {
|
|
1205
|
-
// Store previous values for change detection
|
|
1206
1336
|
val previousOptions = this.options
|
|
1207
1337
|
|
|
1208
|
-
// Update current options
|
|
1209
1338
|
this.options = options.copy()
|
|
1210
1339
|
|
|
1211
|
-
// Check what changed
|
|
1212
1340
|
val skipSilenceChanged = previousOptions.skipSilence != options.skipSilence
|
|
1213
1341
|
val progressUpdateEventIntervalChanged =
|
|
1214
1342
|
previousOptions.progressUpdateEventInterval != options.progressUpdateEventInterval
|
|
@@ -1231,23 +1359,25 @@ class Player(internal val context: Context) {
|
|
|
1231
1359
|
remoteButtonLayoutChanged ||
|
|
1232
1360
|
appKilledPlaybackBehaviorChanged
|
|
1233
1361
|
|
|
1234
|
-
// Apply only changed properties
|
|
1235
1362
|
if (skipSilenceChanged) {
|
|
1236
1363
|
skipSilence = options.skipSilence
|
|
1237
1364
|
}
|
|
1238
1365
|
|
|
1239
1366
|
if (capabilitiesChanged) {
|
|
1240
|
-
// The
|
|
1241
|
-
//
|
|
1242
|
-
browser?.browserManager?.
|
|
1367
|
+
// The favorite capability is the one favoriting switch; the browser hydrates row hearts from
|
|
1368
|
+
// it.
|
|
1369
|
+
browser?.browserManager?.setFavoriteEnabled(options.capabilities.favoriteEnabled)
|
|
1370
|
+
TrackFactory.favoriteEnabled = options.capabilities.favoriteEnabled
|
|
1371
|
+
if (previousOptions.capabilities.favoriteEnabled != options.capabilities.favoriteEnabled) {
|
|
1372
|
+
restampFavorites()
|
|
1373
|
+
}
|
|
1243
1374
|
}
|
|
1244
1375
|
|
|
1245
1376
|
if (progressUpdateEventIntervalChanged) {
|
|
1246
1377
|
setProgressUpdateInterval(options.progressUpdateEventInterval)
|
|
1247
1378
|
}
|
|
1248
1379
|
|
|
1249
|
-
// The jump intervals pick the button icons
|
|
1250
|
-
// interval has to rebuild the layout even when capabilities and placement are untouched.
|
|
1380
|
+
// The jump intervals pick the button icons, so a changed interval rebuilds the layout.
|
|
1251
1381
|
if (
|
|
1252
1382
|
capabilitiesChanged ||
|
|
1253
1383
|
remoteButtonLayoutChanged ||
|
|
@@ -1270,20 +1400,10 @@ class Player(internal val context: Context) {
|
|
|
1270
1400
|
}
|
|
1271
1401
|
}
|
|
1272
1402
|
|
|
1273
|
-
/**
|
|
1274
|
-
* Sets the callbacks for player events.
|
|
1275
|
-
*
|
|
1276
|
-
* @param callbacks The callbacks to set, or null to clear callbacks
|
|
1277
|
-
*/
|
|
1278
1403
|
fun setCallbacks(callbacks: Callbacks?) {
|
|
1279
1404
|
this.callbacks = callbacks
|
|
1280
1405
|
}
|
|
1281
1406
|
|
|
1282
|
-
/**
|
|
1283
|
-
* Gets the current callbacks instance.
|
|
1284
|
-
*
|
|
1285
|
-
* @return The current callbacks, or null if none are set
|
|
1286
|
-
*/
|
|
1287
1407
|
fun getCallbacks(): Callbacks? {
|
|
1288
1408
|
return this.callbacks
|
|
1289
1409
|
}
|
|
@@ -1296,58 +1416,30 @@ class Player(internal val context: Context) {
|
|
|
1296
1416
|
return options
|
|
1297
1417
|
}
|
|
1298
1418
|
|
|
1299
|
-
/**
|
|
1300
|
-
* Gets the current network connectivity state.
|
|
1301
|
-
*
|
|
1302
|
-
* @return true if device is online, false otherwise
|
|
1303
|
-
*/
|
|
1304
1419
|
fun getOnline(): Boolean {
|
|
1305
1420
|
return networkMonitor.getOnline()
|
|
1306
1421
|
}
|
|
1307
1422
|
|
|
1308
|
-
/**
|
|
1309
|
-
* Validates that an index is within bounds [0, trackCount).
|
|
1310
|
-
*
|
|
1311
|
-
* @param index The index to validate.
|
|
1312
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
1313
|
-
*/
|
|
1314
1423
|
private fun validateIndex(index: Int) {
|
|
1315
|
-
if (index < 0 || index >=
|
|
1424
|
+
if (index < 0 || index >= sessionPlayer.mediaItemCount) {
|
|
1316
1425
|
throw IllegalArgumentException(
|
|
1317
|
-
"Track index $index is out of bounds (size: ${
|
|
1426
|
+
"Track index $index is out of bounds (size: ${sessionPlayer.mediaItemCount})"
|
|
1318
1427
|
)
|
|
1319
1428
|
}
|
|
1320
1429
|
}
|
|
1321
1430
|
|
|
1322
|
-
/**
|
|
1323
|
-
* Validates that an insertion index is within bounds [0, trackCount] or -1 (append).
|
|
1324
|
-
*
|
|
1325
|
-
* @param index The index to validate.
|
|
1326
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
1327
|
-
*/
|
|
1328
1431
|
private fun validateInsertIndex(index: Int) {
|
|
1329
|
-
if (index < -1 || index >
|
|
1432
|
+
if (index < -1 || index > sessionPlayer.mediaItemCount) {
|
|
1330
1433
|
throw IllegalArgumentException(
|
|
1331
|
-
"Insert index $index is out of bounds (size: ${
|
|
1434
|
+
"Insert index $index is out of bounds (size: ${sessionPlayer.mediaItemCount}, use -1 to append)"
|
|
1332
1435
|
)
|
|
1333
1436
|
}
|
|
1334
1437
|
}
|
|
1335
1438
|
|
|
1336
|
-
/**
|
|
1337
|
-
* Gets the MediaSessionCallback for this AudioBrowser.
|
|
1338
|
-
*
|
|
1339
|
-
* @return MediaLibrarySession.Callback instance
|
|
1340
|
-
*/
|
|
1341
1439
|
fun getMediaSessionCallback(): MediaLibraryService.MediaLibrarySession.Callback {
|
|
1342
1440
|
return mediaSessionCallback
|
|
1343
1441
|
}
|
|
1344
1442
|
|
|
1345
|
-
/**
|
|
1346
|
-
* Notifies external controllers (Android Auto, etc.) that content at the given path has changed.
|
|
1347
|
-
* Controllers subscribed to this path will refresh their UI.
|
|
1348
|
-
*
|
|
1349
|
-
* @param path The path where content has changed
|
|
1350
|
-
*/
|
|
1351
1443
|
fun notifyContentChanged(path: String) {
|
|
1352
1444
|
mediaSessionCallback.notifyContentChanged(path)
|
|
1353
1445
|
}
|
|
@@ -1356,41 +1448,35 @@ class Player(internal val context: Context) {
|
|
|
1356
1448
|
mediaSessionCallback.invalidateAllContent()
|
|
1357
1449
|
}
|
|
1358
1450
|
|
|
1359
|
-
/**
|
|
1360
|
-
* Returns the recommended artwork size in pixels from the connected media browser (e.g., Android
|
|
1361
|
-
* Auto), or null if not provided.
|
|
1362
|
-
*/
|
|
1451
|
+
/** From the connected media browser (e.g. Android Auto), when it gives one. */
|
|
1363
1452
|
val artworkSizeHintPixels: Int?
|
|
1364
1453
|
get() = mediaSessionCallback.artworkSizeHintPixels
|
|
1365
1454
|
|
|
1366
|
-
/** Returns true if the current media item is a live stream. */
|
|
1367
1455
|
val isCurrentItemLive: Boolean
|
|
1368
|
-
get() =
|
|
1369
|
-
|
|
1370
|
-
// MARK: - Buffer Configuration
|
|
1456
|
+
get() = sessionPlayer.isCurrentMediaItemLive
|
|
1371
1457
|
|
|
1372
1458
|
/**
|
|
1373
|
-
*
|
|
1374
|
-
*
|
|
1375
|
-
*
|
|
1376
|
-
* data is not affected.
|
|
1377
|
-
*
|
|
1378
|
-
* @param config The new buffer configuration to apply.
|
|
1459
|
+
* [position] to set the queue at again, or [C.TIME_UNSET], where Media3 starts at the default
|
|
1460
|
+
* position: for a live item, for 0, which a live item also reports before it has loaded, and
|
|
1461
|
+
* after the end, so the track plays again.
|
|
1379
1462
|
*/
|
|
1463
|
+
internal val restorablePositionMs: Long
|
|
1464
|
+
get() =
|
|
1465
|
+
position.takeUnless {
|
|
1466
|
+
isCurrentItemLive || it == 0L || sessionPlayer.playbackState == MediaPlayer.STATE_ENDED
|
|
1467
|
+
} ?: C.TIME_UNSET
|
|
1468
|
+
|
|
1469
|
+
// MARK: - Buffer Configuration
|
|
1470
|
+
|
|
1471
|
+
/** Takes effect for future buffering; what is buffered stays. */
|
|
1380
1472
|
fun updateBufferConfig(config: BufferConfig) {
|
|
1381
1473
|
loadControl.updateBufferConfig(config)
|
|
1382
1474
|
}
|
|
1383
1475
|
|
|
1384
|
-
/**
|
|
1385
|
-
* Gets the current buffer configuration.
|
|
1386
|
-
*
|
|
1387
|
-
* @return The current buffer configuration.
|
|
1388
|
-
*/
|
|
1389
1476
|
fun getBufferConfig(): BufferConfig {
|
|
1390
1477
|
return loadControl.getBufferConfig()
|
|
1391
1478
|
}
|
|
1392
1479
|
|
|
1393
|
-
/** Resets the buffer configuration to defaults. */
|
|
1394
1480
|
fun resetBufferConfig() {
|
|
1395
1481
|
loadControl.resetToDefaults()
|
|
1396
1482
|
}
|