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
|
@@ -18,10 +18,8 @@ import kotlinx.coroutines.launch
|
|
|
18
18
|
import timber.log.Timber
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
|
-
* What
|
|
22
|
-
*
|
|
23
|
-
* Mirrors iOS's NowPlayingUpdater / NowPlayingInfoController split: this seam is what makes the
|
|
24
|
-
* precedence/guard/dedupe logic testable with a fake.
|
|
21
|
+
* What [NowPlayingUpdater] needs from the platform; [Player] implements it, tests fake it. Mirrors
|
|
22
|
+
* iOS's NowPlayingUpdater / NowPlayingInfoController split.
|
|
25
23
|
*/
|
|
26
24
|
interface NowPlayingSurface {
|
|
27
25
|
val currentIndex: Int?
|
|
@@ -30,29 +28,24 @@ interface NowPlayingSurface {
|
|
|
30
28
|
val playbackError: PlaybackError?
|
|
31
29
|
|
|
32
30
|
/**
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
* the session paused-but-alive. The formatter receives this; feeding it the masked value breaks
|
|
37
|
-
* its output exactly in the error case the mask exists for.
|
|
31
|
+
* The underlying ExoPlayer's real play intent, false during a transient audio focus loss — not
|
|
32
|
+
* the InterceptingPlayer-masked value, which reads false through a masked terminal error. The
|
|
33
|
+
* formatter gets this, so the masked value breaks its output in exactly that error case.
|
|
38
34
|
*/
|
|
39
35
|
val playWhenReady: Boolean
|
|
40
36
|
val isRebuffering: Boolean
|
|
41
37
|
|
|
42
|
-
/** Device connectivity, used to classify a stall as offline vs a plain rebuffer. */
|
|
43
38
|
val isOnline: Boolean
|
|
44
39
|
|
|
45
40
|
val hasNowPlayingArtworkConfig: Boolean
|
|
46
41
|
|
|
47
|
-
/** Stamp title/secondary/album onto the playing item. */
|
|
48
42
|
fun stampFields(index: Int, track: Track, title: String?, secondaryLine: String?, album: String?)
|
|
49
43
|
|
|
50
|
-
/** Stamp a resolved artwork uri onto the playing item. */
|
|
51
44
|
fun stampArtwork(index: Int, track: Track, uri: String)
|
|
52
45
|
|
|
53
46
|
/**
|
|
54
|
-
*
|
|
55
|
-
*
|
|
47
|
+
* Resolves [track]'s artwork through the `nowPlayingArtwork` config. Returns null when it
|
|
48
|
+
* produced nothing; logs its own errors rather than throwing.
|
|
56
49
|
*/
|
|
57
50
|
suspend fun resolveNowPlayingArtwork(track: Track, sizePx: Double): String?
|
|
58
51
|
|
|
@@ -60,42 +53,33 @@ interface NowPlayingSurface {
|
|
|
60
53
|
}
|
|
61
54
|
|
|
62
55
|
/**
|
|
63
|
-
*
|
|
64
|
-
*
|
|
65
|
-
* metadata, and the once-per-track artwork keying. Mirrors iOS's NowPlayingUpdater. The platform is
|
|
66
|
-
* reached only through [NowPlayingSurface]; the JS formatter arrives as a plain suspend lambda
|
|
67
|
-
* (wrapped at the Nitro boundary in Player.setup), so every guard here runs under JVM tests.
|
|
56
|
+
* Renders the now-playing lines with the precedence flash > override > formatter > track, reaching
|
|
57
|
+
* the platform only through [NowPlayingSurface]. Mirrors iOS's NowPlayingUpdater.
|
|
68
58
|
*/
|
|
69
59
|
class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scope: CoroutineScope) {
|
|
70
60
|
|
|
71
|
-
/**
|
|
61
|
+
/**
|
|
62
|
+
* When false, the surface gets the raw track fields, while the event and [getNowPlaying] still
|
|
63
|
+
* report the flash and override.
|
|
64
|
+
*/
|
|
72
65
|
var enabled = true
|
|
73
66
|
|
|
74
|
-
/**
|
|
67
|
+
/** Customizes the lines asynchronously; a null result or a throw leaves the default lines. */
|
|
75
68
|
var formatter: (suspend (FormatNowPlayingParams) -> NowPlayingUpdate?)? = null
|
|
76
69
|
|
|
77
|
-
/** Latest live timed (ICY/ID3) metadata; cleared on track change. */
|
|
78
70
|
@Volatile private var latestTimedMetadata: TimedMetadata? = null
|
|
79
71
|
|
|
80
|
-
/** Imperative override (from `updateNowPlaying()`); cleared on track change. */
|
|
81
72
|
private var override: NowPlayingUpdate? = null
|
|
82
73
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
* formatter and the override while active, so live metadata can't stomp it mid-flash. Reverted by
|
|
86
|
-
* a coroutine delay on [scope] — NOT a JS timer, which pauses with a backgrounded host (and the
|
|
87
|
-
* lock screen is exactly the backgrounded case) — and cleared early on track change.
|
|
88
|
-
*/
|
|
74
|
+
// Reverted by a coroutine on [scope], not a JS timer: a JS timer pauses with a backgrounded host,
|
|
75
|
+
// and the lock screen is the backgrounded case.
|
|
89
76
|
private var flash: NowPlayingUpdate? = null
|
|
90
77
|
private var flashRevert: Job? = null
|
|
91
78
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
* notably a flash — has superseded the one that launched it.
|
|
95
|
-
*/
|
|
79
|
+
// An async formatter result applies only if no newer render (a flash, notably) came after the one
|
|
80
|
+
// that launched it.
|
|
96
81
|
private var renderGeneration = 0L
|
|
97
82
|
|
|
98
|
-
/** The last fields actually published, to dedupe redundant stamps. */
|
|
99
83
|
private data class Published(
|
|
100
84
|
val index: Int,
|
|
101
85
|
val trackId: String?,
|
|
@@ -106,29 +90,19 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
106
90
|
|
|
107
91
|
private var lastPublished: Published? = null
|
|
108
92
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
* track's, [render] skips its interim default stamp, which would flash the track's own line over
|
|
112
|
-
* the formatter's until the async result lands.
|
|
113
|
-
*/
|
|
93
|
+
// While this is the rendering track's identity, [render] skips its interim default stamp, which
|
|
94
|
+
// would flash the track's own line over the formatter's until the async result lands.
|
|
114
95
|
private var formattedTrackId: String? = null
|
|
115
96
|
|
|
116
|
-
/**
|
|
117
|
-
* The track identity (id-or-src, falling back to path) whose now-playing artwork has been
|
|
118
|
-
* resolved (or is being resolved), so a `nowPlayingArtwork` resolve runs once per track — id-less
|
|
119
|
-
* tracks included — instead of on every render.
|
|
120
|
-
*/
|
|
121
97
|
private var artworkResolvedForTrack: String? = null
|
|
122
98
|
|
|
123
|
-
|
|
99
|
+
// Square. Matches iOS, which caps the screen width at 1200.
|
|
124
100
|
private val artworkSizePx = 1200.0
|
|
125
101
|
|
|
126
|
-
/** Cancels in-flight work. Called from Player.destroy. */
|
|
127
102
|
fun destroy() {
|
|
128
103
|
scope.cancel()
|
|
129
104
|
}
|
|
130
105
|
|
|
131
|
-
/** Sets/clears the imperative override (null reverts to track metadata) and re-renders. */
|
|
132
106
|
fun updateNowPlaying(update: NowPlayingUpdate?) {
|
|
133
107
|
override = update
|
|
134
108
|
render()
|
|
@@ -147,7 +121,6 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
147
121
|
render()
|
|
148
122
|
}
|
|
149
123
|
|
|
150
|
-
/** Clears an active flash immediately, reverting to the live metadata. No-op when none. */
|
|
151
124
|
fun clearNowPlayingFlash() {
|
|
152
125
|
if (flash == null) return
|
|
153
126
|
cancelFlash()
|
|
@@ -161,8 +134,8 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
161
134
|
}
|
|
162
135
|
|
|
163
136
|
/**
|
|
164
|
-
* The lines the
|
|
165
|
-
*
|
|
137
|
+
* The lines on the surface for the current track, formatter output included. Before the track's
|
|
138
|
+
* first render, and while [enabled] is false, the flash, override or track fields instead.
|
|
166
139
|
*/
|
|
167
140
|
fun getNowPlaying(): NowPlayingMetadata? {
|
|
168
141
|
val track = surface.currentTrack ?: return null
|
|
@@ -197,9 +170,8 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
197
170
|
)
|
|
198
171
|
|
|
199
172
|
/**
|
|
200
|
-
*
|
|
201
|
-
*
|
|
202
|
-
* artwork.
|
|
173
|
+
* Makes the next [render] stamp lines and artwork in full. Call when a media item becomes current
|
|
174
|
+
* or is replaced in place: it carries its own default lines and artwork.
|
|
203
175
|
*/
|
|
204
176
|
fun forgetPublished() {
|
|
205
177
|
lastPublished = null
|
|
@@ -207,10 +179,7 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
207
179
|
artworkResolvedForTrack = null
|
|
208
180
|
}
|
|
209
181
|
|
|
210
|
-
/**
|
|
211
|
-
* Clears override, flash, timed metadata and the published lines on track change (PlayerListener
|
|
212
|
-
* transition).
|
|
213
|
-
*/
|
|
182
|
+
/** Call on track change: clears the override, flash, timed metadata and published lines. */
|
|
214
183
|
fun clearOverride() {
|
|
215
184
|
override = null
|
|
216
185
|
cancelFlash()
|
|
@@ -218,10 +187,7 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
218
187
|
forgetPublished()
|
|
219
188
|
}
|
|
220
189
|
|
|
221
|
-
/**
|
|
222
|
-
* Records the latest live timed (ICY/ID3) metadata and, when a formatter is configured, re-runs
|
|
223
|
-
* it so the live song is reflected on the now-playing surface.
|
|
224
|
-
*/
|
|
190
|
+
/** Records live (ICY/ID3) metadata; re-renders only when a formatter would use it. */
|
|
225
191
|
fun onTimedMetadataReceived(timed: TimedMetadata) {
|
|
226
192
|
latestTimedMetadata = timed
|
|
227
193
|
if (enabled && formatter != null) {
|
|
@@ -230,11 +196,8 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
230
196
|
}
|
|
231
197
|
|
|
232
198
|
/**
|
|
233
|
-
*
|
|
234
|
-
*
|
|
235
|
-
* default is stamped immediately, unless a formatter result for the track is already up, and a
|
|
236
|
-
* configured formatter customizes it asynchronously, guarded by track identity and
|
|
237
|
-
* [renderGeneration].
|
|
199
|
+
* Stamps the default lines at once, then the formatter's when its result lands, unless a newer
|
|
200
|
+
* render or a track change came first.
|
|
238
201
|
*/
|
|
239
202
|
fun render() {
|
|
240
203
|
val index = surface.currentIndex ?: return
|
|
@@ -242,15 +205,12 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
242
205
|
renderGeneration += 1
|
|
243
206
|
val generation = renderGeneration
|
|
244
207
|
|
|
245
|
-
// Metadata source. When metadata is disabled, use the raw track (ignore override + formatter);
|
|
246
|
-
// otherwise the imperative `updateNowPlaying` override wins over the track's own fields.
|
|
247
208
|
val activeOverride = if (enabled) override else null
|
|
248
209
|
val defaultTitle = activeOverride?.title ?: track.title
|
|
249
210
|
val defaultSecondary = activeOverride?.artist ?: track.artist
|
|
250
211
|
val defaultAlbum = activeOverride?.album ?: track.album
|
|
251
212
|
|
|
252
|
-
//
|
|
253
|
-
// is skipped entirely so its async result can't land on top.
|
|
213
|
+
// The formatter is skipped while a flash is up, so its async result can't land on top.
|
|
254
214
|
val activeFlash = if (enabled) flash else null
|
|
255
215
|
if (activeFlash != null) {
|
|
256
216
|
applyFields(
|
|
@@ -264,22 +224,16 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
264
224
|
return
|
|
265
225
|
}
|
|
266
226
|
|
|
267
|
-
//
|
|
268
|
-
// a formatter result for this track is on the surface.
|
|
227
|
+
// The default goes out at once so the surface never lags a track or state change.
|
|
269
228
|
val activeFormatter = if (enabled) formatter else null
|
|
270
229
|
if (activeFormatter == null || formattedTrackId != (track.identity ?: track.path)) {
|
|
271
230
|
applyFields(index, track, defaultTitle, defaultSecondary, defaultAlbum)
|
|
272
231
|
}
|
|
273
232
|
|
|
274
|
-
// If a formatter is configured, let it customize the fields asynchronously. Falls back to the
|
|
275
|
-
// default on null/throw.
|
|
276
233
|
if (activeFormatter != null) {
|
|
277
234
|
val capturedId = track.src ?: track.path
|
|
278
|
-
//
|
|
279
|
-
//
|
|
280
|
-
// and can linger true into the PLAYING transition as a rebuffer recovers. Classify by
|
|
281
|
-
// connectivity so the formatter can show "offline" vs a plain rebuffer; null when not
|
|
282
|
-
// stalled.
|
|
235
|
+
// ExoPlayer's rebuffering flag is polled on its own cadence and can linger true into PLAYING
|
|
236
|
+
// as a rebuffer recovers, so only BUFFERING counts as a stall.
|
|
283
237
|
val isStalled = surface.playbackState == PlaybackState.BUFFERING && surface.isRebuffering
|
|
284
238
|
val stalled =
|
|
285
239
|
if (isStalled) {
|
|
@@ -303,10 +257,6 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
303
257
|
Timber.e(e, "NowPlaying formatter threw; using default")
|
|
304
258
|
null
|
|
305
259
|
}
|
|
306
|
-
// Apply only if still the same track (a fast skip must not be overwritten by a stale
|
|
307
|
-
// result) AND no newer render superseded this one — without the generation check, a
|
|
308
|
-
// formatter round-trip in flight when a flash starts lands a beat later and overwrites
|
|
309
|
-
// the flash (mirrors the iOS renderGeneration guard).
|
|
310
260
|
val current = surface.currentTrack
|
|
311
261
|
val currentIdx = surface.currentIndex
|
|
312
262
|
if (
|
|
@@ -328,7 +278,6 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
328
278
|
}
|
|
329
279
|
}
|
|
330
280
|
|
|
331
|
-
/** Stamps the fields via the surface, deduped on (index, track identity, fields). */
|
|
332
281
|
private fun applyFields(
|
|
333
282
|
index: Int,
|
|
334
283
|
track: Track,
|
|
@@ -336,10 +285,9 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
336
285
|
secondaryLine: String?,
|
|
337
286
|
album: String?,
|
|
338
287
|
) {
|
|
339
|
-
//
|
|
340
|
-
//
|
|
341
|
-
//
|
|
342
|
-
// so a new track with a coincidentally identical line still publishes.
|
|
288
|
+
// The formatter reruns on every state change; restamping identical lines churns the
|
|
289
|
+
// MediaSession and flickers Android Auto. Keyed on track identity so a new track with the same
|
|
290
|
+
// lines still publishes.
|
|
343
291
|
val published = Published(index, track.identity ?: track.path, title, secondaryLine, album)
|
|
344
292
|
val unchanged = published == lastPublished
|
|
345
293
|
lastPublished = published
|
|
@@ -350,27 +298,20 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
350
298
|
if (enabled) metadata(track, title, secondaryLine, album) else layered(track)
|
|
351
299
|
)
|
|
352
300
|
|
|
353
|
-
// Resolve the now-playing-only artwork (lock screen / notification / Android Auto
|
|
354
|
-
// now-playing), keyed on track id so it runs once per track and not on every render.
|
|
355
301
|
maybeResolveArtwork(track)
|
|
356
302
|
}
|
|
357
303
|
|
|
358
304
|
/**
|
|
359
|
-
* Resolves the
|
|
360
|
-
*
|
|
361
|
-
*
|
|
362
|
-
* visibly 404s). Without a config, the existing artworkUri — which came from `artwork` (browse
|
|
363
|
-
* list path) — is left in place.
|
|
305
|
+
* Resolves the now-playing artwork once per track identity, id-less tracks included as on iOS (an
|
|
306
|
+
* unfilled `{id}` token makes the request 404 visibly). Without the config, the media item keeps
|
|
307
|
+
* the artwork from `artwork`.
|
|
364
308
|
*/
|
|
365
309
|
private fun maybeResolveArtwork(track: Track) {
|
|
366
310
|
if (!surface.hasNowPlayingArtworkConfig) {
|
|
367
|
-
// No now-playing artwork config (or no browser) → fall back to the existing artworkUri.
|
|
368
311
|
artworkResolvedForTrack = null
|
|
369
312
|
return
|
|
370
313
|
}
|
|
371
314
|
|
|
372
|
-
// Already resolved (or resolving) for this track — avoid a redundant resolve per render.
|
|
373
|
-
// Keyed on track identity (id-or-src, falling back to path) so id-less tracks dedupe too.
|
|
374
315
|
val trackKey = track.identity ?: track.path
|
|
375
316
|
if (trackKey != null && artworkResolvedForTrack == trackKey) return
|
|
376
317
|
artworkResolvedForTrack = trackKey
|
|
@@ -380,8 +321,6 @@ class NowPlayingUpdater(private val surface: NowPlayingSurface, private val scop
|
|
|
380
321
|
surface.resolveNowPlayingArtwork(track, artworkSizePx)?.takeIf { it.isNotEmpty() }
|
|
381
322
|
?: return@launch
|
|
382
323
|
|
|
383
|
-
// Apply only if still the same track (a fast skip must not be overwritten by a stale
|
|
384
|
-
// result), compared on the same identity key the resolve was launched under.
|
|
385
324
|
val currentIdx = surface.currentIndex ?: return@launch
|
|
386
325
|
val current = surface.currentTrack ?: return@launch
|
|
387
326
|
if ((current.identity ?: current.path) != trackKey) return@launch
|
|
@@ -7,22 +7,18 @@ import com.margelo.nitro.audiobrowser.PlaybackErrorKind
|
|
|
7
7
|
import java.io.IOException
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
|
-
* Maps ExoPlayer
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
* Codes that carry no real evidence of a cause (`ERROR_CODE_UNSPECIFIED`,
|
|
15
|
-
* `ERROR_CODE_IO_UNSPECIFIED`, a bad HTTP status whose response code we could not recover) stay
|
|
16
|
-
* [PlaybackErrorKind.UNKNOWN] rather than being guessed into a nicer-sounding bucket — a wrong
|
|
17
|
-
* classification is worse than an honest one, both for the listener and for the aggregates.
|
|
10
|
+
* Maps ExoPlayer failures onto [PlaybackErrorKind], the cross-platform kind iOS fills from
|
|
11
|
+
* AVFoundation. A code that names no cause, including `ERROR_CODE_IO_BAD_HTTP_STATUS` with no
|
|
12
|
+
* recoverable status, stays [PlaybackErrorKind.UNKNOWN]: a wrong kind misleads both the listener
|
|
13
|
+
* and the aggregates more than an honest unknown.
|
|
18
14
|
*/
|
|
19
15
|
object PlaybackErrorClassifier {
|
|
20
16
|
/**
|
|
21
|
-
*
|
|
17
|
+
* Offline wins over everything, then an HTTP status in the cause chain, then the error code.
|
|
22
18
|
*
|
|
23
|
-
* @param online whether the device had connectivity
|
|
24
|
-
*
|
|
25
|
-
*
|
|
19
|
+
* @param online whether the device had connectivity when it failed. ExoPlayer reports a dead
|
|
20
|
+
* stream and a dead connection with the same codes; only the connectivity monitor tells them
|
|
21
|
+
* apart.
|
|
26
22
|
*/
|
|
27
23
|
fun classify(error: PlaybackException, online: Boolean): PlaybackErrorKind {
|
|
28
24
|
if (!online) return PlaybackErrorKind.OFFLINE
|
|
@@ -31,7 +27,7 @@ object PlaybackErrorClassifier {
|
|
|
31
27
|
return kindForErrorCode(error.errorCode)
|
|
32
28
|
}
|
|
33
29
|
|
|
34
|
-
/** The HTTP status
|
|
30
|
+
/** The HTTP status anywhere in [error]'s cause chain, or null if no HTTP response caused it. */
|
|
35
31
|
fun responseCode(error: PlaybackException): Int? =
|
|
36
32
|
generateSequence(error.cause) { it.cause }
|
|
37
33
|
.filterIsInstance<InvalidResponseCodeException>()
|
|
@@ -39,11 +35,10 @@ object PlaybackErrorClassifier {
|
|
|
39
35
|
?.responseCode
|
|
40
36
|
|
|
41
37
|
/**
|
|
42
|
-
* Classifies a load error the retry policy is still
|
|
43
|
-
*
|
|
44
|
-
* [RetryLoadErrorHandlingPolicy
|
|
45
|
-
*
|
|
46
|
-
* failures, so a non-HTTP retryable load error is by construction a network one.
|
|
38
|
+
* Classifies a load error the retry policy is still retrying, as a `retrying` [PlaybackError].
|
|
39
|
+
* Load errors arrive as raw [IOException]s, never as [PlaybackException], which exists only once
|
|
40
|
+
* retries are exhausted. [RetryLoadErrorHandlingPolicy] retries only HTTP statuses and transport
|
|
41
|
+
* failures, so any other cause is reported as [PlaybackErrorKind.UNREACHABLE].
|
|
47
42
|
*/
|
|
48
43
|
fun retryingLoadError(exception: IOException, online: Boolean): PlaybackError {
|
|
49
44
|
val responseCode =
|
|
@@ -51,9 +46,8 @@ object PlaybackErrorClassifier {
|
|
|
51
46
|
.filterIsInstance<InvalidResponseCodeException>()
|
|
52
47
|
.firstOrNull()
|
|
53
48
|
?.responseCode
|
|
54
|
-
//
|
|
55
|
-
//
|
|
56
|
-
// the caller's identical-repeat dedupe and churn the wire payload.
|
|
49
|
+
// A fixed message per kind, like iOS: raw IOException messages vary between attempts at the
|
|
50
|
+
// same outage, which would defeat the caller's identical-repeat dedupe.
|
|
57
51
|
val (kind, code, message) =
|
|
58
52
|
when {
|
|
59
53
|
!online ->
|
|
@@ -79,8 +73,7 @@ object PlaybackErrorClassifier {
|
|
|
79
73
|
404,
|
|
80
74
|
410 -> PlaybackErrorKind.NOT_FOUND
|
|
81
75
|
in 500..599 -> PlaybackErrorKind.SERVER_ERROR
|
|
82
|
-
// Every other 4xx
|
|
83
|
-
// mean "you can't have this stream", not "retry".
|
|
76
|
+
// Every other 4xx (auth, geo-blocking, rate limit) means "you can't have this stream".
|
|
84
77
|
in 400..499 -> PlaybackErrorKind.REJECTED
|
|
85
78
|
else -> PlaybackErrorKind.UNKNOWN
|
|
86
79
|
}
|
|
@@ -93,7 +86,6 @@ object PlaybackErrorClassifier {
|
|
|
93
86
|
|
|
94
87
|
PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND -> PlaybackErrorKind.NOT_FOUND
|
|
95
88
|
|
|
96
|
-
// The server, the licence server, or the session refused us.
|
|
97
89
|
PlaybackException.ERROR_CODE_IO_NO_PERMISSION,
|
|
98
90
|
PlaybackException.ERROR_CODE_AUTHENTICATION_EXPIRED,
|
|
99
91
|
PlaybackException.ERROR_CODE_PREMIUM_ACCOUNT_REQUIRED,
|
|
@@ -102,8 +94,6 @@ object PlaybackErrorClassifier {
|
|
|
102
94
|
PlaybackException.ERROR_CODE_NOT_AVAILABLE_IN_REGION,
|
|
103
95
|
in DRM_CODES -> PlaybackErrorKind.REJECTED
|
|
104
96
|
|
|
105
|
-
// Fetched, but nothing we can turn into audio: wrong content type, malformed or unsupported
|
|
106
|
-
// container, a decoder that refused it, or an output track we could not open.
|
|
107
97
|
PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE,
|
|
108
98
|
PlaybackException.ERROR_CODE_IO_CLEARTEXT_NOT_PERMITTED,
|
|
109
99
|
PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE,
|
|
@@ -4,15 +4,14 @@ import androidx.media3.common.Player as MediaPlayer
|
|
|
4
4
|
import com.margelo.nitro.audiobrowser.PlaybackState
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
* An
|
|
8
|
-
*
|
|
9
|
-
*
|
|
7
|
+
* An input to [PlaybackStateMachine]. The caller captures any context a transition depends on
|
|
8
|
+
* (queue size, whether a track exists, whether audio plays) into the event, so the machine stays
|
|
9
|
+
* pure.
|
|
10
10
|
*/
|
|
11
11
|
sealed interface PlaybackEvent {
|
|
12
12
|
/**
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
* the session alive — feeding that back in would clear the ERROR state).
|
|
13
|
+
* [exoState] must be the session player's real state, not the InterceptingPlayer's: that one
|
|
14
|
+
* reports READY through a masked terminal error, which would move the machine out of ERROR.
|
|
16
15
|
*/
|
|
17
16
|
data class ExoPlaybackStateChanged(
|
|
18
17
|
@get:MediaPlayer.State val exoState: Int,
|
|
@@ -20,13 +19,12 @@ sealed interface PlaybackEvent {
|
|
|
20
19
|
val shouldPlayWhenReady: Boolean,
|
|
21
20
|
) : PlaybackEvent
|
|
22
21
|
|
|
23
|
-
/** The active media item changed (auto-advance, skip, queue swap). */
|
|
24
22
|
data class MediaItemTransition(val hasTrack: Boolean, val isPlaying: Boolean) : PlaybackEvent
|
|
25
23
|
|
|
26
24
|
/**
|
|
27
25
|
* An input of [Player.shouldPlayWhenReady] changed: the intent, or a playback suppression such as
|
|
28
26
|
* a transient audio focus loss, which moves the machine as a pause does. [exoState] is the real
|
|
29
|
-
*
|
|
27
|
+
* state, as in [ExoPlaybackStateChanged].
|
|
30
28
|
*/
|
|
31
29
|
data class ShouldPlayWhenReadyChanged(
|
|
32
30
|
val shouldPlayWhenReady: Boolean,
|
|
@@ -37,56 +35,52 @@ sealed interface PlaybackEvent {
|
|
|
37
35
|
}
|
|
38
36
|
|
|
39
37
|
/**
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
* Effects (error clearing, event emission, timers) stay with the caller: the machine only decides.
|
|
38
|
+
* Decides the playback state transitions; the Android counterpart of iOS's
|
|
39
|
+
* `nextPlaybackState(from:on:)`. Effects (clearing errors, emitting events, timers) stay with the
|
|
40
|
+
* caller.
|
|
44
41
|
*/
|
|
45
42
|
object PlaybackStateMachine {
|
|
46
43
|
|
|
44
|
+
/** The states to set, in order, when [event] arrives in [current]; empty to keep [current]. */
|
|
47
45
|
fun transitions(current: PlaybackState, event: PlaybackEvent): List<PlaybackState> =
|
|
48
46
|
when (event) {
|
|
49
47
|
is PlaybackEvent.ExoPlaybackStateChanged ->
|
|
50
48
|
when (event.exoState) {
|
|
51
49
|
MediaPlayer.STATE_BUFFERING -> listOf(PlaybackState.BUFFERING)
|
|
52
50
|
MediaPlayer.STATE_READY ->
|
|
53
|
-
// While playing
|
|
54
|
-
//
|
|
55
|
-
//
|
|
56
|
-
// settled signal a buffer-that-finished-while-paused needs, so consumers
|
|
57
|
-
// can clear their loading spinner (mono#3325).
|
|
51
|
+
// While playing, READY is a transient before PLAYING (which IsPlayingChanged brings)
|
|
52
|
+
// and would flash a settled state mid-startup. While paused it is the only signal that
|
|
53
|
+
// a load finished, so consumers can drop their loading indicator.
|
|
58
54
|
if (event.shouldPlayWhenReady) emptyList() else listOf(PlaybackState.READY)
|
|
59
55
|
MediaPlayer.STATE_IDLE ->
|
|
60
|
-
// A terminal error
|
|
61
|
-
//
|
|
56
|
+
// A terminal error and stop() both idle ExoPlayer; NONE would clear the ERROR or
|
|
57
|
+
// STOPPED state the session shows.
|
|
62
58
|
if (current == PlaybackState.ERROR || current == PlaybackState.STOPPED) emptyList()
|
|
63
59
|
else listOf(PlaybackState.NONE)
|
|
64
60
|
MediaPlayer.STATE_ENDED ->
|
|
65
|
-
// An emptied queue also reports STATE_ENDED
|
|
66
|
-
// loaded", not "played to end".
|
|
61
|
+
// An emptied queue also reports STATE_ENDED: nothing loaded, not played to the end.
|
|
67
62
|
listOf(if (event.mediaItemCount > 0) PlaybackState.ENDED else PlaybackState.NONE)
|
|
68
63
|
else -> emptyList()
|
|
69
64
|
}
|
|
70
65
|
is PlaybackEvent.MediaItemTransition ->
|
|
71
66
|
when {
|
|
72
67
|
!event.hasTrack -> emptyList()
|
|
73
|
-
// Already
|
|
74
|
-
//
|
|
68
|
+
// Already playing (gapless auto-advance): no IsPlayingChanged follows, so run the whole
|
|
69
|
+
// sequence here or the state sticks on LOADING.
|
|
75
70
|
event.isPlaying ->
|
|
76
71
|
listOf(PlaybackState.LOADING, PlaybackState.READY, PlaybackState.PLAYING)
|
|
77
72
|
else -> listOf(PlaybackState.LOADING)
|
|
78
73
|
}
|
|
79
74
|
is PlaybackEvent.ShouldPlayWhenReadyChanged ->
|
|
80
75
|
when {
|
|
81
|
-
//
|
|
82
|
-
//
|
|
83
|
-
// re-report the state as PAUSED.
|
|
76
|
+
// stop() and a natural end both clear the intent themselves; STOPPED and ENDED must not
|
|
77
|
+
// turn into PAUSED.
|
|
84
78
|
!event.shouldPlayWhenReady &&
|
|
85
79
|
current != PlaybackState.STOPPED &&
|
|
86
80
|
current != PlaybackState.ENDED -> listOf(PlaybackState.PAUSED)
|
|
87
81
|
!event.shouldPlayWhenReady -> emptyList()
|
|
88
|
-
// Resuming while ExoPlayer still buffers
|
|
89
|
-
//
|
|
82
|
+
// Resuming while ExoPlayer still buffers: no state change of its own follows, and the
|
|
83
|
+
// READY after it is dropped while playing, so report the load now.
|
|
90
84
|
current == PlaybackState.PAUSED && event.exoState == MediaPlayer.STATE_BUFFERING ->
|
|
91
85
|
listOf(PlaybackState.BUFFERING)
|
|
92
86
|
else -> emptyList()
|