react-native-audio-browser 0.2.0-next.5 → 0.2.0-next.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -23
- package/android/build.gradle +58 -15
- package/android/gradle.properties +3 -3
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +215 -0
- package/android/src/main/AndroidManifest.xml +14 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +546 -283
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +38 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +18 -2
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +131 -0
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +165 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +41 -11
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +52 -0
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +23 -10
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +315 -213
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +31 -23
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +288 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +97 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +70 -29
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +60 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +20 -3
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +4 -5
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +24 -0
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +10 -6
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +16 -0
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +77 -0
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +63 -0
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +4 -1
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +49 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +34 -12
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +639 -278
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +85 -33
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +88 -44
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +26 -14
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +113 -78
- package/android/src/main/java/com/audiobrowser/player/Player.kt +333 -186
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +33 -16
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +10 -13
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +64 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +98 -0
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +42 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +110 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +696 -0
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +113 -0
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +39 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +59 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +92 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +105 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +69 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +128 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +550 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +99 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +201 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +15 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +66 -0
- package/android/src/main/java/com/audiobrowser/sonos/SpeakerXml.kt +26 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +63 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +63 -0
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +68 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +67 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +168 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +35 -7
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +278 -59
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +39 -0
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +7 -9
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +15 -0
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +61 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -1
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +24 -49
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +23 -1
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +2 -2
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +103 -67
- package/android/src/main/res/values/strings.xml +25 -5
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +18 -0
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +152 -0
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +103 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +39 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +159 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -34
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +346 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +70 -5
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +301 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -55
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +160 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- 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 +477 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +94 -0
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +12 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +109 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +138 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +71 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +212 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +3 -4
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +48 -16
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +136 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +67 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +92 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +213 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +192 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +151 -0
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +275 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteItemTest.kt +61 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteOutputsControllerTest.kt +77 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteQueueTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +815 -0
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +203 -0
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +90 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +73 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +135 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +170 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +174 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +691 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +129 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +165 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosStreamUriTest.kt +64 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +204 -0
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +99 -0
- package/android/src/test/java/com/audiobrowser/sonos/ZoneGroupStateTest.kt +139 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +197 -7
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +325 -4
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +83 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +55 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +162 -0
- package/android/src/test/java/com/audiobrowser/util/NetworkConnectivityMonitorTest.kt +99 -0
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +97 -0
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- 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 +79 -0
- package/ios/AVPlayerEngine.swift +362 -0
- package/ios/AVPlayerEngineCallbacks.swift +14 -0
- package/ios/Browser/BrowseGate.swift +58 -0
- package/ios/Browser/BrowserConfig.swift +115 -81
- package/ios/Browser/BrowserError.swift +16 -0
- package/ios/Browser/BrowserManager.swift +155 -654
- package/ios/Browser/BrowserPathHelper.swift +68 -51
- package/ios/Browser/FavoriteSet.swift +46 -0
- package/ios/Browser/InertStyleDiagnostic.swift +296 -0
- package/ios/Browser/JsonModels.swift +270 -321
- package/ios/Browser/NavigationErrorState.swift +41 -0
- package/ios/Browser/PageResolver.swift +147 -0
- package/ios/Browser/RequestLayer.swift +185 -0
- package/ios/Browser/RequestPipeline.swift +303 -0
- package/ios/Browser/SearchDrillIn.swift +7 -7
- package/ios/Browser/SectionScope.swift +82 -23
- package/ios/Browser/SimpleRouter.swift +73 -144
- package/ios/Browser/StyleResolver.swift +58 -0
- package/ios/Browser/TabBarEntries.swift +9 -3
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CPInterfaceController+Safe.swift +93 -43
- package/ios/CarPlay/CarPlayArtworkResolver.swift +36 -83
- package/ios/CarPlay/CarPlayController.swift +37 -1297
- package/ios/CarPlay/CarPlayImageLoader.swift +91 -163
- package/ios/CarPlay/CarPlayListItemFactory.swift +288 -102
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +137 -177
- package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +91 -0
- package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
- package/ios/CarPlay/CarPlaySession+TabBar.swift +192 -0
- package/ios/CarPlay/CarPlaySession.swift +207 -0
- package/ios/CarPlay/CarPlayTemplates.swift +63 -0
- package/ios/CarPlay/IntentHandlers.swift +96 -0
- package/ios/CarPlay/MediaIntentCriteria.swift +105 -0
- package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +21 -25
- package/ios/CarPlay/MediaIntentPlayback.swift +74 -0
- package/ios/CarPlay/NowPlayingButtonRules.swift +35 -0
- package/ios/CarPlay/RNABAudioBrowser.m +7 -15
- package/ios/CarPlay/SectionPresentation.swift +77 -0
- package/ios/CarPlay/TopTemplateReplacer.swift +96 -0
- package/ios/Extension/Capability+RemoteCommand.swift +22 -69
- package/ios/Extension/NavigationError+Conversion.swift +14 -4
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +13 -15
- package/ios/Extension/SearchParams+Query.swift +28 -0
- package/ios/Extension/Section+Copying.swift +29 -0
- package/ios/Extension/String+IcyCharset.swift +21 -0
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -4
- package/ios/Extension/Track+AVPlayer.swift +0 -16
- package/ios/Extension/Track+Copying.swift +11 -13
- package/ios/Extension/Track+Identity.swift +25 -0
- package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
- package/ios/Extension/UIImage+Adaptive.swift +12 -0
- package/ios/Extension/URLError+Connectivity.swift +15 -0
- package/ios/Http/HttpClient.swift +71 -165
- package/ios/HybridAudioBrowser+Browser.swift +136 -0
- package/ios/HybridAudioBrowser+Options.swift +105 -0
- package/ios/HybridAudioBrowser+Player.swift +341 -0
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +157 -0
- package/ios/HybridAudioBrowser+Stubs.swift +46 -0
- package/ios/HybridAudioBrowser.swift +131 -1652
- package/ios/Model/NitroTypeStubs.swift +239 -24
- package/ios/Model/PlayerUpdateOptions.swift +10 -1
- package/ios/Model/RemoteCommand.swift +6 -60
- package/ios/Model/TrackPlayerError.swift +6 -2
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +18 -53
- package/ios/Observer/ItemObserver.swift +90 -0
- package/ios/Observer/PlayerObserver.swift +59 -0
- package/ios/Option/SessionCategories.swift +42 -92
- package/ios/Player/AudioSessionController.swift +191 -0
- package/ios/Player/DeferredSeek.swift +70 -0
- package/ios/Player/ErrorStatus.swift +50 -0
- package/ios/Player/MediaLoader.swift +66 -87
- package/ios/Player/NowPlayingLines.swift +52 -0
- package/ios/Player/NowPlayingUpdater.swift +182 -85
- package/ios/Player/PlaybackFailure.swift +125 -0
- package/ios/Player/PlaybackPersistence.swift +73 -0
- package/ios/Player/PlaybackTimer.swift +8 -2
- package/ios/Player/Player.swift +975 -0
- package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
- package/ios/Player/PlayerEngine.swift +104 -0
- package/ios/Player/PlayerStatusTypes.swift +2 -6
- package/ios/Player/QueueManager.swift +93 -67
- package/ios/Player/RetryLoop.swift +291 -0
- package/ios/Player/ShuffleOrder.swift +33 -0
- package/ios/Player/SleepTimerManager.swift +14 -16
- package/ios/Player/VolumeFader.swift +5 -0
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +43 -0
- package/ios/RemoteCommand/RemoteCommandController.swift +100 -333
- package/ios/Tests/ArtworkFreshnessTests.swift +67 -0
- package/ios/Tests/BrowserPathHelperTests.swift +89 -15
- package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
- package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
- package/ios/Tests/ConcurrentMapTests.swift +42 -0
- package/ios/Tests/DeferredSeekTests.swift +70 -0
- package/ios/Tests/EmitterTests.swift +22 -38
- package/ios/Tests/ErrorStatusTests.swift +50 -0
- package/ios/Tests/FavoriteSetTests.swift +60 -0
- package/ios/Tests/GenerationMemoTests.swift +121 -0
- package/ios/Tests/InertStyleDiagnosticTests.swift +209 -0
- package/ios/Tests/JsonModelsTests.swift +194 -1
- package/ios/Tests/LRUCacheTests.swift +110 -0
- package/ios/Tests/MediaIntentCriteriaTests.swift +57 -46
- package/ios/Tests/MediaLoaderTests.swift +36 -67
- 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 +76 -0
- package/ios/Tests/PlaybackFailureTests.swift +189 -0
- package/ios/Tests/PlaybackPersistenceTests.swift +93 -0
- package/ios/Tests/PlayerInvalidTrackTests.swift +65 -0
- package/ios/Tests/PlayerPolicyTests.swift +460 -0
- package/ios/Tests/{PlaybackCoordinatorTests.swift → PlayerTests.swift} +573 -395
- package/ios/Tests/PlayingStateTests.swift +42 -0
- package/ios/Tests/QueueManagerTests.swift +196 -115
- package/ios/Tests/ReadyValueTests.swift +73 -0
- package/ios/Tests/RemoteCommandControllerTests.swift +181 -0
- package/ios/Tests/RequestLayerTests.swift +228 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -35
- package/ios/Tests/RetryLoopTests.swift +305 -0
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SearchParamsQueryTests.swift +48 -0
- package/ios/Tests/SectionPresentationTests.swift +98 -0
- package/ios/Tests/SectionScopeTests.swift +139 -54
- package/ios/Tests/SimpleRouterTests.swift +38 -3
- package/ios/Tests/SleepTimerManagerTests.swift +65 -41
- package/ios/Tests/StyleResolverTests.swift +132 -0
- package/ios/Tests/Support/TestTypes.swift +146 -101
- package/ios/Tests/TabBarEntriesTests.swift +19 -19
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +42 -0
- package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
- package/ios/TrackSelector.swift +62 -65
- package/ios/Util/ArtworkFreshness.swift +42 -0
- package/ios/Util/ArtworkImageFetcher.swift +143 -5
- package/ios/Util/ConcurrentMap.swift +19 -0
- package/ios/Util/Emitter.swift +40 -12
- package/ios/Util/GenerationMemo.swift +36 -0
- package/ios/Util/LRUCache.swift +23 -159
- package/ios/Util/NetworkMonitor.swift +32 -32
- package/ios/Util/OutputPicker.swift +48 -0
- package/ios/Util/ReadyValue.swift +56 -0
- package/ios/Util/SFSymbolRenderer.swift +59 -31
- package/ios/Util/SVGProcessor.swift +9 -12
- package/lib/commonjs/AudioBrowser.js +8 -8
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/CLAUDE.md +52 -0
- package/lib/commonjs/features/browser-config.js +12 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +11 -3
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +1 -1
- package/lib/commonjs/features/equalizer.js +1 -1
- package/lib/commonjs/features/errors.js +3 -3
- package/lib/commonjs/features/favorites.js +14 -11
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +16 -1
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +20 -3
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +1 -1
- package/lib/commonjs/features/nowPlaying.js +1 -1
- package/lib/commonjs/features/output.js +4 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +1 -1
- package/lib/commonjs/features/playback/playing.js +1 -1
- package/lib/commonjs/features/playback/progress.js +3 -2
- 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 +3 -4
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +0 -6
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +1 -1
- package/lib/commonjs/features/player/options.js +3 -19
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +7 -3
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +23 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -0
- package/lib/commonjs/features/queue/activeTrack.js +15 -4
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +13 -6
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +1 -1
- package/lib/commonjs/features/queue/shuffle.js +1 -1
- package/lib/commonjs/features/remoteControls.js +13 -92
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +13 -1
- 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 +28 -14
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +202 -77
- 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 +254 -39
- 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 +33 -12
- 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/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 +62 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +2 -1
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/CLAUDE.md +52 -0
- package/lib/module/features/browser-config.js +12 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +11 -3
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +1 -1
- package/lib/module/features/equalizer.js +1 -1
- package/lib/module/features/errors.js +3 -3
- package/lib/module/features/favorites.js +14 -11
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +16 -1
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +20 -3
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +1 -1
- package/lib/module/features/nowPlaying.js +1 -1
- package/lib/module/features/output.js +4 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +1 -1
- package/lib/module/features/playback/playing.js +1 -1
- package/lib/module/features/playback/progress.js +3 -2
- 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 +3 -4
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +0 -5
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +1 -1
- package/lib/module/features/player/options.js +2 -17
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +6 -2
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +19 -0
- package/lib/module/features/player/validateOptions.js.map +1 -0
- package/lib/module/features/queue/activeTrack.js +15 -4
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +13 -6
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +1 -1
- package/lib/module/features/queue/shuffle.js +1 -1
- package/lib/module/features/remoteControls.js +13 -92
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +13 -1
- 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 +28 -14
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +202 -77
- 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 +254 -39
- 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 +33 -12
- 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/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 +62 -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 -1
- package/lib/typescript/src/AudioBrowser.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 +10 -2
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +1 -1
- package/lib/typescript/src/features/errors.d.ts +3 -3
- package/lib/typescript/src/features/favorites.d.ts +14 -11
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +18 -2
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +20 -3
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +1 -1
- package/lib/typescript/src/features/output.d.ts +4 -3
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +1 -1
- 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 +3 -4
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +1 -1
- package/lib/typescript/src/features/player/options.d.ts +24 -21
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +46 -1
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +2 -0
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -0
- package/lib/typescript/src/features/queue/activeTrack.d.ts +9 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +7 -4
- 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/shuffle.d.ts +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +23 -22
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +1 -1
- 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 +387 -126
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +93 -61
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +19 -16
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -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/useNativeValueRefreshedBy.d.ts +21 -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 +72 -44
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +3 -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 +3 -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 +788 -641
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +31 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +33 -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 +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -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 +1 -1
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +1 -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 +24 -11
- package/src/AudioBrowser.ts +2 -1
- package/src/CLAUDE.md +52 -0
- package/src/features/battery.test.ts +79 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +12 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +11 -3
- package/src/features/carConnection.ts +1 -1
- package/src/features/equalizer.ts +1 -1
- package/src/features/errors.ts +3 -3
- package/src/features/favorites.ts +14 -11
- package/src/features/gate.ts +16 -1
- package/src/features/hook-wiring.test.ts +302 -0
- package/src/features/metadata.ts +20 -3
- package/src/features/network.ts +1 -1
- package/src/features/nowPlaying.ts +1 -1
- package/src/features/output.ts +4 -3
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/playWhenReady.ts +1 -1
- package/src/features/playback/playing.ts +1 -1
- package/src/features/playback/progress.test.ts +169 -0
- package/src/features/playback/progress.ts +3 -2
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +3 -4
- package/src/features/playback/trackPlaybackTime.test.ts +16 -6
- package/src/features/playback/trackPlaybackTime.ts +1 -6
- package/src/features/playback/volume.ts +1 -1
- package/src/features/player/options.ts +31 -40
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +58 -5
- package/src/features/player/validateOptions.ts +21 -0
- package/src/features/queue/activeTrack.ts +15 -4
- package/src/features/queue/queue.ts +13 -6
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +1 -1
- package/src/features/remoteControls.ts +13 -92
- package/src/features/sleepTimer.test.ts +172 -0
- package/src/features/sleepTimer.ts +9 -1
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +147 -0
- package/src/specs/audio-browser.nitro.ts +10 -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 +403 -134
- package/src/types/browser.ts +97 -63
- package/src/utils/LazyNativeEmitter.ts +28 -15
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useDebug.test.ts +182 -0
- package/src/utils/useNativeUpdatedValue.test.ts +103 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
- package/src/web/NativeAudioBrowser.ts +241 -84
- 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 +5 -3
- package/src/web/TrackPlayer/Player.load.test.ts +137 -1
- package/src/web/TrackPlayer/Player.ts +284 -37
- 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 +33 -14
- 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/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 +70 -13
- package/website/guide/android-auto.md +114 -0
- package/website/guide/android-certificates.md +409 -0
- package/website/guide/artwork.md +255 -0
- package/website/guide/audio-output.md +339 -0
- package/website/guide/automotive.md +86 -0
- package/website/guide/basic-usage.md +151 -0
- package/website/guide/battery.md +115 -0
- package/website/guide/browser.md +587 -0
- package/website/guide/carplay.md +650 -0
- package/website/guide/configuration.md +179 -0
- package/website/guide/equalizer.md +231 -0
- package/website/guide/errors.md +310 -0
- package/website/guide/favorites.md +154 -0
- package/website/guide/gate.md +143 -0
- package/website/guide/getting-started.md +46 -0
- package/website/guide/hooks.md +238 -0
- package/website/guide/live-streams.md +125 -0
- package/website/guide/metadata.md +239 -0
- package/website/guide/migrating-from-track-player.md +244 -0
- package/website/guide/native-callback-fetch.md +127 -0
- package/website/guide/network.md +86 -0
- package/website/guide/now-playing.md +175 -0
- package/website/guide/playback.md +328 -0
- package/website/guide/queue.md +300 -0
- package/website/guide/remote-controls.md +256 -0
- package/website/guide/search.md +255 -0
- package/website/guide/sleep-timer.md +268 -0
- package/website/guide/track.md +247 -0
- 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/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 -322
- 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/LoadSeekCoordinatorTests.swift +0 -325
- package/ios/Tests/MediaResolveTests.swift +0 -126
- package/ios/Tests/OnceValueTests.swift +0 -79
- package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
- package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
- package/ios/Tests/PlayingStateManagerTests.swift +0 -57
- package/ios/Tests/RetryManagerTests.swift +0 -89
- package/ios/TrackPlayer.swift +0 -1014
- package/ios/TrackPlayerCallbacks.swift +0 -86
- 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
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
package com.audiobrowser.player
|
|
2
2
|
|
|
3
3
|
import android.os.Bundle
|
|
4
|
+
import androidx.core.content.ContextCompat
|
|
4
5
|
import androidx.media3.common.MediaItem
|
|
5
6
|
import androidx.media3.common.MediaMetadata
|
|
6
7
|
import androidx.media3.common.Rating
|
|
@@ -11,22 +12,35 @@ import androidx.media3.session.MediaSession
|
|
|
11
12
|
import androidx.media3.session.SessionCommand
|
|
12
13
|
import androidx.media3.session.SessionError
|
|
13
14
|
import androidx.media3.session.SessionResult
|
|
15
|
+
import com.audiobrowser.browser.BrowserManager
|
|
14
16
|
import com.audiobrowser.browser.handleTrackLoad
|
|
17
|
+
import com.audiobrowser.browser.normalizedSections
|
|
18
|
+
import com.audiobrowser.browser.styleResolvedSections
|
|
19
|
+
import com.audiobrowser.browser.untitledSection
|
|
20
|
+
import com.audiobrowser.extension.indexOfTappedTrack
|
|
15
21
|
import com.audiobrowser.extension.toTrack
|
|
22
|
+
import com.audiobrowser.navigationErrorFor
|
|
23
|
+
import com.audiobrowser.util.Automotive
|
|
16
24
|
import com.audiobrowser.util.BrowserPathHelper
|
|
17
25
|
import com.audiobrowser.util.RatingFavorites
|
|
18
26
|
import com.audiobrowser.util.TrackFactory
|
|
27
|
+
import com.audiobrowser.util.isAutomotive
|
|
19
28
|
import com.google.common.collect.ImmutableList
|
|
29
|
+
import com.google.common.util.concurrent.FutureCallback
|
|
20
30
|
import com.google.common.util.concurrent.Futures
|
|
21
31
|
import com.google.common.util.concurrent.ListenableFuture
|
|
32
|
+
import com.margelo.nitro.audiobrowser.FormattedNavigationError
|
|
22
33
|
import com.margelo.nitro.audiobrowser.Gate
|
|
23
34
|
import com.margelo.nitro.audiobrowser.GateEvent
|
|
24
35
|
import com.margelo.nitro.audiobrowser.GateReason
|
|
25
36
|
import com.margelo.nitro.audiobrowser.MediaReference
|
|
26
37
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
38
|
+
import com.margelo.nitro.audiobrowser.NavigationError
|
|
39
|
+
import com.margelo.nitro.audiobrowser.NavigationErrorType
|
|
27
40
|
import com.margelo.nitro.audiobrowser.PlayerCapabilities
|
|
28
41
|
import com.margelo.nitro.audiobrowser.RemoteButtonLayout
|
|
29
42
|
import com.margelo.nitro.audiobrowser.SearchParams
|
|
43
|
+
import com.margelo.nitro.audiobrowser.Section
|
|
30
44
|
import com.margelo.nitro.audiobrowser.Track
|
|
31
45
|
import kotlinx.coroutines.CancellationException
|
|
32
46
|
import kotlinx.coroutines.CoroutineScope
|
|
@@ -40,12 +54,16 @@ import kotlinx.coroutines.withContext
|
|
|
40
54
|
import timber.log.Timber
|
|
41
55
|
|
|
42
56
|
/**
|
|
43
|
-
*
|
|
44
|
-
*
|
|
57
|
+
* Everything the MediaLibrarySession serves except transport: browse, search, item lookup, queue
|
|
58
|
+
* building, playback resumption, and the favorite and rating commands. Transport does not arrive
|
|
59
|
+
* here — it reaches the player through [InterceptingPlayer], and Assistant's play-from-search
|
|
60
|
+
* arrives as an intent handled in the service. The callbacks that answer through [scope] run on IO,
|
|
61
|
+
* so anything touching the ExoPlayer instance hops back to [Dispatchers.Main]; the rest answer
|
|
62
|
+
* synchronously on the Media3 application thread.
|
|
45
63
|
*/
|
|
46
64
|
class MediaSessionCallback(private val player: Player) :
|
|
47
65
|
MediaLibraryService.MediaLibrarySession.Callback {
|
|
48
|
-
internal val commandManager = MediaSessionCommandManager()
|
|
66
|
+
internal val commandManager = MediaSessionCommandManager(player.context.isAutomotive)
|
|
49
67
|
private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
|
|
50
68
|
|
|
51
69
|
// Track which controllers are subscribed to which media IDs.
|
|
@@ -53,6 +71,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
53
71
|
// threads (network observer, JS-triggered notifies) — guard all access with synchronized(this).
|
|
54
72
|
private val parentIdSubscriptions =
|
|
55
73
|
mutableMapOf<String, MutableSet<MediaSession.ControllerInfo>>()
|
|
74
|
+
private val failedSearch = FailedSearchSlot()
|
|
75
|
+
private val offlineSearches = OfflineSearchRegistry()
|
|
56
76
|
private var mediaLibrarySession: MediaLibraryService.MediaLibrarySession? = null
|
|
57
77
|
|
|
58
78
|
/**
|
|
@@ -64,14 +84,15 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
64
84
|
private set
|
|
65
85
|
|
|
66
86
|
init {
|
|
67
|
-
|
|
68
|
-
|
|
87
|
+
player.networkMonitor.observeOnline(scope) { online ->
|
|
88
|
+
notifySubscribedChildrenChanged()
|
|
89
|
+
// A browse level is re-queried through its subscription; a search has none, so its offline
|
|
90
|
+
// tile has to be taken off the screen by re-running the query.
|
|
91
|
+
if (online) scope.launch { reannounceOfflineSearches() }
|
|
92
|
+
}
|
|
69
93
|
}
|
|
70
94
|
|
|
71
|
-
/**
|
|
72
|
-
* Apply pagination to a list of items. If pageSize is 0 or MAX_VALUE (Android Auto default),
|
|
73
|
-
* returns the full list.
|
|
74
|
-
*/
|
|
95
|
+
/** Media3's legacy browse bridge asks for a whole list with pageSize [Int.MAX_VALUE]. */
|
|
75
96
|
private fun <T> List<T>.paginate(page: Int, pageSize: Int): List<T> {
|
|
76
97
|
return if (pageSize in 1 until Int.MAX_VALUE) {
|
|
77
98
|
this.drop(page * pageSize).take(pageSize)
|
|
@@ -80,45 +101,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
80
101
|
}
|
|
81
102
|
}
|
|
82
103
|
|
|
83
|
-
/** Creates an offline error MediaItem. */
|
|
84
|
-
private fun createOfflineMediaItem(): MediaItem =
|
|
85
|
-
createErrorMediaItem(
|
|
86
|
-
mediaId = BrowserPathHelper.OFFLINE_PATH,
|
|
87
|
-
title = player.context.getString(com.audiobrowser.R.string.audio_browser_offline_error),
|
|
88
|
-
subtitle =
|
|
89
|
-
player.context.getString(com.audiobrowser.R.string.audio_browser_offline_error_subtitle),
|
|
90
|
-
)
|
|
91
|
-
|
|
92
|
-
/**
|
|
93
|
-
* Builds a non-browsable, non-playable [MediaItem] used to surface an error inside an Android
|
|
94
|
-
* Auto / AAOS browse list. Rendered as a greyed-out, non-interactive tile, which is the only
|
|
95
|
-
* side-effect-free way to communicate a browse failure to legacy controllers (Media3 drops
|
|
96
|
-
* [LibraryResult.ofError] on the legacy browse bridge, leaving an empty "No items" screen).
|
|
97
|
-
*/
|
|
98
|
-
private fun createErrorMediaItem(mediaId: String, title: String, subtitle: String): MediaItem =
|
|
99
|
-
MediaItem.Builder()
|
|
100
|
-
.setMediaId(mediaId)
|
|
101
|
-
.setMediaMetadata(
|
|
102
|
-
MediaMetadata.Builder()
|
|
103
|
-
.setTitle(title)
|
|
104
|
-
.setSubtitle(subtitle)
|
|
105
|
-
// Non-browsable, non-playable. Android Auto ignores these flags and still drills into a
|
|
106
|
-
// tapped tile, but onGetChildren returns an empty list for the sentinel paths so it's a
|
|
107
|
-
// harmless "No Items" dead-end rather than an endless stack of error pages.
|
|
108
|
-
.setIsBrowsable(false)
|
|
109
|
-
.setIsPlayable(false)
|
|
110
|
-
.build()
|
|
111
|
-
)
|
|
112
|
-
.build()
|
|
113
|
-
|
|
114
|
-
/**
|
|
115
|
-
* Builds the gate tile from a per-request chrome: while a gate is active, tabs stay visible but a
|
|
116
|
-
* gated browse/search level serves this single tile (see the gate checks in [onGetChildren] /
|
|
117
|
-
* [onGetSearchResult]). Same shape as the error tiles — non-browsable, non-playable — and
|
|
118
|
-
* deliberately NOT accompanied by a SessionError: a gate is deliberate app state, not a failure.
|
|
119
|
-
* The message renders as the tile's subtitle (newlines collapse to spaces — list rows are
|
|
120
|
-
* single-line).
|
|
121
|
-
*/
|
|
122
104
|
/**
|
|
123
105
|
* Wraps a raw external-search query string into the structured [SearchParams] the gate request
|
|
124
106
|
* carries. The car search surfaces only give a free-text query, so the other fields stay null —
|
|
@@ -136,25 +118,16 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
136
118
|
reference = MediaReference.UNKNOWN,
|
|
137
119
|
)
|
|
138
120
|
|
|
139
|
-
private fun createGateMediaItem(gate: Gate): MediaItem =
|
|
140
|
-
createErrorMediaItem(
|
|
141
|
-
mediaId = BrowserPathHelper.GATE_PATH,
|
|
142
|
-
title = gate.title,
|
|
143
|
-
subtitle = gate.message?.replace('\n', ' ') ?: "",
|
|
144
|
-
)
|
|
145
|
-
|
|
146
121
|
/**
|
|
147
|
-
* Builds
|
|
148
|
-
*
|
|
149
|
-
*
|
|
150
|
-
*
|
|
122
|
+
* Builds the gate tile from a per-request chrome: while a gate is active, tabs stay visible but a
|
|
123
|
+
* gated browse/search level serves this single tile (see the gate checks in [onGetChildren] /
|
|
124
|
+
* [onGetSearchResult]). Same shape as the error tiles, and deliberately NOT accompanied by a
|
|
125
|
+
* SessionError: a gate is deliberate app state, not a failure.
|
|
151
126
|
*/
|
|
152
|
-
private fun
|
|
127
|
+
private fun createGateMediaItem(gate: Gate): MediaItem =
|
|
153
128
|
createErrorMediaItem(
|
|
154
|
-
|
|
155
|
-
title
|
|
156
|
-
subtitle =
|
|
157
|
-
player.context.getString(com.audiobrowser.R.string.audio_browser_browse_error_subtitle),
|
|
129
|
+
BrowserPathHelper.GATE_PATH,
|
|
130
|
+
FormattedNavigationError(gate.title, gate.message),
|
|
158
131
|
)
|
|
159
132
|
|
|
160
133
|
fun updateMediaSession(
|
|
@@ -165,7 +138,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
165
138
|
forwardJumpInterval: Double,
|
|
166
139
|
backwardJumpInterval: Double,
|
|
167
140
|
) {
|
|
168
|
-
// Store as MediaLibrarySession for notifyChildrenChanged support
|
|
169
141
|
this.mediaLibrarySession = mediaSession as? MediaLibraryService.MediaLibrarySession
|
|
170
142
|
commandManager.updateMediaSession(
|
|
171
143
|
mediaSession,
|
|
@@ -185,18 +157,34 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
185
157
|
return commandManager.buildConnectionResult(session)
|
|
186
158
|
}
|
|
187
159
|
|
|
160
|
+
override fun onDisconnected(session: MediaSession, controller: MediaSession.ControllerInfo) {
|
|
161
|
+
Timber.Forest.d("MediaSession disconnect: ${controller.packageName}")
|
|
162
|
+
// A controller that leaves without unsubscribing (Android Auto's normal exit) would otherwise
|
|
163
|
+
// be notified — and held — forever.
|
|
164
|
+
offlineSearches.forget(controller)
|
|
165
|
+
synchronized(this) {
|
|
166
|
+
parentIdSubscriptions.values.forEach { it.remove(controller) }
|
|
167
|
+
parentIdSubscriptions.entries.removeAll { (_, browsers) -> browsers.isEmpty() }
|
|
168
|
+
}
|
|
169
|
+
super.onDisconnected(session, controller)
|
|
170
|
+
}
|
|
171
|
+
|
|
188
172
|
override fun onCustomCommand(
|
|
189
173
|
session: MediaSession,
|
|
190
174
|
controller: MediaSession.ControllerInfo,
|
|
191
175
|
command: SessionCommand,
|
|
192
176
|
args: Bundle,
|
|
193
177
|
): ListenableFuture<SessionResult> {
|
|
194
|
-
//
|
|
178
|
+
// A success here makes the controller flip its heart optimistically, so a no-op (no current
|
|
179
|
+
// track) must report INVALID_STATE instead of success-then-revert.
|
|
195
180
|
if (command.customAction == MediaSessionCommandManager.CUSTOM_ACTION_FAVORITE) {
|
|
196
|
-
val
|
|
197
|
-
Timber.d("Favorite button tapped -
|
|
198
|
-
|
|
199
|
-
|
|
181
|
+
val applied = player.toggleActiveTrackFavorited()
|
|
182
|
+
Timber.d("Favorite button tapped - toggle applied=$applied")
|
|
183
|
+
return Futures.immediateFuture(
|
|
184
|
+
SessionResult(
|
|
185
|
+
if (applied) SessionResult.RESULT_SUCCESS else SessionResult.RESULT_ERROR_INVALID_STATE
|
|
186
|
+
)
|
|
187
|
+
)
|
|
200
188
|
}
|
|
201
189
|
|
|
202
190
|
if (commandManager.handleCustomCommand(command, player)) {
|
|
@@ -210,26 +198,43 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
210
198
|
controller: MediaSession.ControllerInfo,
|
|
211
199
|
rating: Rating,
|
|
212
200
|
): ListenableFuture<SessionResult> {
|
|
213
|
-
// A heart rating
|
|
214
|
-
//
|
|
215
|
-
//
|
|
216
|
-
|
|
201
|
+
// A heart rating toggles the now-playing favorite. setActiveTrackFavorited fires
|
|
202
|
+
// onFavoriteChanged so the consumer persists it — the same path as the favorite button. Report
|
|
203
|
+
// an honest result (see onCustomCommand): INVALID_STATE when there is no current track to
|
|
204
|
+
// favorite.
|
|
205
|
+
RatingFavorites.favoritedFor(rating)?.let { favorited ->
|
|
206
|
+
val applied = player.setActiveTrackFavorited(favorited)
|
|
207
|
+
return Futures.immediateFuture(
|
|
208
|
+
SessionResult(
|
|
209
|
+
if (applied) SessionResult.RESULT_SUCCESS else SessionResult.RESULT_ERROR_INVALID_STATE
|
|
210
|
+
)
|
|
211
|
+
)
|
|
212
|
+
}
|
|
217
213
|
return super.onSetRating(session, controller, rating)
|
|
218
214
|
}
|
|
219
215
|
|
|
216
|
+
/**
|
|
217
|
+
* Where a legacy controller's `setRating` arrives, naming the current item, and a Media3
|
|
218
|
+
* controller's `setRating(mediaId, rating)`, naming any item: only the current one can be rated.
|
|
219
|
+
*/
|
|
220
|
+
override fun onSetRating(
|
|
221
|
+
session: MediaSession,
|
|
222
|
+
controller: MediaSession.ControllerInfo,
|
|
223
|
+
mediaId: String,
|
|
224
|
+
rating: Rating,
|
|
225
|
+
): ListenableFuture<SessionResult> =
|
|
226
|
+
if (mediaId == session.player.currentMediaItem?.mediaId) {
|
|
227
|
+
onSetRating(session, controller, rating)
|
|
228
|
+
} else {
|
|
229
|
+
super.onSetRating(session, controller, mediaId, rating)
|
|
230
|
+
}
|
|
231
|
+
|
|
220
232
|
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
|
|
221
233
|
override fun onGetLibraryRoot(
|
|
222
234
|
session: MediaLibraryService.MediaLibrarySession,
|
|
223
235
|
browser: MediaSession.ControllerInfo,
|
|
224
236
|
params: MediaLibraryService.LibraryParams?,
|
|
225
237
|
): ListenableFuture<LibraryResult<MediaItem>> {
|
|
226
|
-
// Extract artwork size hint from root hints (e.g., from Android Auto)
|
|
227
|
-
// TODO: Also consider these other root hints in the future:
|
|
228
|
-
// - KEY_ROOT_HINT_MEDIA_HOST_VERSION
|
|
229
|
-
// - KEY_ROOT_HINT_MEDIA_SESSION_API
|
|
230
|
-
// - BROWSER_ROOT_HINTS_KEY_CUSTOM_BROWSER_ACTION_LIMIT
|
|
231
|
-
// - BROWSER_ROOT_HINTS_KEY_ROOT_CHILDREN_LIMIT
|
|
232
|
-
// - KEY_ROOT_HINT_MAX_QUEUE_ITEMS_WHILE_RESTRICTED
|
|
233
238
|
params?.extras?.getInt(MediaConstants.EXTRAS_KEY_MEDIA_ART_SIZE_PIXELS, 0)?.let { size ->
|
|
234
239
|
if (size > 0) {
|
|
235
240
|
artworkSizeHintPixels = size
|
|
@@ -238,13 +243,11 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
238
243
|
}
|
|
239
244
|
|
|
240
245
|
if (params?.isRecent == true) {
|
|
241
|
-
//
|
|
242
|
-
//
|
|
243
|
-
//
|
|
244
|
-
|
|
245
|
-
//
|
|
246
|
-
// an error of type 'RESULT_ERROR_NOT_SUPPORTED' for a `params.isRecent` request. See
|
|
247
|
-
// https://github.com/androidx/media/issues/355
|
|
246
|
+
// Playback resumption is served by media3 itself: it intercepts System UI's EXTRA_RECENT
|
|
247
|
+
// root request internally and answers through onPlaybackResumption, so that request never
|
|
248
|
+
// reaches this callback. Any other browser asking for a recent root gets
|
|
249
|
+
// ERROR_NOT_SUPPORTED — there is no browsable recents tree; recents are ordinary consumer
|
|
250
|
+
// content (a tab or route).
|
|
248
251
|
return Futures.immediateFuture(LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED))
|
|
249
252
|
}
|
|
250
253
|
|
|
@@ -271,105 +274,129 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
271
274
|
params: MediaLibraryService.LibraryParams?,
|
|
272
275
|
): ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> {
|
|
273
276
|
Timber.d(
|
|
274
|
-
"onGetChildren: {parentId: $parentId, page: $page, pageSize: $pageSize,
|
|
277
|
+
"onGetChildren: {parentId: $parentId, page: $page, pageSize: $pageSize, isSpecialPath: ${BrowserPathHelper.isSpecialPath(parentId)} }"
|
|
275
278
|
)
|
|
276
279
|
return scope.future {
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
val browserManager = audioBrowser.browserManager
|
|
281
|
-
|
|
282
|
-
// While a gate is active, tabs stay visible (the root keeps serving them below) but each
|
|
283
|
-
// non-root level is resolved per request: a gated path — including re-queries of the gate
|
|
284
|
-
// tile's own sentinel path — serves the single gate tile, so drilling into it re-shows the
|
|
285
|
-
// message instead of dead-ending in "No items"; an allowed path falls through to real
|
|
286
|
-
// children. Checked before the offline guard: gated content isn't coming back with
|
|
287
|
-
// connectivity, so the gate copy is the truer message.
|
|
288
|
-
if (parentId != BrowserPathHelper.ROOT_PATH) {
|
|
289
|
-
val outcome =
|
|
290
|
-
audioBrowser.gateDecision(
|
|
291
|
-
NativeGateRequest(reason = GateReason.BROWSE, path = parentId, search = null)
|
|
292
|
-
)
|
|
293
|
-
if (outcome.gated) {
|
|
294
|
-
audioBrowser.onGate(GateEvent(GateReason.BROWSE))
|
|
295
|
-
// gateDecision guarantees non-null chrome on a gated decision (override → default →
|
|
296
|
-
// built-in).
|
|
297
|
-
return@future LibraryResult.ofItemList(
|
|
298
|
-
ImmutableList.of(createGateMediaItem(outcome.chrome!!)),
|
|
299
|
-
params,
|
|
300
|
-
)
|
|
280
|
+
children(session, browser, parentId, page, pageSize, params).also {
|
|
281
|
+
if (parentId == BrowserPathHelper.ROOT_PATH && page == 0) {
|
|
282
|
+
rootTile = deadEndTileOf(it.value.orEmpty())
|
|
301
283
|
}
|
|
302
284
|
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
303
287
|
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
288
|
+
/**
|
|
289
|
+
* The tile the root last served in place of its tabs, or null. Android Automotive OS shows such a
|
|
290
|
+
* root as one tab that drills into the tile's sentinel path (see [deadEndChildren]).
|
|
291
|
+
*/
|
|
292
|
+
@Volatile private var rootTile: MediaItem? = null
|
|
293
|
+
|
|
294
|
+
private suspend fun children(
|
|
295
|
+
session: MediaLibraryService.MediaLibrarySession,
|
|
296
|
+
browser: MediaSession.ControllerInfo,
|
|
297
|
+
parentId: String,
|
|
298
|
+
page: Int,
|
|
299
|
+
pageSize: Int,
|
|
300
|
+
params: MediaLibraryService.LibraryParams?,
|
|
301
|
+
): LibraryResult<ImmutableList<MediaItem>> {
|
|
302
|
+
val audioBrowser =
|
|
303
|
+
player.awaitBrowser().also { Timber.d("Browser ready, proceeding with onGetChildren") }
|
|
304
|
+
val browserManager = audioBrowser.browserManager
|
|
305
|
+
|
|
306
|
+
// While a gate is active, tabs stay visible (the root keeps serving them below) but each
|
|
307
|
+
// non-root level is resolved per request: a gated path — including re-queries of the gate
|
|
308
|
+
// tile's own sentinel path — serves the single gate tile, so drilling into it re-shows the
|
|
309
|
+
// message instead of dead-ending in "No items"; an allowed path falls through to real
|
|
310
|
+
// children. Checked before the offline guard: gated content isn't coming back with
|
|
311
|
+
// connectivity, so the gate copy is the truer message.
|
|
312
|
+
if (parentId != BrowserPathHelper.ROOT_PATH) {
|
|
313
|
+
val outcome =
|
|
314
|
+
audioBrowser.gateDecision(
|
|
315
|
+
NativeGateRequest(reason = GateReason.BROWSE, path = parentId, search = null)
|
|
316
|
+
)
|
|
317
|
+
if (outcome.gated) {
|
|
318
|
+
audioBrowser.onGate(GateEvent(GateReason.BROWSE))
|
|
319
|
+
// gateDecision guarantees non-null chrome on a gated decision (override → default →
|
|
320
|
+
// built-in).
|
|
321
|
+
return LibraryResult.ofItemList(
|
|
322
|
+
ImmutableList.of(createGateMediaItem(outcome.chrome!!)),
|
|
323
|
+
params,
|
|
324
|
+
)
|
|
315
325
|
}
|
|
326
|
+
}
|
|
316
327
|
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
328
|
+
// For the offline tile, re-send the alert when still offline so a tap surfaces the
|
|
329
|
+
// explanation again — but only then, since these paths are also re-queried by
|
|
330
|
+
// notifyChildrenChanged (e.g. when connectivity returns) without any user action.
|
|
331
|
+
if (BrowserPathHelper.isDeadEndPath(parentId)) {
|
|
332
|
+
val offline = !player.networkMonitor.isOnline.value
|
|
333
|
+
if (parentId == BrowserPathHelper.OFFLINE_PATH && offline) {
|
|
322
334
|
sendBrowseError(session, browser, offline = true)
|
|
323
|
-
return@future LibraryResult.ofItemList(ImmutableList.of(createOfflineMediaItem()), params)
|
|
324
335
|
}
|
|
336
|
+
return LibraryResult.ofItemList(
|
|
337
|
+
deadEndChildren(parentId, rootTile, Automotive.device, offline),
|
|
338
|
+
params,
|
|
339
|
+
)
|
|
340
|
+
}
|
|
325
341
|
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
342
|
+
if (
|
|
343
|
+
!player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
|
|
344
|
+
) {
|
|
345
|
+
Timber.w("Network offline - returning error message for: $parentId")
|
|
346
|
+
sendBrowseError(session, browser, offline = true)
|
|
347
|
+
return LibraryResult.ofItemList(
|
|
348
|
+
ImmutableList.of(
|
|
349
|
+
createOfflineMediaItem(audioBrowser.resolveFormattedError(offlineError(), parentId))
|
|
350
|
+
),
|
|
351
|
+
params,
|
|
352
|
+
)
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
return try {
|
|
356
|
+
val children =
|
|
357
|
+
if (parentId == BrowserPathHelper.ROOT_PATH) {
|
|
358
|
+
// Disabled tabs hide (Track.disabled) — filtered before the four-tab cap so an
|
|
359
|
+
// unavailable tab never costs an available one its slot.
|
|
360
|
+
val tabs = browserManager.queryTabs().filterNot { it.disabled == true }
|
|
361
|
+
if (tabs.size > 4) {
|
|
362
|
+
Timber.w(
|
|
363
|
+
"Root has ${tabs.size} tabs; dropping ${tabs.size - 4} (Android Auto root limit)"
|
|
364
|
+
)
|
|
365
|
+
}
|
|
366
|
+
toFlatMediaItems(tabs.take(4))
|
|
367
|
+
} else {
|
|
368
|
+
// Section styles arrive page-folded (`section ?? page`, ADR 0011).
|
|
369
|
+
val resolvedTrack = browserManager.resolve(parentId)
|
|
370
|
+
val sections =
|
|
371
|
+
resolvedTrack.styleResolvedSections()
|
|
372
|
+
?: throw IllegalStateException("Expected browsed ResolvedTrack to have sections")
|
|
373
|
+
browserManager.warnIfGridPageLacksPromise(parentId, sections)
|
|
374
|
+
// A page with no children resolved fine, so it raises no SessionError and no event —
|
|
375
|
+
// notifyChildrenChanged re-queries these paths without any user action. It serves the
|
|
376
|
+
// app's path-aware `empty-content` copy as one inert tile (ADR 0001) instead of
|
|
377
|
+
// Android Auto's bare "No items".
|
|
378
|
+
browseLevelItems(toMediaItems(sections)) {
|
|
379
|
+
audioBrowser.resolveFormattedError(emptyContentError(), parentId)
|
|
352
380
|
}
|
|
381
|
+
}
|
|
353
382
|
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
LibraryResult.ofItemList(ImmutableList.of(createBrowseErrorMediaItem()), params)
|
|
372
|
-
}
|
|
383
|
+
LibraryResult.ofItemList(ImmutableList.copyOf(children.paginate(page, pageSize)), params)
|
|
384
|
+
} catch (e: Exception) {
|
|
385
|
+
// A cancelled browse (controller disconnected) is not a failure — don't render it as an
|
|
386
|
+
// error tile. awaitBrowser's TimeoutCancellationException IS a real failure, keep that.
|
|
387
|
+
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
388
|
+
Timber.e(e, "Error getting children for parentId: $parentId")
|
|
389
|
+
// A tile rather than a bare ofError() — see createErrorMediaItem and
|
|
390
|
+
// https://github.com/androidx/media/issues/2901
|
|
391
|
+
sendBrowseError(session, browser, offline = false)
|
|
392
|
+
LibraryResult.ofItemList(
|
|
393
|
+
ImmutableList.of(
|
|
394
|
+
createBrowseErrorMediaItem(
|
|
395
|
+
audioBrowser.resolveFormattedError(navigationErrorFor(e), parentId)
|
|
396
|
+
)
|
|
397
|
+
),
|
|
398
|
+
params,
|
|
399
|
+
)
|
|
373
400
|
}
|
|
374
401
|
}
|
|
375
402
|
|
|
@@ -379,8 +406,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
379
406
|
* Media3 transiently attaches the error code/message to the platform session's playback state
|
|
380
407
|
* without entering STATE_ERROR.
|
|
381
408
|
*
|
|
382
|
-
* NOTE: current Android Auto renders
|
|
383
|
-
*
|
|
409
|
+
* NOTE: current Android Auto renders nothing for this — its transient state is cleared
|
|
410
|
+
* microseconds after being set (see [createErrorMediaItem], androidx/media#2901). It is kept
|
|
384
411
|
* because it is the correct Media3-API error signal, costs nothing, and becomes user-visible if
|
|
385
412
|
* Android Auto moves to consuming SessionError via the Media3 controller API.
|
|
386
413
|
*
|
|
@@ -402,19 +429,45 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
402
429
|
}
|
|
403
430
|
|
|
404
431
|
/**
|
|
405
|
-
*
|
|
406
|
-
*
|
|
407
|
-
*
|
|
408
|
-
*
|
|
432
|
+
* Flattens a page's sections to MediaItems for browse delivery — the Media3 boundary where
|
|
433
|
+
* sections die (ADR 0010): the MediaBrowser protocol has no section node, so each child is
|
|
434
|
+
* stamped with its owning section's title/style hints. A section with a `path` gains a browsable
|
|
435
|
+
* "view more" row under the same header — at every `display`, because no Android Auto header is
|
|
436
|
+
* tappable at any of them, so the row is the section's only "view all" affordance here. Http(s)
|
|
437
|
+
* artwork routes through the content:// provider so Android Auto can load it via the
|
|
438
|
+
* ArtworkContentProvider.
|
|
409
439
|
*/
|
|
410
|
-
private fun toMediaItems(
|
|
440
|
+
private suspend fun toMediaItems(sections: List<Section>): List<MediaItem> {
|
|
411
441
|
val registry = player.browseArtworkRegistry
|
|
412
442
|
val authority = com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
|
|
413
|
-
return
|
|
414
|
-
|
|
443
|
+
return sections.flatMap { section ->
|
|
444
|
+
// Android Auto has no disabled affordance, so an unavailable track hides
|
|
445
|
+
// — never a normal-looking dead row (Track.disabled's rendering ladder).
|
|
446
|
+
val children = section.children.filter { it.disabled != true }
|
|
447
|
+
val items = children.map { TrackFactory.toBrowseMediaItem(it, registry, authority, section) }
|
|
448
|
+
// No "view more" under an empty section — CarPlay skips empty sections
|
|
449
|
+
// outright, and a lone navigation tile under a header is a dead end.
|
|
450
|
+
if (section.path == null || children.isEmpty()) return@flatMap items
|
|
451
|
+
// The browser is already up at every call site, so awaiting it here is a field read, and
|
|
452
|
+
// viewMoreTitle is memoized per content generation — both are free after the first row.
|
|
453
|
+
val title = player.awaitBrowser().browserManager.viewMoreTitle()
|
|
454
|
+
items +
|
|
455
|
+
TrackFactory.toBrowseMediaItem(
|
|
456
|
+
TrackFactory.navigationTrack(section, title),
|
|
457
|
+
registry,
|
|
458
|
+
authority,
|
|
459
|
+
section,
|
|
460
|
+
)
|
|
415
461
|
}
|
|
416
462
|
}
|
|
417
463
|
|
|
464
|
+
/**
|
|
465
|
+
* Flat lists (tabs, search results) convert as one untitled list section — which contributes no
|
|
466
|
+
* group or style hints — so exactly one Track→MediaItem path exists at the Media3 boundary.
|
|
467
|
+
*/
|
|
468
|
+
private suspend fun toFlatMediaItems(tracks: List<Track>): List<MediaItem> =
|
|
469
|
+
toMediaItems(listOf(untitledSection(tracks.toTypedArray())))
|
|
470
|
+
|
|
418
471
|
override fun onGetItem(
|
|
419
472
|
session: MediaLibraryService.MediaLibrarySession,
|
|
420
473
|
browser: MediaSession.ControllerInfo,
|
|
@@ -422,15 +475,56 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
422
475
|
): ListenableFuture<LibraryResult<MediaItem>> {
|
|
423
476
|
Timber.Forest.d("onGetItem: ${browser.packageName}, mediaId = $mediaId")
|
|
424
477
|
return scope.future {
|
|
425
|
-
//
|
|
478
|
+
// Only the root answers ahead of awaitBrowser: it needs no browser. Every tile sentinel
|
|
479
|
+
// below does — for the formatter hop, and the gate one for gateDecision.
|
|
480
|
+
if (mediaId == BrowserPathHelper.ROOT_PATH) {
|
|
481
|
+
return@future LibraryResult.ofItem(
|
|
482
|
+
MediaItem.Builder()
|
|
483
|
+
.setMediaId(mediaId)
|
|
484
|
+
.setMediaMetadata(
|
|
485
|
+
MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
|
|
486
|
+
)
|
|
487
|
+
.build(),
|
|
488
|
+
null,
|
|
489
|
+
)
|
|
490
|
+
}
|
|
491
|
+
|
|
426
492
|
if (mediaId == BrowserPathHelper.OFFLINE_PATH) {
|
|
427
|
-
return@future LibraryResult.ofItem(
|
|
493
|
+
return@future LibraryResult.ofItem(
|
|
494
|
+
createOfflineMediaItem(
|
|
495
|
+
player
|
|
496
|
+
.awaitBrowser()
|
|
497
|
+
.resolveFormattedError(offlineError(), BrowserPathHelper.OFFLINE_PATH)
|
|
498
|
+
),
|
|
499
|
+
null,
|
|
500
|
+
)
|
|
428
501
|
}
|
|
429
502
|
|
|
430
|
-
// Return the error tile as a non-browsable item so tapping it can't re-browse into a
|
|
431
|
-
// failing path (which would push another error page onto the stack).
|
|
432
503
|
if (mediaId == BrowserPathHelper.ERROR_PATH) {
|
|
433
|
-
|
|
504
|
+
// The exception that produced the tile is gone by now — the sentinel is all the controller
|
|
505
|
+
// hands back — so the copy formats for the sentinel under the generic failure code.
|
|
506
|
+
return@future LibraryResult.ofItem(
|
|
507
|
+
createBrowseErrorMediaItem(
|
|
508
|
+
player
|
|
509
|
+
.awaitBrowser()
|
|
510
|
+
.resolveFormattedError(browseFailureError(), BrowserPathHelper.ERROR_PATH)
|
|
511
|
+
),
|
|
512
|
+
null,
|
|
513
|
+
)
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
if (mediaId == BrowserPathHelper.EMPTY_PATH) {
|
|
517
|
+
// A controller re-reading the tile it was served. The page's path is gone by now — the
|
|
518
|
+
// sentinel is all it hands back — so the copy formats for the sentinel and lands on the
|
|
519
|
+
// app's generic empty wording, or the default.
|
|
520
|
+
return@future LibraryResult.ofItem(
|
|
521
|
+
createEmptyMediaItem(
|
|
522
|
+
player
|
|
523
|
+
.awaitBrowser()
|
|
524
|
+
.resolveFormattedError(emptyContentError(), BrowserPathHelper.EMPTY_PATH)
|
|
525
|
+
),
|
|
526
|
+
null,
|
|
527
|
+
)
|
|
434
528
|
}
|
|
435
529
|
|
|
436
530
|
if (mediaId == BrowserPathHelper.GATE_PATH) {
|
|
@@ -451,22 +545,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
451
545
|
return@future LibraryResult.ofItem(createGateMediaItem(outcome.chrome!!), null)
|
|
452
546
|
}
|
|
453
547
|
|
|
454
|
-
if (mediaId == BrowserPathHelper.ROOT_PATH || mediaId == BrowserPathHelper.RECENT_PATH) {
|
|
455
|
-
return@future LibraryResult.ofItem(
|
|
456
|
-
MediaItem.Builder()
|
|
457
|
-
.setMediaId(mediaId)
|
|
458
|
-
.setMediaMetadata(
|
|
459
|
-
MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
|
|
460
|
-
)
|
|
461
|
-
.build(),
|
|
462
|
-
null,
|
|
463
|
-
)
|
|
464
|
-
}
|
|
465
|
-
|
|
466
|
-
// Wait for browser to be registered if it's not available yet
|
|
467
548
|
val browserManager = player.awaitBrowser().browserManager
|
|
468
549
|
|
|
469
|
-
// Serve tracks from the track cache first (keyed by
|
|
550
|
+
// Serve tracks from the track cache first (keyed by path and src). Besides avoiding an HTTP
|
|
470
551
|
// resolve, this keeps item identity correct for contextual mediaIds: resolve() strips
|
|
471
552
|
// __trackId and would return the *parent container's* metadata as the item.
|
|
472
553
|
val browseAuthority =
|
|
@@ -538,9 +619,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
538
619
|
}
|
|
539
620
|
|
|
540
621
|
/**
|
|
541
|
-
* Notifies all subscribed controllers to refresh their content. Called internally when network
|
|
542
|
-
* state changes to refresh all subscribed paths.
|
|
543
|
-
*
|
|
544
622
|
* Safe to call from any thread: snapshots the subscribed paths and dispatches the session calls
|
|
545
623
|
* to the main (Media3 application) thread.
|
|
546
624
|
*/
|
|
@@ -553,10 +631,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
553
631
|
}
|
|
554
632
|
|
|
555
633
|
/**
|
|
556
|
-
* Notifies external controllers that content at the given path has changed
|
|
557
|
-
* subscribed to
|
|
558
|
-
*
|
|
559
|
-
* @param path The path where content has changed
|
|
634
|
+
* Notifies external controllers that content at the given path has changed, so controllers
|
|
635
|
+
* subscribed to it refresh their UI. Safe to call from any thread.
|
|
560
636
|
*/
|
|
561
637
|
fun notifyContentChanged(path: String) {
|
|
562
638
|
Timber.d("Notifying content changed for path: $path")
|
|
@@ -574,10 +650,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
574
650
|
notifySubscribedChildrenChanged()
|
|
575
651
|
}
|
|
576
652
|
|
|
577
|
-
/**
|
|
578
|
-
* Called when the browser becomes available after a cold start. Notifies all subscribed
|
|
579
|
-
* controllers to refresh their content.
|
|
580
|
-
*/
|
|
581
653
|
fun notifyBrowserReady() {
|
|
582
654
|
Timber.d("Browser ready - notifying all subscribed paths")
|
|
583
655
|
notifySubscribedChildrenChanged()
|
|
@@ -596,8 +668,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
596
668
|
): ListenableFuture<LibraryResult<Void>> {
|
|
597
669
|
Timber.d("onSearch: ${browser.packageName}, query = $query")
|
|
598
670
|
return scope.future {
|
|
599
|
-
// Wait for browser registration like onGetChildren does, so a cold-start voice search
|
|
600
|
-
// doesn't fail before JS has configured the browser.
|
|
601
671
|
val audioBrowser =
|
|
602
672
|
try {
|
|
603
673
|
player.awaitBrowser()
|
|
@@ -619,28 +689,83 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
619
689
|
return@future LibraryResult.ofVoid()
|
|
620
690
|
}
|
|
621
691
|
|
|
622
|
-
//
|
|
692
|
+
// Before the offline branch inside announceSearch: with no search source configured the
|
|
693
|
+
// answer is not-supported, online or not.
|
|
623
694
|
if (!browserManager.config.hasSearch) {
|
|
624
695
|
Timber.w("Search requested but no search source configured")
|
|
625
696
|
return@future LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED)
|
|
626
697
|
}
|
|
627
698
|
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
Timber.d("Search completed: $resultCount results for query '$query'")
|
|
699
|
+
announceSearch(session, browser, browserManager, query, params)
|
|
700
|
+
LibraryResult.ofVoid()
|
|
701
|
+
}
|
|
702
|
+
}
|
|
634
703
|
|
|
635
|
-
|
|
636
|
-
|
|
704
|
+
/**
|
|
705
|
+
* Runs [query] and tells [browser] how many items [onGetSearchResult] will serve for it: the
|
|
706
|
+
* search's own hits, or the single tile standing in for them — a controller told zero never asks
|
|
707
|
+
* for items. Offline keeps the query for [reannounceOfflineSearches]; every other outcome drops
|
|
708
|
+
* it, so one controller holds at most its latest unanswered search.
|
|
709
|
+
*/
|
|
710
|
+
private suspend fun announceSearch(
|
|
711
|
+
session: MediaLibraryService.MediaLibrarySession,
|
|
712
|
+
browser: MediaSession.ControllerInfo,
|
|
713
|
+
browserManager: BrowserManager,
|
|
714
|
+
query: String,
|
|
715
|
+
params: MediaLibraryService.LibraryParams?,
|
|
716
|
+
) {
|
|
717
|
+
if (
|
|
718
|
+
!player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
|
|
719
|
+
) {
|
|
720
|
+
Timber.w("Network offline - announcing the offline tile for query: $query")
|
|
721
|
+
offlineSearches.record(browser, query, params)
|
|
722
|
+
session.notifySearchResultChanged(browser, query, 1, params)
|
|
723
|
+
return
|
|
724
|
+
}
|
|
725
|
+
offlineSearches.forget(browser)
|
|
726
|
+
|
|
727
|
+
try {
|
|
728
|
+
// Caches the result set under the query, which onGetSearchResult reads back through
|
|
729
|
+
// getCachedSearchResults.
|
|
730
|
+
val searchResults = browserManager.search(query)
|
|
731
|
+
failedSearch.clear()
|
|
732
|
+
val resultCount = announcedSearchCount(searchResults.normalizedSections)
|
|
733
|
+
|
|
734
|
+
Timber.d("Search announced $resultCount item(s) for query '$query'")
|
|
735
|
+
|
|
736
|
+
session.notifySearchResultChanged(browser, query, resultCount, params)
|
|
737
|
+
} catch (e: Exception) {
|
|
738
|
+
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
739
|
+
Timber.e(e, "Error during search for query: $query")
|
|
740
|
+
// A failed search announces its one item — the browse-error tile onGetSearchResult
|
|
741
|
+
// serves — rather than an ofError the browse list renders as nothing at all. Without
|
|
742
|
+
// the slot the failure is indistinguishable from an empty page by the time that call
|
|
743
|
+
// arrives, and a server error would read as the app's "no results" copy.
|
|
744
|
+
failedSearch.record(query, navigationErrorFor(e))
|
|
745
|
+
session.notifySearchResultChanged(browser, query, 1, params)
|
|
746
|
+
}
|
|
747
|
+
}
|
|
637
748
|
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
749
|
+
/**
|
|
750
|
+
* Re-runs every search that was served the offline tile, now that the network is back. Announcing
|
|
751
|
+
* what the fresh search found — rather than a bare "one item" — keeps the announced count equal
|
|
752
|
+
* to what [onGetSearchResult] will then serve from the cache this fills.
|
|
753
|
+
*/
|
|
754
|
+
private suspend fun reannounceOfflineSearches() {
|
|
755
|
+
val pending = offlineSearches.drain()
|
|
756
|
+
if (pending.isEmpty()) return
|
|
757
|
+
val session = mediaLibrarySession ?: return
|
|
758
|
+
val browserManager =
|
|
759
|
+
try {
|
|
760
|
+
player.awaitBrowser().browserManager
|
|
761
|
+
} catch (e: TimeoutCancellationException) {
|
|
762
|
+
Timber.w("Timed out waiting for browser - offline searches not re-announced")
|
|
763
|
+
return
|
|
643
764
|
}
|
|
765
|
+
|
|
766
|
+
pending.forEach { search ->
|
|
767
|
+
Timber.d("Network back - re-running search: ${search.query}")
|
|
768
|
+
announceSearch(session, search.browser, browserManager, search.query, search.params)
|
|
644
769
|
}
|
|
645
770
|
}
|
|
646
771
|
|
|
@@ -678,26 +803,57 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
678
803
|
)
|
|
679
804
|
}
|
|
680
805
|
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
806
|
+
// Checked before the failure slot, as in onGetChildren: a search that never reached the
|
|
807
|
+
// network is not a server failure, and connectivity returning is what fixes it.
|
|
808
|
+
if (
|
|
809
|
+
!player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
|
|
810
|
+
) {
|
|
811
|
+
Timber.w("Network offline - returning the offline tile for query: $query")
|
|
812
|
+
sendBrowseError(session, browser, offline = true)
|
|
813
|
+
return@future LibraryResult.ofItemList(
|
|
814
|
+
ImmutableList.of(
|
|
815
|
+
createOfflineMediaItem(
|
|
816
|
+
audioBrowser.resolveFormattedError(
|
|
817
|
+
offlineError(),
|
|
818
|
+
BrowserPathHelper.createSearchPath(query),
|
|
819
|
+
)
|
|
820
|
+
)
|
|
821
|
+
),
|
|
822
|
+
params,
|
|
823
|
+
)
|
|
824
|
+
}
|
|
692
825
|
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
826
|
+
// The search itself failed, so this is a failure, not an empty page — same tile and same
|
|
827
|
+
// SessionError the browse catch sends, worded for the error its exception mapped to.
|
|
828
|
+
failedSearch.errorFor(query)?.let { error ->
|
|
829
|
+
sendBrowseError(session, browser, offline = false)
|
|
830
|
+
return@future LibraryResult.ofItemList(
|
|
831
|
+
ImmutableList.of(
|
|
832
|
+
createBrowseErrorMediaItem(
|
|
833
|
+
audioBrowser.resolveFormattedError(error, BrowserPathHelper.createSearchPath(query))
|
|
834
|
+
)
|
|
835
|
+
),
|
|
836
|
+
params,
|
|
837
|
+
)
|
|
838
|
+
}
|
|
839
|
+
|
|
840
|
+
try {
|
|
841
|
+
val tracks = browserManager.getCachedSearchResults(query)
|
|
842
|
+
if (tracks == null) Timber.w("No cached search results for query: $query")
|
|
843
|
+
// A search with nothing servable — no hits, every hit disabled, or nothing cached under
|
|
844
|
+
// this query — serves the app's copy for the search path instead of the car's bare "No
|
|
845
|
+
// items" (ADR 0001). Something must always come back: onSearch announced one item.
|
|
846
|
+
val mediaItems =
|
|
847
|
+
browseLevelItems(toFlatMediaItems(tracks?.toList().orEmpty())) {
|
|
848
|
+
audioBrowser.resolveFormattedError(
|
|
849
|
+
emptyContentError(),
|
|
850
|
+
BrowserPathHelper.createSearchPath(query),
|
|
851
|
+
)
|
|
700
852
|
}
|
|
853
|
+
|
|
854
|
+
val paginatedItems = mediaItems.paginate(page, pageSize)
|
|
855
|
+
Timber.d("Returning ${paginatedItems.size} search results")
|
|
856
|
+
LibraryResult.ofItemList(ImmutableList.copyOf(paginatedItems), params)
|
|
701
857
|
} catch (e: Exception) {
|
|
702
858
|
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
703
859
|
Timber.e(e, "Error getting search results for query: $query")
|
|
@@ -726,8 +882,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
726
882
|
return scope.future {
|
|
727
883
|
val audioBrowser = player.awaitBrowser()
|
|
728
884
|
|
|
729
|
-
//
|
|
730
|
-
//
|
|
885
|
+
// The "leave playback alone" answer for handleTrackLoad: returning the current state
|
|
886
|
+
// unchanged is how Media3 is told to do nothing. ExoPlayer is main-thread confined and this
|
|
887
|
+
// future runs on IO, so the reads hop to Main.
|
|
731
888
|
suspend fun currentPlayerState(): MediaSession.MediaItemsWithStartPosition =
|
|
732
889
|
withContext(Dispatchers.Main) {
|
|
733
890
|
val currentItems = player.tracks.map { TrackFactory.toMedia3(it) }
|
|
@@ -737,26 +894,26 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
737
894
|
|
|
738
895
|
val browserManager = audioBrowser.browserManager
|
|
739
896
|
|
|
740
|
-
// A single tapped item resolves to the contextual
|
|
897
|
+
// A single tapped item resolves to the contextual path of the list it was
|
|
741
898
|
// tapped in: directly for contextual mediaIds, via the track cache for
|
|
742
|
-
// stable-id mediaIds (see BrowserManager.
|
|
899
|
+
// stable-id mediaIds (see BrowserManager.contextualPathFor). A search
|
|
743
900
|
// selection is not a list tap — its queue comes from the search results
|
|
744
901
|
// (resolveMediaItemsForPlayback), never from a browsed container.
|
|
745
|
-
val
|
|
902
|
+
val singleContextualPath =
|
|
746
903
|
mediaItems
|
|
747
904
|
.singleOrNull()
|
|
748
905
|
?.takeIf { it.requestMetadata.searchQuery == null }
|
|
749
|
-
?.let { browserManager.
|
|
906
|
+
?.let { browserManager.contextualPathFor(it.mediaId) }
|
|
750
907
|
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
val
|
|
754
|
-
val trackId = BrowserPathHelper.extractTrackId(singleContextualUrl)
|
|
908
|
+
if (singleContextualPath != null) {
|
|
909
|
+
val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
|
|
910
|
+
val trackId = BrowserPathHelper.extractTrackId(singleContextualPath)
|
|
755
911
|
|
|
756
|
-
//
|
|
912
|
+
// A tap inside the queue's own source list skips rather than rebuilds (exact path first,
|
|
913
|
+
// identity for index-less paths — see indexOfTappedTrack).
|
|
757
914
|
if (trackId != null && parentPath == player.queueSourcePath) {
|
|
758
915
|
val queueTracks = withContext(Dispatchers.Main) { player.tracks }
|
|
759
|
-
val index = queueTracks.
|
|
916
|
+
val index = queueTracks.indexOfTappedTrack(singleContextualPath, trackId)
|
|
760
917
|
if (index >= 0) {
|
|
761
918
|
Timber.d("Queue already from $parentPath, skipping to index $index")
|
|
762
919
|
val track = queueTracks[index]
|
|
@@ -767,7 +924,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
767
924
|
index.toDouble(),
|
|
768
925
|
::currentPlayerState,
|
|
769
926
|
) {
|
|
770
|
-
// Return the existing queue items with the new start index
|
|
771
927
|
val existingItems = queueTracks.map { TrackFactory.toMedia3(it) }
|
|
772
928
|
MediaSession.MediaItemsWithStartPosition(existingItems, index, startPositionMs)
|
|
773
929
|
}
|
|
@@ -788,9 +944,10 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
788
944
|
result.startIndex.toDouble(),
|
|
789
945
|
::currentPlayerState,
|
|
790
946
|
) {
|
|
791
|
-
//
|
|
792
|
-
|
|
793
|
-
|
|
947
|
+
// Inside handleTrackLoad's default branch: a consumer that handles the load itself owns
|
|
948
|
+
// the queue, so queueSourcePath must not claim this path on its behalf.
|
|
949
|
+
if (singleContextualPath != null) {
|
|
950
|
+
val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
|
|
794
951
|
withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
|
|
795
952
|
}
|
|
796
953
|
result
|
|
@@ -806,8 +963,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
806
963
|
* using the browse callback. This enables seamless resumption after app restart with the same
|
|
807
964
|
* player settings (repeat mode, shuffle, playback speed).
|
|
808
965
|
*
|
|
809
|
-
* @param mediaSession The media session
|
|
810
|
-
* @param controller The controller requesting resumption
|
|
811
966
|
* @param isForPlayback True if this should start playback; false if just gathering info for the
|
|
812
967
|
* boot-time resumption notification (no network; local metadata only).
|
|
813
968
|
* @see https://developer.android.com/media/media3/session/background-playback#resumption
|
|
@@ -816,6 +971,25 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
816
971
|
mediaSession: MediaSession,
|
|
817
972
|
controller: MediaSession.ControllerInfo,
|
|
818
973
|
isForPlayback: Boolean,
|
|
974
|
+
): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
|
|
975
|
+
val resumption = resume(controller, isForPlayback)
|
|
976
|
+
if (isForPlayback) {
|
|
977
|
+
Futures.addCallback(
|
|
978
|
+
resumption,
|
|
979
|
+
object : FutureCallback<MediaSession.MediaItemsWithStartPosition> {
|
|
980
|
+
override fun onSuccess(result: MediaSession.MediaItemsWithStartPosition) {}
|
|
981
|
+
|
|
982
|
+
override fun onFailure(t: Throwable) = player.onPlaybackResumptionFailed()
|
|
983
|
+
},
|
|
984
|
+
ContextCompat.getMainExecutor(player.context),
|
|
985
|
+
)
|
|
986
|
+
}
|
|
987
|
+
return resumption
|
|
988
|
+
}
|
|
989
|
+
|
|
990
|
+
private fun resume(
|
|
991
|
+
controller: MediaSession.ControllerInfo,
|
|
992
|
+
isForPlayback: Boolean,
|
|
819
993
|
): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
|
|
820
994
|
Timber.d("${controller.packageName}")
|
|
821
995
|
|
|
@@ -829,9 +1003,17 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
829
1003
|
throw IllegalStateException("No playback state to resume")
|
|
830
1004
|
}
|
|
831
1005
|
|
|
832
|
-
//
|
|
833
|
-
//
|
|
834
|
-
//
|
|
1006
|
+
// The persisted track can carry `disabled` — it became unavailable after
|
|
1007
|
+
// it was saved. A disabled track never plays, resumption included
|
|
1008
|
+
// (Track.disabled); failing the future refuses without touching the
|
|
1009
|
+
// player.
|
|
1010
|
+
if (state.track.disabled == true) {
|
|
1011
|
+
Timber.w("Refusing resumption of disabled track: ${state.track.title}")
|
|
1012
|
+
throw IllegalStateException("Persisted track is disabled")
|
|
1013
|
+
}
|
|
1014
|
+
|
|
1015
|
+
// Info-gathering returns before the settings restore and the queue expansion below: both
|
|
1016
|
+
// touch the live player or the network, and neither is permitted here.
|
|
835
1017
|
if (!isForPlayback) {
|
|
836
1018
|
Timber.d("Info-gathering resumption (boot-time); returning stored track without expansion")
|
|
837
1019
|
return@future MediaSession.MediaItemsWithStartPosition(
|
|
@@ -844,14 +1026,12 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
844
1026
|
// restore() sets player properties which must happen on main thread
|
|
845
1027
|
withContext(Dispatchers.Main) { player.playbackStateStore.restore() }
|
|
846
1028
|
|
|
847
|
-
val
|
|
848
|
-
Timber.d("Resuming from
|
|
1029
|
+
val path = state.track.path
|
|
1030
|
+
Timber.d("Resuming from path=$path, positionMs=${state.positionMs}")
|
|
849
1031
|
|
|
850
|
-
// Wait for browser to be available (JS needs to have configured it)
|
|
851
1032
|
val browserManager = player.awaitBrowser().browserManager
|
|
852
1033
|
|
|
853
|
-
|
|
854
|
-
val expanded = url?.let { browserManager.expandQueueFromContextualUrl(it) }
|
|
1034
|
+
val expanded = path?.let { browserManager.expandQueueFromContextualPath(it) }
|
|
855
1035
|
|
|
856
1036
|
if (expanded != null) {
|
|
857
1037
|
val (tracks, selectedIndex) = expanded
|
|
@@ -859,9 +1039,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
859
1039
|
"Restored ${tracks.size} tracks, starting at index $selectedIndex at ${state.positionMs}ms"
|
|
860
1040
|
)
|
|
861
1041
|
|
|
862
|
-
|
|
863
|
-
|
|
864
|
-
val parentPath = BrowserPathHelper.stripTrackId(url)
|
|
1042
|
+
if (BrowserPathHelper.isContextual(path)) {
|
|
1043
|
+
val parentPath = BrowserPathHelper.stripTrackId(path)
|
|
865
1044
|
withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
|
|
866
1045
|
}
|
|
867
1046
|
|
|
@@ -871,7 +1050,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
871
1050
|
state.positionMs,
|
|
872
1051
|
)
|
|
873
1052
|
} else {
|
|
874
|
-
// Fallback: play just the stored track
|
|
875
1053
|
Timber.d("Queue expansion failed, using stored track: ${state.track.title}")
|
|
876
1054
|
MediaSession.MediaItemsWithStartPosition(
|
|
877
1055
|
ImmutableList.of(TrackFactory.toMedia3(state.track)),
|
|
@@ -882,3 +1060,186 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
882
1060
|
}
|
|
883
1061
|
}
|
|
884
1062
|
}
|
|
1063
|
+
|
|
1064
|
+
/**
|
|
1065
|
+
* What a drill-in on a tile's sentinel path serves. Nothing, so Android Auto, which drills into a
|
|
1066
|
+
* tile whatever its flags, dead-ends at "No items" rather than stacking error pages. On Android
|
|
1067
|
+
* Automotive OS, a root that serves only a tile shows as one tab that drills in here, and an empty
|
|
1068
|
+
* level as "Media isn't available for this list", so there the [rootTile] is served again, unless
|
|
1069
|
+
* it is the offline tile and the device is back online.
|
|
1070
|
+
*/
|
|
1071
|
+
internal fun deadEndChildren(
|
|
1072
|
+
parentId: String,
|
|
1073
|
+
rootTile: MediaItem?,
|
|
1074
|
+
automotive: Boolean,
|
|
1075
|
+
offline: Boolean,
|
|
1076
|
+
): List<MediaItem> =
|
|
1077
|
+
listOfNotNull(
|
|
1078
|
+
rootTile?.takeIf {
|
|
1079
|
+
automotive &&
|
|
1080
|
+
it.mediaId == parentId &&
|
|
1081
|
+
(parentId != BrowserPathHelper.OFFLINE_PATH || offline)
|
|
1082
|
+
}
|
|
1083
|
+
)
|
|
1084
|
+
|
|
1085
|
+
/** The single tile of a level that serves one in place of its items, or null. */
|
|
1086
|
+
internal fun deadEndTileOf(items: List<MediaItem>): MediaItem? =
|
|
1087
|
+
items.singleOrNull()?.takeIf { BrowserPathHelper.isDeadEndPath(it.mediaId) }
|
|
1088
|
+
|
|
1089
|
+
/**
|
|
1090
|
+
* Builds a non-playable [MediaItem] used to surface an error inside an Android Auto / AAOS browse
|
|
1091
|
+
* list. Rendered as a tile, which is the only side-effect-free way to communicate a browse failure
|
|
1092
|
+
* to legacy controllers (Media3 drops [LibraryResult.ofError] on the legacy browse bridge, leaving
|
|
1093
|
+
* an empty "No items" screen).
|
|
1094
|
+
*
|
|
1095
|
+
* Tiles are the only in-browse error signal that exists. Verified on a head unit (2026-06): the
|
|
1096
|
+
* Android Auto browse list renders no error text for a transient [SessionError], for sticky
|
|
1097
|
+
* non-fatal replication, or for fatal replication (setLibraryErrorReplicationMode). Fatal
|
|
1098
|
+
* replication does surface the message on the playback screen, but at the cost of presenting the
|
|
1099
|
+
* session as STATE_ERROR with no actions, hiding the now-playing item and transport controls.
|
|
1100
|
+
*/
|
|
1101
|
+
internal fun createErrorMediaItem(mediaId: String, title: String, subtitle: String): MediaItem =
|
|
1102
|
+
MediaItem.Builder()
|
|
1103
|
+
.setMediaId(mediaId)
|
|
1104
|
+
.setMediaMetadata(
|
|
1105
|
+
MediaMetadata.Builder()
|
|
1106
|
+
.setTitle(title)
|
|
1107
|
+
.setSubtitle(subtitle)
|
|
1108
|
+
// Android Automotive OS's car media app drops an item that is neither browsable nor
|
|
1109
|
+
// playable; Android Auto ignores these flags and drills in anyway (see deadEndChildren).
|
|
1110
|
+
.setIsBrowsable(Automotive.device)
|
|
1111
|
+
.setIsPlayable(false)
|
|
1112
|
+
.build()
|
|
1113
|
+
)
|
|
1114
|
+
.build()
|
|
1115
|
+
|
|
1116
|
+
/**
|
|
1117
|
+
* The formatted form every tile is built from: the message renders as the subtitle, with newlines
|
|
1118
|
+
* collapsed to spaces — list rows are single-line.
|
|
1119
|
+
*/
|
|
1120
|
+
private fun createErrorMediaItem(mediaId: String, formatted: FormattedNavigationError): MediaItem =
|
|
1121
|
+
createErrorMediaItem(
|
|
1122
|
+
mediaId = mediaId,
|
|
1123
|
+
title = formatted.title,
|
|
1124
|
+
subtitle = formatted.message?.replace('\n', ' ') ?: "",
|
|
1125
|
+
)
|
|
1126
|
+
|
|
1127
|
+
/**
|
|
1128
|
+
* Builds the empty tile from the app's formatted `empty-content` copy for the page's path, so an
|
|
1129
|
+
* empty Favorites tab and an empty search can be worded apart (ADR 0001). Same shape as the error
|
|
1130
|
+
* tiles, and deliberately NOT accompanied by a SessionError: an empty page is a successful resolve.
|
|
1131
|
+
*/
|
|
1132
|
+
internal fun createEmptyMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1133
|
+
createErrorMediaItem(BrowserPathHelper.EMPTY_PATH, formatted)
|
|
1134
|
+
|
|
1135
|
+
/**
|
|
1136
|
+
* Builds the offline tile from the app's formatted `network-error` copy for the path being served,
|
|
1137
|
+
* so one browse list never mixes the app's locale with the device's.
|
|
1138
|
+
*/
|
|
1139
|
+
internal fun createOfflineMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1140
|
+
createErrorMediaItem(BrowserPathHelper.OFFLINE_PATH, formatted)
|
|
1141
|
+
|
|
1142
|
+
/**
|
|
1143
|
+
* Builds the tile a failed browse or search serves, from the formatted copy for the error the
|
|
1144
|
+
* request's exception mapped to. The true offline case is handled separately by the networkMonitor
|
|
1145
|
+
* guards; anything reaching a catch block is an online-but-failed request (e.g. server down, bad
|
|
1146
|
+
* status), so it must NOT be labelled "no internet connection".
|
|
1147
|
+
*/
|
|
1148
|
+
internal fun createBrowseErrorMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1149
|
+
createErrorMediaItem(BrowserPathHelper.ERROR_PATH, formatted)
|
|
1150
|
+
|
|
1151
|
+
/**
|
|
1152
|
+
* What a non-root browse level or a search serves: its own items, or the lone empty tile when it
|
|
1153
|
+
* came back with none. [formatted] is a JS hop, so it runs only when there is nothing to show. The
|
|
1154
|
+
* root is not served through here — an empty tab list is a different condition.
|
|
1155
|
+
*/
|
|
1156
|
+
internal suspend fun browseLevelItems(
|
|
1157
|
+
children: List<MediaItem>,
|
|
1158
|
+
formatted: suspend () -> FormattedNavigationError,
|
|
1159
|
+
): List<MediaItem> = children.ifEmpty { listOf(createEmptyMediaItem(formatted())) }
|
|
1160
|
+
|
|
1161
|
+
/** The navigation error an empty page raises: no message of its own, the path carries the copy. */
|
|
1162
|
+
internal fun emptyContentError(): NavigationError =
|
|
1163
|
+
NavigationError(NavigationErrorType.EMPTY_CONTENT, "", null, null)
|
|
1164
|
+
|
|
1165
|
+
/** The navigation error a browse or search served while offline raises. */
|
|
1166
|
+
internal fun offlineError(): NavigationError =
|
|
1167
|
+
NavigationError(NavigationErrorType.NETWORK_ERROR, "", null, null)
|
|
1168
|
+
|
|
1169
|
+
/** The failure a re-read of the browse-error tile stands on, its own exception long gone. */
|
|
1170
|
+
internal fun browseFailureError(): NavigationError =
|
|
1171
|
+
NavigationError(NavigationErrorType.UNKNOWN_ERROR, "", null, null)
|
|
1172
|
+
|
|
1173
|
+
/**
|
|
1174
|
+
* The item count [MediaSessionCallback.onSearch] announces for a search that ran. Disabled tracks
|
|
1175
|
+
* hide on Android Auto (Track.disabled), so they never inflate it; and a search with nothing
|
|
1176
|
+
* servable announces one — the empty tile [MediaSessionCallback.onGetSearchResult] serves in their
|
|
1177
|
+
* place — because a controller told zero never asks for items. The gate and failure branches
|
|
1178
|
+
* announce their own single tile by the same rule.
|
|
1179
|
+
*/
|
|
1180
|
+
internal fun announcedSearchCount(sections: List<Section>?): Int =
|
|
1181
|
+
(sections?.sumOf { section -> section.children.count { it.disabled != true } } ?: 0)
|
|
1182
|
+
.coerceAtLeast(1)
|
|
1183
|
+
|
|
1184
|
+
/**
|
|
1185
|
+
* The search each controller was last served the offline tile for. Media3 addresses a search result
|
|
1186
|
+
* by (controller, query) and keeps no record of its own, and a search has no subscription the way a
|
|
1187
|
+
* browse level does — so without this the offline tile stays on screen until the user searches
|
|
1188
|
+
* again. Only an offline-served query is kept: a search that ran found what it found, and one that
|
|
1189
|
+
* failed did so with a network.
|
|
1190
|
+
*
|
|
1191
|
+
* Written from the callback's IO scope and read from the connectivity observer, so every accessor
|
|
1192
|
+
* is synchronized.
|
|
1193
|
+
*/
|
|
1194
|
+
internal class OfflineSearchRegistry {
|
|
1195
|
+
private val searches = mutableMapOf<MediaSession.ControllerInfo, OfflineSearch>()
|
|
1196
|
+
|
|
1197
|
+
@Synchronized
|
|
1198
|
+
fun record(
|
|
1199
|
+
browser: MediaSession.ControllerInfo,
|
|
1200
|
+
query: String,
|
|
1201
|
+
params: MediaLibraryService.LibraryParams?,
|
|
1202
|
+
) {
|
|
1203
|
+
searches[browser] = OfflineSearch(browser, query, params)
|
|
1204
|
+
}
|
|
1205
|
+
|
|
1206
|
+
@Synchronized
|
|
1207
|
+
fun forget(browser: MediaSession.ControllerInfo) {
|
|
1208
|
+
searches.remove(browser)
|
|
1209
|
+
}
|
|
1210
|
+
|
|
1211
|
+
/** Takes every record: a re-run that finds the network gone again records its own. */
|
|
1212
|
+
@Synchronized
|
|
1213
|
+
fun drain(): List<OfflineSearch> = searches.values.toList().also { searches.clear() }
|
|
1214
|
+
}
|
|
1215
|
+
|
|
1216
|
+
/** One controller's unanswered search: everything announcing it again needs. */
|
|
1217
|
+
internal data class OfflineSearch(
|
|
1218
|
+
val browser: MediaSession.ControllerInfo,
|
|
1219
|
+
val query: String,
|
|
1220
|
+
val params: MediaLibraryService.LibraryParams?,
|
|
1221
|
+
)
|
|
1222
|
+
|
|
1223
|
+
/**
|
|
1224
|
+
* Remembers the query whose search threw, so [MediaSessionCallback.onGetSearchResult] serves the
|
|
1225
|
+
* browse-error tile instead of the empty one — by then the failure is otherwise indistinguishable
|
|
1226
|
+
* from a page that found nothing. Written and read from the callback's IO scope.
|
|
1227
|
+
*
|
|
1228
|
+
* One slot, matching BrowserManager's single-entry result cache: two failures in a row leave only
|
|
1229
|
+
* the later query recorded, so a late fetch of the earlier one serves the empty tile instead of the
|
|
1230
|
+
* error tile. Acceptable while only the most recent search's results are retrievable at all.
|
|
1231
|
+
*/
|
|
1232
|
+
internal class FailedSearchSlot {
|
|
1233
|
+
@Volatile private var failed: Pair<String, NavigationError>? = null
|
|
1234
|
+
|
|
1235
|
+
fun record(query: String, error: NavigationError) {
|
|
1236
|
+
failed = query to error
|
|
1237
|
+
}
|
|
1238
|
+
|
|
1239
|
+
fun clear() {
|
|
1240
|
+
failed = null
|
|
1241
|
+
}
|
|
1242
|
+
|
|
1243
|
+
/** The error [query] failed with, or null when it is not the query that failed. */
|
|
1244
|
+
fun errorFor(query: String): NavigationError? = failed?.takeIf { it.first == query }?.second
|
|
1245
|
+
}
|