react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.55
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 +32 -19
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/lib/commonjs/CLAUDE.md +7 -2
- package/lib/commonjs/features/battery.js +16 -12
- package/lib/commonjs/features/battery.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +1 -1
- package/lib/commonjs/features/browser.js +74 -24
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +3 -4
- package/lib/commonjs/features/carConnection.js.map +1 -1
- package/lib/commonjs/features/equalizer.js +9 -5
- package/lib/commonjs/features/equalizer.js.map +1 -1
- package/lib/commonjs/features/errors.js +35 -21
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/favorites.js +15 -13
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +12 -6
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +16 -14
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +5 -1
- package/lib/commonjs/features/network.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js +28 -14
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/output.js +8 -4
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +10 -5
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +6 -5
- package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
- package/lib/commonjs/features/playback/playing.js +5 -3
- package/lib/commonjs/features/playback/playing.js.map +1 -1
- package/lib/commonjs/features/playback/progress.js +11 -5
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +3 -3
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +6 -5
- package/lib/commonjs/features/playback/volume.js.map +1 -1
- package/lib/commonjs/features/player/options.js +20 -10
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +34 -38
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +0 -1
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +48 -20
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +2 -1
- package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
- package/lib/commonjs/features/queue/shuffle.js +0 -1
- package/lib/commonjs/features/queue/shuffle.js.map +1 -1
- package/lib/commonjs/features/remoteControls.js +59 -35
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +15 -6
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +6 -9
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +13 -12
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +6 -4
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -1
- package/lib/commonjs/utils/useDebug.js +16 -3
- package/lib/commonjs/utils/useDebug.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +2 -4
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
- package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +1 -3
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/CLAUDE.md +7 -2
- package/lib/module/features/battery.js +16 -12
- package/lib/module/features/battery.js.map +1 -1
- package/lib/module/features/browser-config.js +1 -1
- package/lib/module/features/browser.js +74 -24
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +3 -4
- package/lib/module/features/carConnection.js.map +1 -1
- package/lib/module/features/equalizer.js +9 -5
- package/lib/module/features/equalizer.js.map +1 -1
- package/lib/module/features/errors.js +35 -21
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/favorites.js +15 -13
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +12 -6
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +16 -14
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +5 -1
- package/lib/module/features/network.js.map +1 -1
- package/lib/module/features/nowPlaying.js +28 -14
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/output.js +8 -4
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +10 -5
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +6 -5
- package/lib/module/features/playback/playWhenReady.js.map +1 -1
- package/lib/module/features/playback/playing.js +5 -3
- package/lib/module/features/playback/playing.js.map +1 -1
- package/lib/module/features/playback/progress.js +11 -5
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/state.js +3 -3
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +6 -1
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +6 -5
- package/lib/module/features/playback/volume.js.map +1 -1
- package/lib/module/features/player/options.js +20 -10
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +34 -38
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +0 -1
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +48 -20
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +2 -1
- package/lib/module/features/queue/repeatMode.js.map +1 -1
- package/lib/module/features/queue/shuffle.js +0 -1
- package/lib/module/features/queue/shuffle.js.map +1 -1
- package/lib/module/features/remoteControls.js +59 -35
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +15 -6
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +6 -9
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +13 -12
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +6 -4
- package/lib/module/utils/getTrackIdentity.js.map +1 -1
- package/lib/module/utils/useDebug.js +16 -3
- package/lib/module/utils/useDebug.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +2 -4
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/parseSearchResponse.js +3 -4
- package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/module/web/browser/sections.js +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +1 -3
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/features/battery.d.ts +17 -12
- package/lib/typescript/src/features/battery.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +64 -24
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +3 -4
- package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +9 -5
- package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts +37 -22
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/favorites.d.ts +15 -13
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +14 -8
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +37 -17
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +5 -1
- package/lib/typescript/src/features/network.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +28 -14
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +10 -5
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
- package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +16 -3
- package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +11 -5
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +8 -3
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +6 -5
- package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +52 -37
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +65 -60
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +0 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +48 -20
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +0 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +58 -25
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +15 -7
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +54 -57
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +181 -144
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +6 -9
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +13 -12
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +6 -4
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -1
- package/lib/typescript/src/utils/useDebug.d.ts +16 -3
- package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/CLAUDE.md +7 -2
- package/src/docs-floors.test.ts +71 -0
- package/src/features/battery.ts +17 -13
- package/src/features/browser-config.ts +1 -1
- package/src/features/browser.ts +65 -24
- package/src/features/carConnection.ts +3 -4
- package/src/features/equalizer.ts +9 -5
- package/src/features/errors.ts +37 -22
- package/src/features/favorites.ts +15 -13
- package/src/features/gate.ts +14 -8
- package/src/features/metadata.ts +37 -17
- package/src/features/network.ts +5 -1
- package/src/features/nowPlaying.ts +28 -14
- package/src/features/output.ts +8 -4
- package/src/features/playback/controls.ts +10 -5
- package/src/features/playback/playWhenReady.ts +6 -5
- package/src/features/playback/playing.ts +16 -3
- package/src/features/playback/progress.ts +11 -5
- package/src/features/playback/state.ts +8 -3
- package/src/features/playback/trackPlaybackTime.ts +9 -2
- package/src/features/playback/volume.ts +6 -5
- package/src/features/player/options.ts +54 -43
- package/src/features/player/setup.ts +67 -61
- package/src/features/queue/activeTrack.ts +0 -1
- package/src/features/queue/queue.ts +48 -20
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +0 -1
- package/src/features/remoteControls.ts +59 -35
- package/src/features/sleepTimer.ts +15 -7
- package/src/types/browser-nodes.ts +54 -57
- package/src/types/browser.ts +183 -146
- package/src/utils/LazyNativeEmitter.ts +6 -9
- package/src/utils/NativeUpdatedValue.ts +13 -12
- package/src/utils/getTrackIdentity.ts +6 -4
- package/src/utils/useDebug.ts +16 -3
- package/src/web/NativeAudioBrowser.ts +2 -4
- package/src/web/browser/parseSearchResponse.ts +3 -4
- package/src/web/browser/sections.ts +1 -1
- package/src/web/util/BrowserPathHelper.ts +1 -3
- package/website/guide/android-auto.md +25 -13
- package/website/guide/android-certificates.md +199 -120
- package/website/guide/artwork.md +93 -48
- package/website/guide/audio-output.md +86 -68
- package/website/guide/automotive.md +15 -10
- package/website/guide/basic-usage.md +5 -2
- package/website/guide/battery.md +50 -23
- package/website/guide/browser.md +155 -68
- package/website/guide/carplay.md +132 -49
- package/website/guide/configuration.md +85 -49
- package/website/guide/equalizer.md +36 -32
- package/website/guide/errors.md +106 -64
- package/website/guide/favorites.md +41 -31
- package/website/guide/gate.md +24 -10
- package/website/guide/getting-started.md +55 -2
- package/website/guide/hooks.md +53 -47
- package/website/guide/live-streams.md +80 -49
- package/website/guide/metadata.md +87 -53
- package/website/guide/migrating-from-track-player.md +94 -49
- package/website/guide/native-callback-fetch.md +46 -36
- package/website/guide/network.md +36 -20
- package/website/guide/now-playing.md +72 -44
- package/website/guide/playback.md +112 -35
- package/website/guide/queue.md +77 -43
- package/website/guide/remote-controls.md +87 -29
- package/website/guide/search.md +37 -22
- package/website/guide/sleep-timer.md +35 -14
- package/website/guide/track.md +59 -35
|
@@ -12,9 +12,8 @@ import com.margelo.nitro.audiobrowser.RemoteButtonLayout
|
|
|
12
12
|
import timber.log.Timber
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
|
-
* Whether a surface draws this button itself
|
|
16
|
-
* Next in FORWARD everywhere
|
|
17
|
-
* (the heart `userRating`, drawn as the car media app's rating control).
|
|
15
|
+
* Whether a surface draws this button itself from the standard PlaybackState: Previous in BACK and
|
|
16
|
+
* Next in FORWARD everywhere, and the favorite on Android Automotive OS (its rating control).
|
|
18
17
|
*/
|
|
19
18
|
private fun SlottedButton.isDrawnBySurface(automotive: Boolean): Boolean =
|
|
20
19
|
(button == RemoteButton.SKIP_TO_PREVIOUS && slot == ButtonSlot.BACK) ||
|
|
@@ -22,15 +21,11 @@ private fun SlottedButton.isDrawnBySurface(automotive: Boolean): Boolean =
|
|
|
22
21
|
(automotive && button == RemoteButton.FAVORITE)
|
|
23
22
|
|
|
24
23
|
/**
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
* `
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
* disappearing, because every flattening
|
|
31
|
-
* (`CommandButton.getCustomLayoutFromMediaButtonPreferences`, run by both `MediaSessionLegacyStub`
|
|
32
|
-
* for Android Auto and the Android 13+ controls, and `DefaultMediaNotificationProvider` for the
|
|
33
|
-
* notification) keeps a button only if it won BACK, won FORWARD, or *contains* OVERFLOW.
|
|
24
|
+
* The slot, then OVERFLOW. Media3 reads `slots` as a preference order and places a button in the
|
|
25
|
+
* first that exists, is free and allows it; every surface's flattening
|
|
26
|
+
* (`CommandButton.getCustomLayoutFromMediaButtonPreferences`, `DefaultMediaNotificationProvider`)
|
|
27
|
+
* keeps only a button that won BACK or FORWARD or lists OVERFLOW, so without the fallback a button
|
|
28
|
+
* that loses its slot disappears instead of demoting.
|
|
34
29
|
*/
|
|
35
30
|
internal fun media3SlotsFor(slot: ButtonSlot): IntArray =
|
|
36
31
|
when (slot) {
|
|
@@ -40,24 +35,13 @@ internal fun media3SlotsFor(slot: ButtonSlot): IntArray =
|
|
|
40
35
|
}
|
|
41
36
|
|
|
42
37
|
/**
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
* Responsibilities:
|
|
46
|
-
* - Maps player capabilities to MediaSession commands
|
|
47
|
-
* - Builds the single, slot-annotated button layout published to every surface
|
|
48
|
-
* - Updates MediaSession configuration and applies changes immediately
|
|
49
|
-
* - Builds connection results for new MediaSession controllers
|
|
50
|
-
* - Handles execution of custom MediaSession commands (jump actions)
|
|
51
|
-
*
|
|
52
|
-
* Capabilities decide what the player can do; the button layout decides where those buttons sit.
|
|
53
|
-
* Placement never revokes a capability — a control left out of the layout still works from a
|
|
54
|
-
* Bluetooth remote or headset.
|
|
38
|
+
* Maps player capabilities to the session's available commands and its one button layout.
|
|
55
39
|
*
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
* `
|
|
59
|
-
*
|
|
60
|
-
*
|
|
40
|
+
* Capabilities decide what works; the layout only decides where buttons sit, so a control left out
|
|
41
|
+
* of the layout still works from a Bluetooth remote or headset. The layout is published
|
|
42
|
+
* session-wide via `setMediaButtonPreferences`, which Media3 turns into the notification and the
|
|
43
|
+
* legacy PlaybackState that Android Auto and the Android 13+ media controls read. A per-controller
|
|
44
|
+
* layout would reach neither: Android Auto connects as a legacy controller.
|
|
61
45
|
*/
|
|
62
46
|
class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
63
47
|
|
|
@@ -66,21 +50,14 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
66
50
|
private const val CUSTOM_ACTION_JUMP_FORWARD = "JUMP_FORWARD"
|
|
67
51
|
const val CUSTOM_ACTION_FAVORITE = "FAVORITE"
|
|
68
52
|
|
|
69
|
-
|
|
53
|
+
// Seconds; matches PlayerUpdateOptions' default.
|
|
70
54
|
private const val DEFAULT_JUMP_INTERVAL = 15.0
|
|
71
55
|
}
|
|
72
56
|
|
|
73
57
|
/**
|
|
74
|
-
* Media3
|
|
75
|
-
* the
|
|
76
|
-
*
|
|
77
|
-
* The match is exact, not rounded. A numbered icon is a claim about how far the button seeks, so
|
|
78
|
-
* a 14.6s interval must not draw "15" — it would promise a jump the player never makes. Better an
|
|
79
|
-
* honest arrow than a wrong number.
|
|
80
|
-
*
|
|
81
|
-
* The icon constant — not the drawable — is what a controller that renders its own UI reads, and
|
|
82
|
-
* it is carried through the legacy conversion Android Auto consumes. Building a button with only
|
|
83
|
-
* `setIconResId` leaves the constant at ICON_UNDEFINED, so the car has nothing to draw.
|
|
58
|
+
* Media3 has numbered icons only for 5, 10, 15 and 30 seconds. The match is exact: a numbered
|
|
59
|
+
* icon promises how far the button seeks, so 14.6 gets the plain arrow, not "15". Android Auto
|
|
60
|
+
* draws from this icon constant, not from an icon resource set with `setIconResId`.
|
|
84
61
|
*/
|
|
85
62
|
private fun jumpForwardIcon(seconds: Double): Int =
|
|
86
63
|
when (seconds) {
|
|
@@ -100,19 +77,15 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
100
77
|
else -> CommandButton.ICON_SKIP_BACK
|
|
101
78
|
}
|
|
102
79
|
|
|
103
|
-
/** Player commands available to every controller, derived from capabilities and liveness */
|
|
104
80
|
var playerCommands: MediaPlayer.Commands = MediaSession.ConnectionResult.DEFAULT_PLAYER_COMMANDS
|
|
105
81
|
private set
|
|
106
82
|
|
|
107
|
-
/** Session commands available to every controller, derived from capabilities alone */
|
|
108
83
|
lateinit var sessionCommands: SessionCommands
|
|
109
84
|
private set
|
|
110
85
|
|
|
111
|
-
/** The single slot-annotated button layout, published to every surface */
|
|
112
86
|
lateinit var buttonPreferences: List<CommandButton>
|
|
113
87
|
private set
|
|
114
88
|
|
|
115
|
-
/** Stored state for rebuilding layout */
|
|
116
89
|
private var currentCapabilities: PlayerCapabilities =
|
|
117
90
|
PlayerCapabilities(
|
|
118
91
|
play = null,
|
|
@@ -135,9 +108,9 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
135
108
|
private var currentBackwardJumpInterval: Double = DEFAULT_JUMP_INTERVAL
|
|
136
109
|
|
|
137
110
|
/**
|
|
138
|
-
*
|
|
139
|
-
*
|
|
140
|
-
*
|
|
111
|
+
* FAVORITE is a session command, so it is absent here. Skip maps to two commands: Media3
|
|
112
|
+
* advertises the platform skip action for either, and its notification uses the media-item one,
|
|
113
|
+
* so a disabled skip must remove both.
|
|
141
114
|
*/
|
|
142
115
|
private val capabilityPlayerCommands: Map<Capability, List<@MediaPlayer.Command Int>> =
|
|
143
116
|
mapOf(
|
|
@@ -155,11 +128,9 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
155
128
|
Capability.JUMP_BACKWARD to listOf(MediaPlayer.COMMAND_SEEK_BACK),
|
|
156
129
|
)
|
|
157
130
|
|
|
158
|
-
//
|
|
159
|
-
// `
|
|
160
|
-
// precede the init block or it would still be null when the constructor runs (NPE).
|
|
131
|
+
// capabilityPlayerCommands must stay above `init`: properties initialize in textual order, and
|
|
132
|
+
// `init` reads it through buildPlayerCommands.
|
|
161
133
|
init {
|
|
162
|
-
// Initialize with defaults matching PlayerUpdateOptions (all capabilities enabled)
|
|
163
134
|
val defaultCapabilities = currentCapabilities
|
|
164
135
|
|
|
165
136
|
playerCommands = buildPlayerCommands(defaultCapabilities, live = false)
|
|
@@ -172,20 +143,9 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
172
143
|
}
|
|
173
144
|
|
|
174
145
|
/**
|
|
175
|
-
*
|
|
176
|
-
*
|
|
177
|
-
*
|
|
178
|
-
* @param capabilities Global capabilities that enable commands for ALL MediaSession controllers
|
|
179
|
-
* (Bluetooth, Android Auto, lock screen, notification, etc.). All capabilities are enabled by
|
|
180
|
-
* default - only false values disable them.
|
|
181
|
-
* @param remoteButtonLayout Button layout, published to every surface — the notification, Android
|
|
182
|
-
* Auto, and the Android 13+ system media controls. When null the layout is derived from
|
|
183
|
-
* capabilities using smart defaults.
|
|
184
|
-
* @param searchAvailable Whether search functionality is configured and available
|
|
185
|
-
* @param forwardJumpInterval Seconds per forward jump; selects the button's icon constant
|
|
186
|
-
* @param backwardJumpInterval Seconds per backward jump; selects the button's icon constant
|
|
187
|
-
*
|
|
188
|
-
* Manager initializes with defaults: all capabilities enabled, default placement.
|
|
146
|
+
* Rebuilds and publishes commands and layout. A null [remoteButtonLayout] derives the layout from
|
|
147
|
+
* [capabilities]. The favorite and live states set by [updateFavoriteState] and [updateLiveState]
|
|
148
|
+
* carry over.
|
|
189
149
|
*/
|
|
190
150
|
fun updateMediaSession(
|
|
191
151
|
mediaSession: MediaSession,
|
|
@@ -195,31 +155,25 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
195
155
|
forwardJumpInterval: Double = DEFAULT_JUMP_INTERVAL,
|
|
196
156
|
backwardJumpInterval: Double = DEFAULT_JUMP_INTERVAL,
|
|
197
157
|
) {
|
|
198
|
-
// Store state for future rebuilds. The favorite state is deliberately NOT reset here: options
|
|
199
|
-
// and favorites change independently, and rebuilding the layout as un-favorited would blank the
|
|
200
|
-
// heart on every updateOptions() call until the next track change happened to refresh it.
|
|
201
158
|
currentCapabilities = capabilities
|
|
202
159
|
currentRemoteButtonLayout = remoteButtonLayout
|
|
203
160
|
currentForwardJumpInterval = forwardJumpInterval
|
|
204
161
|
currentBackwardJumpInterval = backwardJumpInterval
|
|
205
162
|
|
|
206
|
-
// Commands gate on capabilities and liveness, never on placement, so a control left out of the
|
|
207
|
-
// layout still works from a Bluetooth remote or headset.
|
|
208
163
|
playerCommands = buildPlayerCommands(capabilities, currentLive)
|
|
209
164
|
sessionCommands = buildSessionCommands(capabilities, searchAvailable)
|
|
210
165
|
buttonPreferences =
|
|
211
166
|
buildButtonPreferences(deriveButtonSlots(capabilities, remoteButtonLayout), currentFavorited)
|
|
212
167
|
|
|
213
|
-
//
|
|
214
|
-
// available; Media3 disables buttons whose backing command is missing.
|
|
168
|
+
// Commands first: Media3 disables a button whose command is not yet available.
|
|
215
169
|
publishAvailableCommands(mediaSession)
|
|
216
170
|
publishButtonPreferences(mediaSession)
|
|
217
171
|
}
|
|
218
172
|
|
|
219
173
|
/**
|
|
220
|
-
* Withholds seeking within the current item while it is live, whatever
|
|
221
|
-
*
|
|
222
|
-
*
|
|
174
|
+
* Withholds seeking within the current item while it is live, whatever `seekTo` says: a
|
|
175
|
+
* controller offered that command draws a seek bar a live stream cannot fill. Call whenever the
|
|
176
|
+
* current track may have changed.
|
|
223
177
|
*/
|
|
224
178
|
fun updateLiveState(mediaSession: MediaSession, live: Boolean) {
|
|
225
179
|
if (currentLive == live) return
|
|
@@ -228,10 +182,8 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
228
182
|
publishAvailableCommands(mediaSession)
|
|
229
183
|
}
|
|
230
184
|
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
* controllers that connect later, and an Android Auto session lives until the car shuts down.
|
|
234
|
-
*/
|
|
185
|
+
// [buildConnectionResult] only reaches controllers that connect later; an Android Auto connection
|
|
186
|
+
// lasts until the car shuts down.
|
|
235
187
|
private fun publishAvailableCommands(mediaSession: MediaSession) {
|
|
236
188
|
mediaSession.connectedControllers.forEach {
|
|
237
189
|
mediaSession.setAvailableCommands(it, sessionCommands, playerCommands)
|
|
@@ -239,17 +191,11 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
239
191
|
}
|
|
240
192
|
|
|
241
193
|
/**
|
|
242
|
-
*
|
|
243
|
-
*
|
|
244
|
-
*
|
|
245
|
-
*
|
|
246
|
-
*
|
|
247
|
-
* connects as a legacy controller rather than a Media3 one. But it stops at
|
|
248
|
-
* `setPlatformMediaButtonPreferences`, which recomputes the legacy custom layout and only
|
|
249
|
-
* re-broadcasts when the reservation flags themselves change — it never refreshes the
|
|
250
|
-
* PlaybackState carrying the custom actions. Only the notification-controller overload calls
|
|
251
|
-
* `updateLegacySessionPlaybackState`, so without it a reordering that leaves the flags untouched
|
|
252
|
-
* sits invisible until some unrelated playback event republishes the state.
|
|
194
|
+
* Both calls are needed. Only the session-wide one reaches Android Auto, a legacy controller, but
|
|
195
|
+
* it re-broadcasts only when the slot-reservation flags change, never the PlaybackState carrying
|
|
196
|
+
* the custom actions. The notification-controller overload calls
|
|
197
|
+
* `updateLegacySessionPlaybackState`; without it a reordered layout stays unseen until some
|
|
198
|
+
* playback event republishes the state.
|
|
253
199
|
*/
|
|
254
200
|
private fun publishButtonPreferences(mediaSession: MediaSession) {
|
|
255
201
|
Timber.Forest.d(
|
|
@@ -263,10 +209,7 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
263
209
|
}
|
|
264
210
|
}
|
|
265
211
|
|
|
266
|
-
/**
|
|
267
|
-
* Updates the favorite button state and reapplies the button preferences. Call this when the
|
|
268
|
-
* current track changes or when favorite state is toggled.
|
|
269
|
-
*/
|
|
212
|
+
/** Call when the current track changes or its favorite state is toggled. */
|
|
270
213
|
fun updateFavoriteState(mediaSession: MediaSession, favorited: Boolean?) {
|
|
271
214
|
Timber.Forest.d(
|
|
272
215
|
"updateFavoriteState called: currentFavorited=$currentFavorited, newFavorited=$favorited"
|
|
@@ -278,24 +221,15 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
278
221
|
|
|
279
222
|
currentFavorited = favorited
|
|
280
223
|
|
|
281
|
-
// Only the heart's icon and label change, so the commands stay as they are.
|
|
282
224
|
buttonPreferences =
|
|
283
225
|
buildButtonPreferences(
|
|
284
226
|
deriveButtonSlots(currentCapabilities, currentRemoteButtonLayout),
|
|
285
227
|
favorited,
|
|
286
228
|
)
|
|
287
229
|
|
|
288
|
-
// Republish so already-connected surfaces (Android Auto especially) flip the heart — without
|
|
289
|
-
// this it stays stale for the life of the connection.
|
|
290
230
|
publishButtonPreferences(mediaSession)
|
|
291
231
|
}
|
|
292
232
|
|
|
293
|
-
/**
|
|
294
|
-
* Builds a MediaSession ConnectionResult with current command configuration
|
|
295
|
-
*
|
|
296
|
-
* @param session The MediaSession to build the result for
|
|
297
|
-
* @return Configured ConnectionResult with current commands and layout
|
|
298
|
-
*/
|
|
299
233
|
fun buildConnectionResult(session: MediaSession): MediaSession.ConnectionResult {
|
|
300
234
|
return MediaSession.ConnectionResult.AcceptedResultBuilder(session)
|
|
301
235
|
.setMediaButtonPreferences(buttonPreferences)
|
|
@@ -304,13 +238,6 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
304
238
|
.build()
|
|
305
239
|
}
|
|
306
240
|
|
|
307
|
-
/**
|
|
308
|
-
* Handles custom MediaSession commands
|
|
309
|
-
*
|
|
310
|
-
* @param command The custom command to handle
|
|
311
|
-
* @param player The AudioBrowser instance to execute commands on
|
|
312
|
-
* @return true if command was handled, false otherwise
|
|
313
|
-
*/
|
|
314
241
|
fun handleCustomCommand(command: SessionCommand, player: Player): Boolean {
|
|
315
242
|
Timber.Forest.d("onCustomCommand: action=${command.customAction}")
|
|
316
243
|
|
|
@@ -326,9 +253,8 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
326
253
|
true
|
|
327
254
|
}
|
|
328
255
|
CUSTOM_ACTION_FAVORITE -> {
|
|
256
|
+
// Unreached: MediaSessionCallback.onCustomCommand handles the favorite itself.
|
|
329
257
|
Timber.Forest.d("Favorite command received")
|
|
330
|
-
// Return true to indicate this was handled - the actual callback
|
|
331
|
-
// is triggered in MediaSessionCallback.onCustomCommand
|
|
332
258
|
true
|
|
333
259
|
}
|
|
334
260
|
else -> {
|
|
@@ -358,12 +284,8 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
358
284
|
return playerCommandsBuilder.build()
|
|
359
285
|
}
|
|
360
286
|
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
* whether or not the layout places it — placement governs where a button appears, not whether its
|
|
364
|
-
* command exists. Media3 disables a button whose backing command is missing, so every button the
|
|
365
|
-
* layout can produce must have its command here.
|
|
366
|
-
*/
|
|
287
|
+
// Registers the command of every capability-allowed button, placed or not: Media3 disables a
|
|
288
|
+
// button whose command is missing.
|
|
367
289
|
private fun buildSessionCommands(
|
|
368
290
|
capabilities: PlayerCapabilities,
|
|
369
291
|
searchAvailable: Boolean,
|
|
@@ -371,15 +293,13 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
371
293
|
val sessionCommandsBuilder =
|
|
372
294
|
MediaSession.ConnectionResult.DEFAULT_SESSION_AND_LIBRARY_COMMANDS.buildUpon()
|
|
373
295
|
|
|
374
|
-
// Remove search commands if search is not configured
|
|
375
296
|
if (!searchAvailable) {
|
|
376
297
|
sessionCommandsBuilder.remove(SessionCommand.COMMAND_CODE_LIBRARY_SEARCH)
|
|
377
298
|
sessionCommandsBuilder.remove(SessionCommand.COMMAND_CODE_LIBRARY_GET_SEARCH_RESULT)
|
|
378
299
|
Timber.Forest.d("Removed search commands - search not configured")
|
|
379
300
|
}
|
|
380
301
|
|
|
381
|
-
// Media3 always advertises the platform rating action
|
|
382
|
-
// sets the favorite, is refused.
|
|
302
|
+
// Media3 always advertises the platform rating action, which sets the favorite.
|
|
383
303
|
if (!capabilities.isEnabled(Capability.FAVORITE)) {
|
|
384
304
|
sessionCommandsBuilder.remove(SessionCommand.COMMAND_CODE_SESSION_SET_RATING)
|
|
385
305
|
}
|
|
@@ -392,12 +312,8 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
392
312
|
return sessionCommandsBuilder.build()
|
|
393
313
|
}
|
|
394
314
|
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
* (skip). Single source for both the command a button carries and the SessionCommands registry,
|
|
398
|
-
* so a published button can never be missing the command that makes it work — Media3 silently
|
|
399
|
-
* disables buttons whose backing command is unavailable.
|
|
400
|
-
*/
|
|
315
|
+
// The one source for both the command a button carries and the registry in buildSessionCommands,
|
|
316
|
+
// so a published button cannot lack its command.
|
|
401
317
|
private fun customCommandFor(button: RemoteButton): SessionCommand? =
|
|
402
318
|
when (button) {
|
|
403
319
|
RemoteButton.JUMP_BACKWARD -> SessionCommand(CUSTOM_ACTION_JUMP_BACKWARD, Bundle())
|
|
@@ -407,11 +323,8 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
407
323
|
RemoteButton.SKIP_TO_NEXT -> null
|
|
408
324
|
}
|
|
409
325
|
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
* this and [customCommandFor] enumerate every button rather than using `else`, so adding one
|
|
413
|
-
* fails the build until it has been given an action on both sides.
|
|
414
|
-
*/
|
|
326
|
+
// This and customCommandFor list every button instead of `else`, so a new button fails the build
|
|
327
|
+
// until it has an action.
|
|
415
328
|
private fun playerCommandFor(button: RemoteButton): Int? =
|
|
416
329
|
when (button) {
|
|
417
330
|
RemoteButton.SKIP_TO_PREVIOUS -> MediaPlayer.COMMAND_SEEK_TO_PREVIOUS
|
|
@@ -421,7 +334,6 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
421
334
|
RemoteButton.FAVORITE -> null
|
|
422
335
|
}
|
|
423
336
|
|
|
424
|
-
/** The single definition of a control's icon and label, shared by every surface. */
|
|
425
337
|
private fun buttonFor(button: RemoteButton, favorited: Boolean?): CommandButton.Builder {
|
|
426
338
|
val builder =
|
|
427
339
|
when (button) {
|
|
@@ -449,18 +361,9 @@ class MediaSessionCommandManager(private val automotive: Boolean) {
|
|
|
449
361
|
}
|
|
450
362
|
|
|
451
363
|
/**
|
|
452
|
-
*
|
|
453
|
-
* slots
|
|
454
|
-
*
|
|
455
|
-
* Buttons a surface draws itself are left out ([isDrawnBySurface]): Media3 then keeps the
|
|
456
|
-
* standard skip actions and reserves their slots. Sent as buttons they arrive as custom actions,
|
|
457
|
-
* which Android Automotive OS's car media app places by its own rules, not either side of
|
|
458
|
-
* play/pause.
|
|
459
|
-
*
|
|
460
|
-
* Each button gets its requested slot followed by OVERFLOW as a fallback. `slots` is an ordered
|
|
461
|
-
* preference list, and every surface caps how many buttons it renders — a head unit, the
|
|
462
|
-
* collapsed notification, the Android 13+ media controls all truncate differently. Without a
|
|
463
|
-
* fallback a button that loses its preferred slot disappears entirely instead of demoting.
|
|
364
|
+
* Leaves out the buttons a surface draws itself, so Media3 keeps the standard skip actions and
|
|
365
|
+
* reserves their slots. Sent as buttons they arrive as custom actions, which Android Automotive
|
|
366
|
+
* OS's car media app places by its own rules rather than beside play/pause.
|
|
464
367
|
*/
|
|
465
368
|
private fun buildButtonPreferences(
|
|
466
369
|
slots: List<SlottedButton>,
|