react-native-audio-browser 0.2.0-next.52 → 0.2.0-next.54
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/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 +35 -49
- 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 +16 -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 +26 -4
- 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 +15 -11
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +112 -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/package.json +1 -1
|
@@ -93,7 +93,7 @@ internal constructor(
|
|
|
93
93
|
EqualizerController(onSettingsChanged = { settings -> callbacks?.onEqualizerChanged(settings) })
|
|
94
94
|
private val mediaSessionCallback = MediaSessionCallback(this)
|
|
95
95
|
internal val playbackStateStore = PlaybackStateStore(this)
|
|
96
|
-
//
|
|
96
|
+
// Fades the local engine only: a remote receiver keeps its own volume.
|
|
97
97
|
internal val volumeFader =
|
|
98
98
|
VolumeFader(getVolume = { exoPlayer.volume }, setVolume = { exoPlayer.volume = it })
|
|
99
99
|
internal val sleepTimer =
|
|
@@ -108,7 +108,7 @@ internal constructor(
|
|
|
108
108
|
private set
|
|
109
109
|
|
|
110
110
|
/**
|
|
111
|
-
* What plays: [exoPlayer], or while a remote output is on, the
|
|
111
|
+
* What plays: [exoPlayer], or while a remote output is on, the remote-switching player around it.
|
|
112
112
|
* Every playback read and command goes here. Local-only work that would disturb a remote (retry,
|
|
113
113
|
* reconnect, stuck recovery, the shuffle order) goes through [localEngine]; the equalizer,
|
|
114
114
|
* skip-silence, buffering and the volume fade act on [exoPlayer] alone.
|
|
@@ -127,25 +127,25 @@ internal constructor(
|
|
|
127
127
|
|
|
128
128
|
private var keepSessionAliveOnError = true
|
|
129
129
|
|
|
130
|
-
/**
|
|
130
|
+
/**
|
|
131
|
+
* [playWhenReady] for the retry policy, which reads it off the main thread. Written eagerly by
|
|
132
|
+
* the setter, ahead of ExoPlayer's listener round-trip.
|
|
133
|
+
*/
|
|
131
134
|
@Volatile internal var playWhenReadyCache = false
|
|
132
135
|
|
|
133
136
|
/**
|
|
134
|
-
* Whether the current load has
|
|
135
|
-
*
|
|
136
|
-
*
|
|
137
|
-
* of the same load keep it.
|
|
137
|
+
* Whether the current load has produced audio: picks the retry policy's first-connect or recovery
|
|
138
|
+
* budget. Read on ExoPlayer's loader thread. Cleared on a media-item transition; retry reloads of
|
|
139
|
+
* the same load keep it.
|
|
138
140
|
*/
|
|
139
141
|
@Volatile internal var hasPlayedCache = false
|
|
140
142
|
|
|
141
|
-
/** Last playWhenReady value emitted to JS — see [emitPlayWhenReadyChanged]. */
|
|
142
143
|
private var lastEmittedPlayWhenReady: Boolean? = null
|
|
143
144
|
|
|
144
145
|
/**
|
|
145
|
-
* Emits
|
|
146
|
-
*
|
|
147
|
-
*
|
|
148
|
-
* makes on its own, e.g. audio focus); the guard deduplicates their overlap.
|
|
146
|
+
* Emits a playWhenReady change to JS once per value. Both the synchronous clear at ENDED in
|
|
147
|
+
* [setPlaybackState] and the media3 listener (changes ExoPlayer makes itself, e.g. audio focus)
|
|
148
|
+
* call it; their overlap is dropped.
|
|
149
149
|
*/
|
|
150
150
|
internal fun emitPlayWhenReadyChanged(value: Boolean) {
|
|
151
151
|
if (lastEmittedPlayWhenReady == value) return
|
|
@@ -157,25 +157,21 @@ internal constructor(
|
|
|
157
157
|
private lateinit var loadControl: DynamicLoadControl
|
|
158
158
|
private var automaticBufferManager: AutomaticBufferManager? = null
|
|
159
159
|
|
|
160
|
-
/**
|
|
161
|
-
* Tracks whether a network-related retry is pending. When true, network restoration will trigger
|
|
162
|
-
* an immediate retry via exoPlayer.prepare().
|
|
163
|
-
*/
|
|
160
|
+
/** A network-caused retry is waiting; regaining connectivity retries at once. */
|
|
164
161
|
@Volatile private var pendingNetworkRetry = false
|
|
165
162
|
|
|
166
163
|
private var browserRegistered = CompletableDeferred<AudioBrowser>()
|
|
167
164
|
private var _coilBitmapLoader: CoilBitmapLoader? = null
|
|
168
165
|
|
|
169
|
-
/**
|
|
170
|
-
* Coil ImageLoader for SVG pre-rendering in Android Auto browse items. Set by Service after
|
|
171
|
-
* creation.
|
|
172
|
-
*/
|
|
166
|
+
/** For SVG pre-rendering of Android Auto browse items. Set by the service. */
|
|
173
167
|
var imageLoader: coil3.ImageLoader? = null
|
|
174
168
|
|
|
175
|
-
/**
|
|
169
|
+
/**
|
|
170
|
+
* Called on the main thread when a resumption meant to start playback fails. Set by the service.
|
|
171
|
+
*/
|
|
176
172
|
var onPlaybackResumptionFailed: () -> Unit = {}
|
|
177
173
|
|
|
178
|
-
/**
|
|
174
|
+
/** Maps the browse content provider's content:// tokens to artwork URLs. */
|
|
179
175
|
val browseArtworkRegistry = com.audiobrowser.browser.BrowseArtworkRegistry()
|
|
180
176
|
|
|
181
177
|
init {
|
|
@@ -185,24 +181,19 @@ internal constructor(
|
|
|
185
181
|
ArtworkRoutes(browseArtworkRegistry, ArtworkUris.authorityFor(context.packageName))
|
|
186
182
|
}
|
|
187
183
|
|
|
188
|
-
/**
|
|
189
|
-
* Set the CoilBitmapLoader for display-time bitmap loading. Called from Service after creation.
|
|
190
|
-
*/
|
|
191
184
|
var coilBitmapLoader: CoilBitmapLoader?
|
|
192
185
|
get() = _coilBitmapLoader
|
|
193
186
|
set(value) {
|
|
194
187
|
_coilBitmapLoader = value
|
|
195
188
|
}
|
|
196
189
|
|
|
197
|
-
//
|
|
198
|
-
//
|
|
199
|
-
// Call notifyBrowserConfigurationReady() after configuration is set.
|
|
190
|
+
// Setting this does not release callers already waiting in [awaitBrowser]: call
|
|
191
|
+
// [notifyBrowserConfigurationReady] once its routes and tabs are configured.
|
|
200
192
|
var browser: AudioBrowser? = null
|
|
201
193
|
|
|
202
194
|
/**
|
|
203
|
-
*
|
|
204
|
-
*
|
|
205
|
-
* browse content.
|
|
195
|
+
* Marks the browser's routes and tabs configured: completes [awaitBrowser] and lets Android Auto
|
|
196
|
+
* browse. Call after setting [browser] and its configuration.
|
|
206
197
|
*/
|
|
207
198
|
fun notifyBrowserConfigurationReady() {
|
|
208
199
|
val audioBrowser = browser ?: return
|
|
@@ -210,15 +201,13 @@ internal constructor(
|
|
|
210
201
|
if (!browserRegistered.isCompleted) {
|
|
211
202
|
Timber.d("Browser configuration ready - completing deferred")
|
|
212
203
|
browserRegistered.complete(audioBrowser)
|
|
213
|
-
//
|
|
214
|
-
// This handles the cold-start case where AA subscribed before browser was ready
|
|
204
|
+
// Android Auto may have subscribed on a cold start before the browser was ready.
|
|
215
205
|
mediaSessionCallback.notifyBrowserReady()
|
|
216
206
|
}
|
|
217
207
|
|
|
218
|
-
// Update MediaSession commands when browser becomes available with search configured
|
|
219
|
-
// Only update if search is available, since default state is "no search"
|
|
220
208
|
if (::mediaSession.isInitialized) {
|
|
221
209
|
val searchAvailable = audioBrowser.browserManager.config.hasSearch
|
|
210
|
+
// The session starts without search, so only a configured search needs an update.
|
|
222
211
|
if (searchAvailable) {
|
|
223
212
|
mediaSessionCallback.updateMediaSession(
|
|
224
213
|
mediaSession,
|
|
@@ -233,9 +222,8 @@ internal constructor(
|
|
|
233
222
|
}
|
|
234
223
|
|
|
235
224
|
/**
|
|
236
|
-
*
|
|
237
|
-
*
|
|
238
|
-
* pin the first browser for the life of the process.
|
|
225
|
+
* Makes [awaitBrowser] wait for a replacement browser instead of returning the disposed one; a
|
|
226
|
+
* [CompletableDeferred] completes only once.
|
|
239
227
|
*/
|
|
240
228
|
fun forgetBrowserRegistration() {
|
|
241
229
|
if (browserRegistered.isCompleted) {
|
|
@@ -244,9 +232,9 @@ internal constructor(
|
|
|
244
232
|
}
|
|
245
233
|
|
|
246
234
|
/**
|
|
247
|
-
*
|
|
235
|
+
* [browser] if set, else the one [notifyBrowserConfigurationReady] registers next.
|
|
248
236
|
*
|
|
249
|
-
* @throws TimeoutCancellationException if
|
|
237
|
+
* @throws TimeoutCancellationException if it is not registered within 10 seconds
|
|
250
238
|
*/
|
|
251
239
|
suspend fun awaitBrowser(): AudioBrowser =
|
|
252
240
|
browser
|
|
@@ -309,9 +297,8 @@ internal constructor(
|
|
|
309
297
|
}
|
|
310
298
|
|
|
311
299
|
/**
|
|
312
|
-
* Re-derives [playingState] from
|
|
313
|
-
*
|
|
314
|
-
* change point of its inputs.
|
|
300
|
+
* Re-derives [playingState] from [shouldPlayWhenReady] and [playbackState], emitting when it
|
|
301
|
+
* changed. Its only writer: call it wherever either input changes.
|
|
315
302
|
*/
|
|
316
303
|
internal fun refreshPlayingState() {
|
|
317
304
|
val newPlayingState = PlayingStateFactory.derive(shouldPlayWhenReady, playbackState)
|
|
@@ -326,11 +313,9 @@ internal constructor(
|
|
|
326
313
|
var playWhenReady: Boolean
|
|
327
314
|
get() = sessionPlayer.playWhenReady
|
|
328
315
|
set(value) {
|
|
329
|
-
//
|
|
330
|
-
//
|
|
331
|
-
//
|
|
332
|
-
// path, not the Player API). In the setter so every writer gets it —
|
|
333
|
-
// play(), togglePlayback() and JS setPlayWhenReady alike.
|
|
316
|
+
// ExoPlayer's setPlayWhenReady(true) never restarts an ended player (media3 replays only on
|
|
317
|
+
// its media-button path). Here in the setter so every writer replays: play(),
|
|
318
|
+
// togglePlayback(), JS.
|
|
334
319
|
if (value && sessionPlayer.playbackState == MediaPlayer.STATE_ENDED) {
|
|
335
320
|
sessionPlayer.seekToDefaultPosition()
|
|
336
321
|
}
|
|
@@ -353,7 +338,7 @@ internal constructor(
|
|
|
353
338
|
if (sessionPlayer.bufferedPosition == C.INDEX_UNSET.toLong()) 0
|
|
354
339
|
else sessionPlayer.bufferedPosition
|
|
355
340
|
|
|
356
|
-
/**
|
|
341
|
+
/** From 0 to 1: the local engine's, or while remote, the receiver's. */
|
|
357
342
|
var volume: Float
|
|
358
343
|
get() = sessionPlayer.volume
|
|
359
344
|
set(value) {
|
|
@@ -371,7 +356,7 @@ internal constructor(
|
|
|
371
356
|
|
|
372
357
|
/**
|
|
373
358
|
* False while ExoPlayer suppresses output (a transient audio focus loss) though [playWhenReady]
|
|
374
|
-
* stays raised
|
|
359
|
+
* stays raised to resume on; mirrors media3's `ExoPlayerImplInternal.shouldPlayWhenReady`.
|
|
375
360
|
*/
|
|
376
361
|
internal val shouldPlayWhenReady
|
|
377
362
|
get() =
|
|
@@ -407,28 +392,15 @@ internal constructor(
|
|
|
407
392
|
.map { index -> TrackFactory.fromMedia3(sessionPlayer.getMediaItemAt(index)) }
|
|
408
393
|
.toTypedArray()
|
|
409
394
|
|
|
410
|
-
/**
|
|
411
|
-
* Whether nothing follows the current item in *playback order* — shuffle- and repeat-aware via
|
|
412
|
-
* media3's own order computation (the linear `currentMediaItemIndex == count - 1` check missed a
|
|
413
|
-
* shuffled queue whose playback order ends on a different linear index). Matches iOS's
|
|
414
|
-
* `isLastInPlaybackOrder`.
|
|
415
|
-
*/
|
|
395
|
+
/** In playback order, so shuffle and repeat count; not the last linear index. */
|
|
416
396
|
val isLastInPlaybackOrder: Boolean
|
|
417
397
|
get() = sessionPlayer.nextMediaItemIndex == C.INDEX_UNSET
|
|
418
398
|
|
|
419
|
-
/**
|
|
420
|
-
* The source path from which the current queue was expanded (e.g., from a contextual path). Used
|
|
421
|
-
* to avoid re-expanding the queue when selecting tracks from the same source.
|
|
422
|
-
*/
|
|
399
|
+
/** The path the queue was expanded from, so selecting from the same source skips re-expanding. */
|
|
423
400
|
var queueSourcePath: String? = null
|
|
424
401
|
internal set
|
|
425
402
|
|
|
426
|
-
/**
|
|
427
|
-
* Get track at index with bounds checking.
|
|
428
|
-
*
|
|
429
|
-
* @param index The index of the track to retrieve.
|
|
430
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
431
|
-
*/
|
|
403
|
+
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
432
404
|
fun getTrack(index: Int): Track {
|
|
433
405
|
if (index < 0 || index >= sessionPlayer.mediaItemCount) {
|
|
434
406
|
throw IllegalArgumentException(
|
|
@@ -447,14 +419,12 @@ internal constructor(
|
|
|
447
419
|
private var engineOptions: PlayerSetupOptions? = null
|
|
448
420
|
|
|
449
421
|
/**
|
|
450
|
-
*
|
|
451
|
-
*
|
|
452
|
-
* position and the play intent, so playback that has started goes on with the new engine.
|
|
422
|
+
* Builds the ExoPlayer on the first call, and rebuilds it only when the engine options changed. A
|
|
423
|
+
* rebuild carries over the queue, the position and the play intent.
|
|
453
424
|
*/
|
|
454
425
|
fun setup(setupOptions: PlayerSetupOptions) {
|
|
455
426
|
nowPlaying.enabled = setupOptions.autoUpdateNowPlayingMetadata
|
|
456
|
-
//
|
|
457
|
-
// bridge types; the double-await depth is unchanged (invoke -> bridge Promise -> JS promise).
|
|
427
|
+
// Unwrapped from the Nitro Func so the updater never touches bridge types.
|
|
458
428
|
nowPlaying.formatter =
|
|
459
429
|
setupOptions.nowPlayingMetadataFormatter?.let { f -> { params -> f.invoke(params).await() } }
|
|
460
430
|
|
|
@@ -480,15 +450,15 @@ internal constructor(
|
|
|
480
450
|
}
|
|
481
451
|
|
|
482
452
|
if (setupOptions.maxCacheSize > 0) {
|
|
483
|
-
// SimpleCache locks its folder
|
|
484
|
-
// instance first or the constructor throws.
|
|
453
|
+
// SimpleCache locks its folder: the constructor throws until the previous one is released.
|
|
485
454
|
cache?.release()
|
|
486
455
|
cache =
|
|
487
456
|
SimpleCache(
|
|
488
457
|
File(context.cacheDir, "RNAB"),
|
|
489
458
|
LeastRecentlyUsedCacheEvictor(
|
|
459
|
+
// MB to bytes
|
|
490
460
|
setupOptions.maxCacheSize.toLong() * 1_000_000
|
|
491
|
-
),
|
|
461
|
+
),
|
|
492
462
|
StandaloneDatabaseProvider(context),
|
|
493
463
|
)
|
|
494
464
|
} else {
|
|
@@ -496,8 +466,6 @@ internal constructor(
|
|
|
496
466
|
cache = null
|
|
497
467
|
}
|
|
498
468
|
|
|
499
|
-
// One engine generation: load control, media factory, ExoPlayer (pure construction —
|
|
500
|
-
// see buildPlayerEngine; lifecycle and wiring stay here).
|
|
501
469
|
val engine =
|
|
502
470
|
buildPlayerEngine(
|
|
503
471
|
context,
|
|
@@ -507,7 +475,6 @@ internal constructor(
|
|
|
507
475
|
isOnline = { networkMonitor.getOnline() },
|
|
508
476
|
hasPlayed = { hasPlayedCache },
|
|
509
477
|
onRetryPending = { exception, isNetworkError ->
|
|
510
|
-
// Track pending network retries for acceleration when connectivity returns
|
|
511
478
|
pendingNetworkRetry = isNetworkError
|
|
512
479
|
if (isNetworkError) {
|
|
513
480
|
Timber.d("Network retry pending, will accelerate on connectivity restoration")
|
|
@@ -531,26 +498,22 @@ internal constructor(
|
|
|
531
498
|
callbacks?.onPlaybackChanged(Playback(PlaybackState.NONE, null))
|
|
532
499
|
equalizer.initialize(exoPlayer.audioSessionId)
|
|
533
500
|
} else if (localEngine.isActive) {
|
|
534
|
-
// No listener heard the restore
|
|
501
|
+
// No listener heard the restore, and its prepare() leaves the engine buffering. While remote,
|
|
535
502
|
// the receiver plays on unchanged.
|
|
536
503
|
setPlaybackState(
|
|
537
504
|
if (exoPlayer.playbackState == ExoPlayer.STATE_IDLE) PlaybackState.NONE
|
|
538
505
|
else PlaybackState.BUFFERING
|
|
539
506
|
)
|
|
540
|
-
// The new engine can refuse the carried intent (audio focus denied) without a change event
|
|
541
|
-
//
|
|
507
|
+
// The new engine can refuse the carried intent (audio focus denied) without a change event,
|
|
508
|
+
// which would leave a stale true in the cache and in JS.
|
|
542
509
|
playWhenReadyCache = exoPlayer.playWhenReady
|
|
543
510
|
emitPlayWhenReadyChanged(exoPlayer.playWhenReady)
|
|
544
511
|
}
|
|
545
512
|
|
|
546
|
-
// Set up automatic buffer management if enabled
|
|
547
513
|
setupAutomaticBufferManager(setupOptions.automaticBuffer)
|
|
548
514
|
}
|
|
549
515
|
|
|
550
|
-
|
|
551
|
-
* Wraps [sessionPlayer] for the session: the remote switch while there is one, else [exoPlayer].
|
|
552
|
-
* Called when either changes.
|
|
553
|
-
*/
|
|
516
|
+
// Call whenever [exoPlayer] or the remote player changes.
|
|
554
517
|
private fun attachSessionPlayer() {
|
|
555
518
|
if (::forwardingPlayer.isInitialized) forwardingPlayer.removeListener(playerListener)
|
|
556
519
|
sessionPlayer = remoteOutputs.player ?: exoPlayer
|
|
@@ -560,9 +523,6 @@ internal constructor(
|
|
|
560
523
|
if (::mediaSession.isInitialized) mediaSession.player = forwardingPlayer
|
|
561
524
|
}
|
|
562
525
|
|
|
563
|
-
/**
|
|
564
|
-
* The URLs a receiver fetches for [track]: through the media transform, which can call into JS.
|
|
565
|
-
*/
|
|
566
526
|
private suspend fun resolveRemoteUrls(track: Track): RemoteUrls {
|
|
567
527
|
val src = checkNotNull(track.src) { "The track has no src" }
|
|
568
528
|
val browserManager = browser?.browserManager
|
|
@@ -572,9 +532,7 @@ internal constructor(
|
|
|
572
532
|
)
|
|
573
533
|
}
|
|
574
534
|
|
|
575
|
-
/** Sets up or tears down the automatic buffer manager based on the enabled flag. */
|
|
576
535
|
private fun setupAutomaticBufferManager(enabled: Boolean) {
|
|
577
|
-
// Detach existing manager if any
|
|
578
536
|
automaticBufferManager?.detach()
|
|
579
537
|
|
|
580
538
|
if (enabled) {
|
|
@@ -588,21 +546,13 @@ internal constructor(
|
|
|
588
546
|
}
|
|
589
547
|
}
|
|
590
548
|
|
|
591
|
-
/**
|
|
592
|
-
* Starts observing network connectivity changes and invokes the callback when state changes. Also
|
|
593
|
-
* handles accelerating pending network retries when connectivity is restored.
|
|
594
|
-
*
|
|
595
|
-
* @param scope The coroutine scope to use for observation
|
|
596
|
-
*/
|
|
597
549
|
fun observeNetworkConnectivity(scope: kotlinx.coroutines.CoroutineScope) {
|
|
598
550
|
networkMonitor.observeOnline(scope) { isOnline ->
|
|
599
551
|
callbacks?.onOnlineChanged(isOnline)
|
|
600
552
|
|
|
601
|
-
//
|
|
602
|
-
// connectivity immediately, not only on the next playback transition.
|
|
553
|
+
// The formatter tells a stall from being offline, so it renders on a connectivity change too.
|
|
603
554
|
nowPlaying.render()
|
|
604
555
|
|
|
605
|
-
// Accelerate pending network retry when connectivity is restored
|
|
606
556
|
if (isOnline && pendingNetworkRetry) {
|
|
607
557
|
Timber.d("Network restored with pending retry, triggering immediate retry")
|
|
608
558
|
pendingNetworkRetry = false
|
|
@@ -612,12 +562,7 @@ internal constructor(
|
|
|
612
562
|
}
|
|
613
563
|
}
|
|
614
564
|
|
|
615
|
-
/**
|
|
616
|
-
* Loads a track into the player. If there is a current track, it will be replaced. If the queue
|
|
617
|
-
* is empty, the track will be added.
|
|
618
|
-
*
|
|
619
|
-
* @param track The [Track] to load.
|
|
620
|
-
*/
|
|
565
|
+
/** Replaces the current track, keeping the rest of the queue; on an empty queue, adds it. */
|
|
621
566
|
fun load(track: Track) {
|
|
622
567
|
if (sessionPlayer.mediaItemCount == 0) {
|
|
623
568
|
add(track)
|
|
@@ -629,37 +574,19 @@ internal constructor(
|
|
|
629
574
|
}
|
|
630
575
|
}
|
|
631
576
|
|
|
632
|
-
/**
|
|
633
|
-
* Add a single track to the queue. If the AudioPlayer has no track loaded, it will load the
|
|
634
|
-
* `track`.
|
|
635
|
-
*
|
|
636
|
-
* @param track The [Track] to add.
|
|
637
|
-
*/
|
|
638
577
|
fun add(track: Track) {
|
|
639
578
|
val mediaItem = TrackFactory.toMedia3(track)
|
|
640
579
|
sessionPlayer.addMediaItem(mediaItem)
|
|
641
580
|
sessionPlayer.prepare()
|
|
642
581
|
}
|
|
643
582
|
|
|
644
|
-
/**
|
|
645
|
-
* Add multiple tracks to the queue. If the AudioPlayer has no track loaded, it will load the
|
|
646
|
-
* first track in the list.
|
|
647
|
-
*
|
|
648
|
-
* @param tracks The [Track]s to add.
|
|
649
|
-
*/
|
|
650
583
|
fun add(tracks: Array<Track>) {
|
|
651
584
|
val mediaItems = TrackFactory.toMedia3(tracks)
|
|
652
585
|
sessionPlayer.addMediaItems(mediaItems.toList())
|
|
653
586
|
sessionPlayer.prepare()
|
|
654
587
|
}
|
|
655
588
|
|
|
656
|
-
/**
|
|
657
|
-
* Add multiple tracks to the queue.
|
|
658
|
-
*
|
|
659
|
-
* @param tracks The [Track]s to add.
|
|
660
|
-
* @param atIndex Index to insert tracks at. Use -1 to append to the end of the queue.
|
|
661
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
662
|
-
*/
|
|
589
|
+
/** @throws IllegalArgumentException unless [atIndex] is within the queue, or -1 to append. */
|
|
663
590
|
fun add(tracks: Array<Track>, atIndex: Int) {
|
|
664
591
|
validateInsertIndex(atIndex)
|
|
665
592
|
val index = if (atIndex == -1) sessionPlayer.mediaItemCount else atIndex
|
|
@@ -668,24 +595,13 @@ internal constructor(
|
|
|
668
595
|
sessionPlayer.prepare()
|
|
669
596
|
}
|
|
670
597
|
|
|
671
|
-
/**
|
|
672
|
-
* Remove a track from the queue.
|
|
673
|
-
*
|
|
674
|
-
* @param index The index of the track to remove.
|
|
675
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
676
|
-
*/
|
|
598
|
+
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
677
599
|
fun remove(index: Int) {
|
|
678
600
|
validateIndex(index)
|
|
679
601
|
sessionPlayer.removeMediaItem(index)
|
|
680
602
|
}
|
|
681
603
|
|
|
682
|
-
/**
|
|
683
|
-
* Remove tracks from the queue.
|
|
684
|
-
*
|
|
685
|
-
* @param indexes The indexes of the tracks to remove.
|
|
686
|
-
* @throws IllegalArgumentException if any index is out of bounds or if duplicate indexes are
|
|
687
|
-
* provided.
|
|
688
|
-
*/
|
|
604
|
+
/** @throws IllegalArgumentException if an index is out of bounds or repeated. */
|
|
689
605
|
fun remove(indexes: List<Int>) {
|
|
690
606
|
if (indexes.toSet().size != indexes.size) {
|
|
691
607
|
throw IllegalArgumentException("Duplicate indexes provided")
|
|
@@ -695,59 +611,33 @@ internal constructor(
|
|
|
695
611
|
sorted.forEach { sessionPlayer.removeMediaItem(it) }
|
|
696
612
|
}
|
|
697
613
|
|
|
698
|
-
/**
|
|
699
|
-
* Skip to the next track in the queue, which may depend on the current repeat mode. Does nothing
|
|
700
|
-
* if there is no next track to skip to.
|
|
701
|
-
*/
|
|
702
614
|
fun next() {
|
|
703
615
|
sessionPlayer.seekToNextMediaItem()
|
|
704
616
|
sessionPlayer.prepare()
|
|
705
617
|
}
|
|
706
618
|
|
|
707
|
-
/**
|
|
708
|
-
* Skip to the previous track in the queue, which may depend on the current repeat mode. Does
|
|
709
|
-
* nothing if there is no previous track to skip to.
|
|
710
|
-
*/
|
|
711
619
|
fun previous() {
|
|
712
620
|
sessionPlayer.seekToPreviousMediaItem()
|
|
713
621
|
sessionPlayer.prepare()
|
|
714
622
|
}
|
|
715
623
|
|
|
716
624
|
/**
|
|
717
|
-
*
|
|
625
|
+
* A [toIndex] past the end moves the track to the end.
|
|
718
626
|
*
|
|
719
|
-
* @
|
|
720
|
-
* @param toIndex The index to move the track to. If the index is larger than the size of the
|
|
721
|
-
* queue, the track is moved to the end of the queue instead.
|
|
722
|
-
* @throws IllegalArgumentException if fromIndex is out of bounds.
|
|
627
|
+
* @throws IllegalArgumentException if [fromIndex] is out of bounds.
|
|
723
628
|
*/
|
|
724
629
|
fun move(fromIndex: Int, toIndex: Int) {
|
|
725
630
|
validateIndex(fromIndex)
|
|
726
631
|
sessionPlayer.moveMediaItem(fromIndex, toIndex)
|
|
727
632
|
}
|
|
728
633
|
|
|
729
|
-
/**
|
|
730
|
-
* Skips to a track in the queue.
|
|
731
|
-
*
|
|
732
|
-
* @param index the index to skip to
|
|
733
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
734
|
-
*/
|
|
634
|
+
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
735
635
|
fun skipTo(index: Int) {
|
|
736
636
|
validateIndex(index)
|
|
737
637
|
sessionPlayer.seekTo(index, C.TIME_UNSET)
|
|
738
638
|
sessionPlayer.prepare()
|
|
739
639
|
}
|
|
740
640
|
|
|
741
|
-
/**
|
|
742
|
-
* Sets the queue with new tracks, optionally starting at a specific index and position. This is
|
|
743
|
-
* more efficient than calling clear() + add() + skipTo() separately.
|
|
744
|
-
*
|
|
745
|
-
* @param tracks The tracks to set as the new queue.
|
|
746
|
-
* @param startIndex The index to start playback from (default: 0).
|
|
747
|
-
* @param startPositionMs The position in milliseconds to start from (default: 0).
|
|
748
|
-
* @param sourcePath Optional path from which this queue was expanded (for contextual path
|
|
749
|
-
* optimization).
|
|
750
|
-
*/
|
|
751
641
|
fun setQueue(
|
|
752
642
|
tracks: Array<Track>,
|
|
753
643
|
startIndex: Int = 0,
|
|
@@ -764,11 +654,7 @@ internal constructor(
|
|
|
764
654
|
sessionPlayer.prepare()
|
|
765
655
|
}
|
|
766
656
|
|
|
767
|
-
/**
|
|
768
|
-
* Replaces track at index in queue.
|
|
769
|
-
*
|
|
770
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
771
|
-
*/
|
|
657
|
+
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
772
658
|
fun replaceTrack(index: Int, track: Track) {
|
|
773
659
|
validateIndex(index)
|
|
774
660
|
val isCurrent = index == currentIndex
|
|
@@ -778,50 +664,31 @@ internal constructor(
|
|
|
778
664
|
}
|
|
779
665
|
|
|
780
666
|
/**
|
|
781
|
-
*
|
|
782
|
-
*
|
|
783
|
-
*
|
|
784
|
-
* @return whether the gesture applied — false only when there is no current track (nothing to
|
|
785
|
-
* favorite), so MediaSession callers can report an invalid state instead of a success the
|
|
786
|
-
* controller then watches revert.
|
|
667
|
+
* @return false only when there is no current track, so MediaSession callers can report an
|
|
668
|
+
* invalid state instead of a success the controller then watches revert.
|
|
787
669
|
*/
|
|
788
670
|
fun setActiveTrackFavorited(favorited: Boolean): Boolean {
|
|
789
671
|
val currentTrack = this.currentTrack ?: return false
|
|
790
672
|
|
|
791
|
-
// Persist to the native favorites cache regardless of player state — the
|
|
792
|
-
// user's gesture is durable even when there's no active media item to
|
|
793
|
-
// update (queue tear-down, between-track gaps, etc.). Keyed by the track
|
|
794
|
-
// identity (id when non-blank, else src).
|
|
795
673
|
currentTrack.identity?.let { identity ->
|
|
796
674
|
browser?.browserManager?.updateFavorite(identity, favorited)
|
|
797
675
|
}
|
|
798
676
|
|
|
799
|
-
// Cache written above: the gesture is durably recorded even without a media
|
|
800
|
-
// item to restamp (queue tear-down, between-track gaps) — that counts as
|
|
801
|
-
// applied; there is also no visible heart to revert in that state.
|
|
802
677
|
val index = sessionPlayer.currentMediaItemIndex
|
|
678
|
+
// Still applied: the favorite is persisted above, and there is no heart to revert.
|
|
803
679
|
if (index == C.INDEX_UNSET) return true
|
|
804
680
|
|
|
805
681
|
val updatedTrack = currentTrack.copy(favorited = favorited)
|
|
806
682
|
restampMediaItem(index, updatedTrack) { setFavorite(favorited) }
|
|
807
683
|
|
|
808
|
-
// Update the heart button icon in notification/Android Auto
|
|
809
684
|
updateFavoriteButtonState(favorited)
|
|
810
685
|
|
|
811
|
-
//
|
|
812
|
-
//
|
|
813
|
-
// onPlaybackActiveTrackChanged / onPlaybackQueueChanged stay
|
|
814
|
-
// transition-only, and the useActiveTrack / useQueue hooks subscribe to
|
|
815
|
-
// onFavoriteChanged themselves.
|
|
686
|
+
// The only emit: a favorite toggle mutates the active track in place, so the track and queue
|
|
687
|
+
// change events stay transition-only.
|
|
816
688
|
callbacks?.onFavoriteChanged(FavoriteChangedEvent(updatedTrack, favorited))
|
|
817
689
|
return true
|
|
818
690
|
}
|
|
819
691
|
|
|
820
|
-
/**
|
|
821
|
-
* Toggles the favorited state of the currently playing track.
|
|
822
|
-
*
|
|
823
|
-
* @return whether the toggle applied — false when there is no current track.
|
|
824
|
-
*/
|
|
825
692
|
fun toggleActiveTrackFavorited(): Boolean {
|
|
826
693
|
val currentTrack = this.currentTrack ?: return false
|
|
827
694
|
return setActiveTrackFavorited(currentTrack.favorited != true)
|
|
@@ -829,11 +696,7 @@ internal constructor(
|
|
|
829
696
|
|
|
830
697
|
// MARK: - Now Playing Metadata
|
|
831
698
|
|
|
832
|
-
/**
|
|
833
|
-
* Now Playing rendering (flash/override/formatter precedence, dedupe, stale guards, artwork
|
|
834
|
-
* keying) lives in [NowPlayingUpdater]; this object is its platform surface — current playback
|
|
835
|
-
* reads plus MediaItem stamping via [replaceMediaItem], and artwork resolution via the browser.
|
|
836
|
-
*/
|
|
699
|
+
/** [NowPlayingUpdater] does the rendering; this is its platform surface. */
|
|
837
700
|
val nowPlaying: NowPlayingUpdater =
|
|
838
701
|
NowPlayingUpdater(
|
|
839
702
|
object : NowPlayingSurface {
|
|
@@ -872,9 +735,8 @@ internal constructor(
|
|
|
872
735
|
setTitle(title)
|
|
873
736
|
.setDisplayTitle(title)
|
|
874
737
|
.setArtist(secondaryLine)
|
|
875
|
-
// Android Auto reads DISPLAY_SUBTITLE
|
|
876
|
-
//
|
|
877
|
-
// notification.
|
|
738
|
+
// Android Auto reads DISPLAY_SUBTITLE, not ARTIST, once DISPLAY_TITLE is set;
|
|
739
|
+
// `artist` still drives the lock screen and notification.
|
|
878
740
|
.setSubtitle(secondaryLine)
|
|
879
741
|
.setAlbumTitle(album)
|
|
880
742
|
}
|
|
@@ -895,9 +757,8 @@ internal constructor(
|
|
|
895
757
|
val uri = resolved?.uri?.takeIf { it.isNotEmpty() } ?: return null
|
|
896
758
|
val published =
|
|
897
759
|
TrackFactory.sessionArtworkUri(uri, resolved.headers, SvgArtworkRenderer.isSvgUrl(uri))
|
|
898
|
-
//
|
|
899
|
-
//
|
|
900
|
-
// config).
|
|
760
|
+
// Media3 hands this URI back to the bitmap loader, which re-resolves it with the
|
|
761
|
+
// nowPlayingArtwork config rather than the global artwork config.
|
|
901
762
|
browserManager.artworkResolutions.register(published, track, config)
|
|
902
763
|
return published
|
|
903
764
|
}
|
|
@@ -910,8 +771,8 @@ internal constructor(
|
|
|
910
771
|
)
|
|
911
772
|
|
|
912
773
|
/**
|
|
913
|
-
*
|
|
914
|
-
*
|
|
774
|
+
* One replacement for the whole queue: each separate one is a timeline change and a queue event
|
|
775
|
+
* to JS.
|
|
915
776
|
*/
|
|
916
777
|
private fun restampFavorites() {
|
|
917
778
|
if (!::sessionPlayer.isInitialized || sessionPlayer.mediaItemCount == 0) return
|
|
@@ -924,7 +785,6 @@ internal constructor(
|
|
|
924
785
|
sessionPlayer.replaceMediaItems(0, items.size, items)
|
|
925
786
|
}
|
|
926
787
|
|
|
927
|
-
/** Republishes the item at [index] with mutated metadata, preserving uri and Track tag. */
|
|
928
788
|
private fun restampMediaItem(
|
|
929
789
|
index: Int,
|
|
930
790
|
track: Track,
|
|
@@ -936,10 +796,7 @@ internal constructor(
|
|
|
936
796
|
)
|
|
937
797
|
}
|
|
938
798
|
|
|
939
|
-
/**
|
|
940
|
-
* This item with mutated metadata and [track] as its tag, its uri unchanged so ExoPlayer updates
|
|
941
|
-
* it in place instead of reloading it.
|
|
942
|
-
*/
|
|
799
|
+
/** Keeps the uri so ExoPlayer updates the item in place instead of reloading it. */
|
|
943
800
|
private fun MediaItem.restamped(
|
|
944
801
|
track: Track,
|
|
945
802
|
mutate: MediaMetadata.Builder.() -> MediaMetadata.Builder,
|
|
@@ -951,14 +808,9 @@ internal constructor(
|
|
|
951
808
|
.build()
|
|
952
809
|
|
|
953
810
|
/**
|
|
954
|
-
*
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
* A restart from a terminal error begins a new load of the same track: fresh retry budgets and
|
|
958
|
-
* unproven playback, so the user's tap yields a visible first-connect retry window instead of a
|
|
959
|
-
* single silent attempt — the same behavior as re-selecting the track (ADR 0004). Hooked off the
|
|
960
|
-
* player error clearing: every recovery path (retry(), play(), the transport controls' idle-error
|
|
961
|
-
* recovery) goes through exoPlayer.prepare(), which clears the error.
|
|
811
|
+
* Fresh retry budgets and unproven playback, as when the track is selected again (ADR 0004).
|
|
812
|
+
* Called when the player error clears: every restart from a terminal error goes through
|
|
813
|
+
* prepare().
|
|
962
814
|
*/
|
|
963
815
|
internal fun resetForNewLoad() {
|
|
964
816
|
resetRetryTimer()
|
|
@@ -969,11 +821,7 @@ internal constructor(
|
|
|
969
821
|
mediaFactory.resetRetryTimer()
|
|
970
822
|
}
|
|
971
823
|
|
|
972
|
-
/**
|
|
973
|
-
* Finds the queue Track whose published artwork URI matches [uri], for display-time artwork
|
|
974
|
-
* resolution of app-supplied queue tracks that never went through browse (so they are not in the
|
|
975
|
-
* resolution registry). Must run on the main thread (ExoPlayer access).
|
|
976
|
-
*/
|
|
824
|
+
/** Main thread only (ExoPlayer access). */
|
|
977
825
|
private fun findQueueTrackByArtworkUri(uri: String): Track? {
|
|
978
826
|
for (i in 0 until sessionPlayer.mediaItemCount) {
|
|
979
827
|
val item = sessionPlayer.getMediaItemAt(i)
|
|
@@ -985,10 +833,8 @@ internal constructor(
|
|
|
985
833
|
}
|
|
986
834
|
|
|
987
835
|
/**
|
|
988
|
-
*
|
|
989
|
-
*
|
|
990
|
-
* header-only fallback for unattributable URIs (registry eviction / process-death restore). Null
|
|
991
|
-
* means "fetch the URI as-is".
|
|
836
|
+
* For [CoilBitmapLoader]: the resolution registry, then the queue track that published [uri],
|
|
837
|
+
* then headers alone for a URI nothing attributes. Null means fetch the URI as-is.
|
|
992
838
|
*/
|
|
993
839
|
suspend fun resolveDisplayArtwork(uri: String, sizeHintPixels: Int?): ImageSource? {
|
|
994
840
|
val browserManager = browser?.browserManager ?: return null
|
|
@@ -1012,10 +858,6 @@ internal constructor(
|
|
|
1012
858
|
return browserManager.unattributedArtworkSource(uri)
|
|
1013
859
|
}
|
|
1014
860
|
|
|
1015
|
-
/**
|
|
1016
|
-
* Updates the favorite button icon in the notification/Android Auto. Call this when track changes
|
|
1017
|
-
* or favorite state changes.
|
|
1018
|
-
*/
|
|
1019
861
|
internal fun updateFavoriteButtonState(favorited: Boolean?) {
|
|
1020
862
|
if (!::mediaSession.isInitialized) return
|
|
1021
863
|
mediaSessionCallback.commandManager.updateFavoriteState(mediaSession, favorited)
|
|
@@ -1026,7 +868,6 @@ internal constructor(
|
|
|
1026
868
|
mediaSessionCallback.commandManager.updateLiveState(mediaSession, live)
|
|
1027
869
|
}
|
|
1028
870
|
|
|
1029
|
-
/** Removes all the upcoming tracks, if any (the ones returned by [next]). */
|
|
1030
871
|
fun removeUpcomingTracks() {
|
|
1031
872
|
val index = sessionPlayer.currentMediaItemIndex
|
|
1032
873
|
if (index == C.INDEX_UNSET) return
|
|
@@ -1037,24 +878,19 @@ internal constructor(
|
|
|
1037
878
|
}
|
|
1038
879
|
|
|
1039
880
|
fun play() {
|
|
1040
|
-
// Through the setter
|
|
1041
|
-
// (ExoPlayer.play() is only setPlayWhenReady(true)).
|
|
881
|
+
// Through the setter for its replay of an ended player.
|
|
1042
882
|
playWhenReady = true
|
|
1043
883
|
if (currentTrack != null) {
|
|
1044
|
-
// No-op unless the player is
|
|
1045
|
-
//
|
|
1046
|
-
// re-buffers a healthy stream. Reconnecting is also how live streams
|
|
1047
|
-
// rejoin the live edge on resume.
|
|
884
|
+
// No-op unless the player is idle, so this reconnects only after stop() or an error and never
|
|
885
|
+
// re-buffers a healthy stream. Reconnecting is also how a live stream rejoins its live edge.
|
|
1048
886
|
sessionPlayer.prepare()
|
|
1049
887
|
}
|
|
1050
888
|
}
|
|
1051
889
|
|
|
1052
890
|
/**
|
|
1053
|
-
*
|
|
1054
|
-
*
|
|
1055
|
-
*
|
|
1056
|
-
* anything else reconnects — for a non-seekable stream a fresh connection IS the live edge. A
|
|
1057
|
-
* stale URL recovers through the failure-armed re-resolve in [TransformingDataSource].
|
|
891
|
+
* No-op unless the track declares `live`; ExoPlayer never marks progressive ICY radio live. A
|
|
892
|
+
* stream with a live window seeks to its edge; anything else reconnects, which for a non-seekable
|
|
893
|
+
* stream is the live edge.
|
|
1058
894
|
*/
|
|
1059
895
|
fun seekToLiveEdge() {
|
|
1060
896
|
if (currentTrack?.live != true) return
|
|
@@ -1063,18 +899,13 @@ internal constructor(
|
|
|
1063
899
|
}
|
|
1064
900
|
|
|
1065
901
|
/**
|
|
1066
|
-
*
|
|
1067
|
-
*
|
|
1068
|
-
*
|
|
1069
|
-
* @param params The structured search parameters (mode, query, artist, album, etc.)
|
|
1070
|
-
* @return true if search succeeded and playback started, false otherwise
|
|
902
|
+
* @return whether a result started playing: false when gated (after onGate), with no results, or
|
|
903
|
+
* on any error, the browser's registration timeout included.
|
|
1071
904
|
*/
|
|
1072
905
|
suspend fun playFromSearch(params: SearchParams): Boolean {
|
|
1073
906
|
return try {
|
|
1074
907
|
val audioBrowser = awaitBrowser()
|
|
1075
|
-
//
|
|
1076
|
-
// the gate (mirrors the iOS play-media intent guard). Resolved per request; a gated decision
|
|
1077
|
-
// fires onGate(search) and refuses.
|
|
908
|
+
// Gated like browsing, or voice search would be a way around the gate.
|
|
1078
909
|
val gateOutcome =
|
|
1079
910
|
audioBrowser.gateDecision(
|
|
1080
911
|
NativeGateRequest(reason = GateReason.SEARCH, path = null, search = params)
|
|
@@ -1113,9 +944,7 @@ internal constructor(
|
|
|
1113
944
|
}
|
|
1114
945
|
|
|
1115
946
|
fun pause() {
|
|
1116
|
-
// Through the setter so the
|
|
1117
|
-
// drop direction too — the retry policy reads it off-main before
|
|
1118
|
-
// ExoPlayer's listener round-trip syncs it.
|
|
947
|
+
// Through the setter, so the retry policy sees playWhenReadyCache drop at once.
|
|
1119
948
|
playWhenReady = false
|
|
1120
949
|
}
|
|
1121
950
|
|
|
@@ -1123,21 +952,15 @@ internal constructor(
|
|
|
1123
952
|
when {
|
|
1124
953
|
shouldPlayWhenReady -> pause()
|
|
1125
954
|
// Suppressed with the intent raised: ExoPlayer resumes when focus returns. play() would
|
|
1126
|
-
// request focus again, and a call
|
|
955
|
+
// request focus again, and during a call that refusal drops the intent.
|
|
1127
956
|
playWhenReady -> Unit
|
|
1128
957
|
else -> play()
|
|
1129
958
|
}
|
|
1130
959
|
}
|
|
1131
960
|
|
|
1132
|
-
/**
|
|
1133
|
-
* Stops playback, without clearing the active track. Calling this method will cause the playback
|
|
1134
|
-
* state to transition to State.NONE and the player will release the loaded media and resources
|
|
1135
|
-
* required for playback.
|
|
1136
|
-
*/
|
|
961
|
+
/** Keeps the queue; the state becomes STOPPED. */
|
|
1137
962
|
fun stop() {
|
|
1138
|
-
// State first so the machine's STOPPED guard
|
|
1139
|
-
// from the playWhenReady drop below; through setPlaybackState so the change
|
|
1140
|
-
// is emitted (direct field assignment bypasses events — see its docstring).
|
|
963
|
+
// State first, so the state machine's STOPPED guard swallows the PAUSED the drop below causes.
|
|
1141
964
|
setPlaybackState(PlaybackState.STOPPED)
|
|
1142
965
|
playWhenReady = false
|
|
1143
966
|
sessionPlayer.stop()
|
|
@@ -1148,16 +971,11 @@ internal constructor(
|
|
|
1148
971
|
queueSourcePath = null
|
|
1149
972
|
}
|
|
1150
973
|
|
|
1151
|
-
/**
|
|
1152
|
-
* Stops and destroys the player. Only call this when you are finished using the player, otherwise
|
|
1153
|
-
* use [pause].
|
|
1154
|
-
*/
|
|
1155
974
|
fun destroy() {
|
|
1156
|
-
//
|
|
1157
|
-
// player and persist position 0 over the real resumption position.
|
|
975
|
+
// No final save: it would persist position 0 from the released player over the real one.
|
|
1158
976
|
playbackStateStore.cancelPeriodicSave()
|
|
1159
|
-
// An armed timer
|
|
1160
|
-
//
|
|
977
|
+
// An armed timer would fire pause() into the released player. Cleared before the release,
|
|
978
|
+
// while a mid-ramp fade can still restore the volume.
|
|
1161
979
|
sleepTimer.clear()
|
|
1162
980
|
stop()
|
|
1163
981
|
nowPlaying.destroy()
|
|
@@ -1184,27 +1002,23 @@ internal constructor(
|
|
|
1184
1002
|
}
|
|
1185
1003
|
|
|
1186
1004
|
/**
|
|
1187
|
-
*
|
|
1188
|
-
*
|
|
1189
|
-
* read on ExoPlayer's loader thread.
|
|
1005
|
+
* Bumped on track change so a [reportRetryingError] post for the outgoing track is dropped.
|
|
1006
|
+
* Written on main, read on ExoPlayer's loader thread.
|
|
1190
1007
|
*/
|
|
1191
1008
|
@Volatile private var retryingErrorGeneration = 0
|
|
1192
1009
|
|
|
1193
1010
|
/**
|
|
1194
|
-
*
|
|
1195
|
-
*
|
|
1196
|
-
*
|
|
1197
|
-
* reserved for terminal errors. Called from ExoPlayer's loader thread, hence the main hop.
|
|
1011
|
+
* Attaches a load failure the retry policy is still working on to the current state, for UIs to
|
|
1012
|
+
* show over the spinner. Not an ERROR and not [Callbacks.onPlaybackError], which stays terminal.
|
|
1013
|
+
* Called on ExoPlayer's loader thread.
|
|
1198
1014
|
*/
|
|
1199
1015
|
private fun reportRetryingError(exception: IOException) {
|
|
1200
1016
|
val error = PlaybackErrorClassifier.retryingLoadError(exception, networkMonitor.getOnline())
|
|
1201
1017
|
val generation = retryingErrorGeneration
|
|
1202
1018
|
mainHandler.post {
|
|
1203
|
-
// The track changed while this post was in flight — the error belongs to the old one.
|
|
1204
1019
|
if (generation != retryingErrorGeneration) return@post
|
|
1205
|
-
// Only
|
|
1206
|
-
//
|
|
1207
|
-
// any state change — an advisory attached there would never clear.
|
|
1020
|
+
// Only over a spinner: while PLAYING, buffered audio still plays and ExoPlayer's in-place
|
|
1021
|
+
// retry can succeed with no state change, so an error attached there would never clear.
|
|
1208
1022
|
if (
|
|
1209
1023
|
playbackState != PlaybackState.LOADING &&
|
|
1210
1024
|
playbackState != PlaybackState.BUFFERING &&
|
|
@@ -1212,8 +1026,7 @@ internal constructor(
|
|
|
1212
1026
|
) {
|
|
1213
1027
|
return@post
|
|
1214
1028
|
}
|
|
1215
|
-
// Each
|
|
1216
|
-
// re-render now-playing every backoff tick).
|
|
1029
|
+
// Each backoff tick re-reports the same error.
|
|
1217
1030
|
if (playbackError == error) return@post
|
|
1218
1031
|
playbackError = error
|
|
1219
1032
|
callbacks?.onPlaybackChanged(Playback(playbackState, error))
|
|
@@ -1222,9 +1035,8 @@ internal constructor(
|
|
|
1222
1035
|
}
|
|
1223
1036
|
|
|
1224
1037
|
/**
|
|
1225
|
-
* Drops
|
|
1226
|
-
*
|
|
1227
|
-
* error would linger over the new one's spinner.
|
|
1038
|
+
* Drops the retrying error of a track that is gone. The new track may stay LOADING or BUFFERING
|
|
1039
|
+
* with no state change to emit the clear.
|
|
1228
1040
|
*/
|
|
1229
1041
|
internal fun clearRetryingError() {
|
|
1230
1042
|
retryingErrorGeneration++
|
|
@@ -1234,56 +1046,36 @@ internal constructor(
|
|
|
1234
1046
|
nowPlaying.render()
|
|
1235
1047
|
}
|
|
1236
1048
|
|
|
1237
|
-
/**
|
|
1238
|
-
* Updates the player state and emits a state change event if the state has changed. Only emits an
|
|
1239
|
-
* event if the new state differs from the current state.
|
|
1240
|
-
*
|
|
1241
|
-
* IMPORTANT: This method also triggers the queue ended event when the player reaches State.ENDED
|
|
1242
|
-
* and is on the last track. All state transitions should go through this method to ensure proper
|
|
1243
|
-
* event dispatching. Direct assignments to playerState will bypass event emission.
|
|
1244
|
-
*
|
|
1245
|
-
* @param state The new player state to set
|
|
1246
|
-
*/
|
|
1049
|
+
/** Every state change goes through here: it emits the change and the events that follow it. */
|
|
1247
1050
|
internal fun setPlaybackState(state: PlaybackState) {
|
|
1248
1051
|
if (state != playbackState) {
|
|
1249
1052
|
val oldState = playbackState
|
|
1250
1053
|
playbackState = state
|
|
1251
1054
|
|
|
1252
|
-
// Audio rendered: this load has proven itself — retries from here on get
|
|
1253
|
-
// the retry policy's full recovery budget, not the short first-connect one.
|
|
1254
1055
|
if (state == PlaybackState.PLAYING) {
|
|
1255
1056
|
hasPlayedCache = true
|
|
1256
1057
|
}
|
|
1257
1058
|
|
|
1258
|
-
// A natural end exhausts the play intent
|
|
1259
|
-
//
|
|
1260
|
-
//
|
|
1261
|
-
// periodic position save running. Cleared and emitted before the state /
|
|
1262
|
-
// queue-ended callbacks so JS observes the native order (intent → state →
|
|
1263
|
-
// queueEnded); the media3 listener's later echo is deduplicated by
|
|
1264
|
-
// emitPlayWhenReadyChanged. The state machine's ENDED guard keeps the drop
|
|
1265
|
-
// from re-reporting the state as PAUSED.
|
|
1059
|
+
// A natural end exhausts the play intent; held, it inverts the toggle, keeps audio focus and
|
|
1060
|
+
// the periodic save. Emitted before the state and queue-ended callbacks, matching iOS. The
|
|
1061
|
+
// state machine's ENDED guard keeps the drop from reporting PAUSED.
|
|
1266
1062
|
if (state == PlaybackState.ENDED && playWhenReady) {
|
|
1267
1063
|
playWhenReady = false
|
|
1268
1064
|
emitPlayWhenReadyChanged(false)
|
|
1269
1065
|
}
|
|
1270
1066
|
|
|
1271
|
-
// The last track fires no AUTO
|
|
1272
|
-
// end-of-track sleep timer would stay set forever and pause the next
|
|
1273
|
-
// track played instead.
|
|
1067
|
+
// The last track fires no AUTO transition, so the end-of-track sleep timer would stay armed.
|
|
1274
1068
|
if (state == PlaybackState.ENDED) {
|
|
1275
1069
|
sleepTimer.onTrackEnd()
|
|
1276
1070
|
}
|
|
1277
1071
|
|
|
1278
|
-
// Clear error when transitioning away from error state
|
|
1279
1072
|
if (oldState == PlaybackState.ERROR) {
|
|
1280
1073
|
playbackError = null
|
|
1281
1074
|
callbacks?.onPlaybackError(null)
|
|
1282
1075
|
}
|
|
1283
1076
|
|
|
1284
|
-
// A retrying error rides
|
|
1285
|
-
//
|
|
1286
|
-
// it, before the Playback below is built so the emitted event is already clean.
|
|
1077
|
+
// A retrying error rides through LOADING, BUFFERING and PAUSED; any other state proves
|
|
1078
|
+
// recovery or abandons the attempt.
|
|
1287
1079
|
if (
|
|
1288
1080
|
playbackError?.retrying == true &&
|
|
1289
1081
|
state != PlaybackState.LOADING &&
|
|
@@ -1296,25 +1088,16 @@ internal constructor(
|
|
|
1296
1088
|
val playback = Playback(state, playbackError)
|
|
1297
1089
|
callbacks?.onPlaybackChanged(playback)
|
|
1298
1090
|
|
|
1299
|
-
//
|
|
1300
|
-
// `playbackState` (plus isRebuffering / isOnline / error), so any transition can change its
|
|
1301
|
-
// output — the live song while paused, a "Reconnecting…" line on a rebuffer, an offline/error
|
|
1302
|
-
// line. The publish-dedupe in applyNowPlayingFields drops redundant updates, so re-running
|
|
1303
|
-
// through the rapid startup sequence (none→loading→buffering→ready→playing) is cheap.
|
|
1091
|
+
// The formatter sees the state, so any transition can change what it renders.
|
|
1304
1092
|
nowPlaying.render()
|
|
1305
1093
|
|
|
1306
|
-
//
|
|
1307
|
-
// conceptually end the queue (matches web's endsQueue()): an ENDED that surfaces while
|
|
1308
|
-
// repeating (e.g. a seek to the end) must not read as "playlist over".
|
|
1309
|
-
// This coupling ensures queue ended events are always triggered consistently with state
|
|
1310
|
-
// changes
|
|
1094
|
+
// A repeat mode never ends the queue, even on an ENDED from a seek to the end.
|
|
1311
1095
|
if (state == PlaybackState.ENDED && isLastInPlaybackOrder && repeatMode == RepeatMode.OFF) {
|
|
1312
1096
|
currentIndex?.let { index ->
|
|
1313
1097
|
val event =
|
|
1314
1098
|
PlaybackQueueEndedEvent(track = index.toDouble(), position = position.toSeconds())
|
|
1315
1099
|
callbacks?.onPlaybackQueueEnded(event)
|
|
1316
1100
|
}
|
|
1317
|
-
// Reset saved position to 0 so resumption starts from beginning
|
|
1318
1101
|
playbackStateStore.savePositionZero()
|
|
1319
1102
|
}
|
|
1320
1103
|
|
|
@@ -1324,11 +1107,7 @@ internal constructor(
|
|
|
1324
1107
|
}
|
|
1325
1108
|
}
|
|
1326
1109
|
|
|
1327
|
-
/**
|
|
1328
|
-
* Sets the progress update interval.
|
|
1329
|
-
*
|
|
1330
|
-
* @param interval The interval in seconds, or null to disable progress updates
|
|
1331
|
-
*/
|
|
1110
|
+
/** [interval] in seconds; null stops the progress events. */
|
|
1332
1111
|
fun setProgressUpdateInterval(interval: Double?) {
|
|
1333
1112
|
progressTimer.setInterval(interval)
|
|
1334
1113
|
}
|
|
@@ -1337,21 +1116,11 @@ internal constructor(
|
|
|
1337
1116
|
intervalTimer.setInterval(if (enabled) 1.0 else null)
|
|
1338
1117
|
}
|
|
1339
1118
|
|
|
1340
|
-
/**
|
|
1341
|
-
* Applies update options with change detection. Only updates properties that have actually
|
|
1342
|
-
* changed and emits events accordingly.
|
|
1343
|
-
*
|
|
1344
|
-
* @param options The new options to apply
|
|
1345
|
-
* @param mediaSession The MediaSession to update when capabilities change
|
|
1346
|
-
*/
|
|
1347
1119
|
fun applyOptions(options: PlayerUpdateOptions) {
|
|
1348
|
-
// Store previous values for change detection
|
|
1349
1120
|
val previousOptions = this.options
|
|
1350
1121
|
|
|
1351
|
-
// Update current options
|
|
1352
1122
|
this.options = options.copy()
|
|
1353
1123
|
|
|
1354
|
-
// Check what changed
|
|
1355
1124
|
val skipSilenceChanged = previousOptions.skipSilence != options.skipSilence
|
|
1356
1125
|
val progressUpdateEventIntervalChanged =
|
|
1357
1126
|
previousOptions.progressUpdateEventInterval != options.progressUpdateEventInterval
|
|
@@ -1374,14 +1143,13 @@ internal constructor(
|
|
|
1374
1143
|
remoteButtonLayoutChanged ||
|
|
1375
1144
|
appKilledPlaybackBehaviorChanged
|
|
1376
1145
|
|
|
1377
|
-
// Apply only changed properties
|
|
1378
1146
|
if (skipSilenceChanged) {
|
|
1379
1147
|
skipSilence = options.skipSilence
|
|
1380
1148
|
}
|
|
1381
1149
|
|
|
1382
1150
|
if (capabilitiesChanged) {
|
|
1383
|
-
// The
|
|
1384
|
-
// it
|
|
1151
|
+
// The favorite capability is the one favoriting switch; the browser hydrates row hearts from
|
|
1152
|
+
// it.
|
|
1385
1153
|
browser?.browserManager?.setFavoriteEnabled(options.capabilities.favoriteEnabled)
|
|
1386
1154
|
TrackFactory.favoriteEnabled = options.capabilities.favoriteEnabled
|
|
1387
1155
|
if (previousOptions.capabilities.favoriteEnabled != options.capabilities.favoriteEnabled) {
|
|
@@ -1393,8 +1161,7 @@ internal constructor(
|
|
|
1393
1161
|
setProgressUpdateInterval(options.progressUpdateEventInterval)
|
|
1394
1162
|
}
|
|
1395
1163
|
|
|
1396
|
-
// The jump intervals pick the button icons
|
|
1397
|
-
// interval has to rebuild the layout even when capabilities and placement are untouched.
|
|
1164
|
+
// The jump intervals pick the button icons, so a changed interval rebuilds the layout.
|
|
1398
1165
|
if (
|
|
1399
1166
|
capabilitiesChanged ||
|
|
1400
1167
|
remoteButtonLayoutChanged ||
|
|
@@ -1417,20 +1184,10 @@ internal constructor(
|
|
|
1417
1184
|
}
|
|
1418
1185
|
}
|
|
1419
1186
|
|
|
1420
|
-
/**
|
|
1421
|
-
* Sets the callbacks for player events.
|
|
1422
|
-
*
|
|
1423
|
-
* @param callbacks The callbacks to set, or null to clear callbacks
|
|
1424
|
-
*/
|
|
1425
1187
|
fun setCallbacks(callbacks: Callbacks?) {
|
|
1426
1188
|
this.callbacks = callbacks
|
|
1427
1189
|
}
|
|
1428
1190
|
|
|
1429
|
-
/**
|
|
1430
|
-
* Gets the current callbacks instance.
|
|
1431
|
-
*
|
|
1432
|
-
* @return The current callbacks, or null if none are set
|
|
1433
|
-
*/
|
|
1434
1191
|
fun getCallbacks(): Callbacks? {
|
|
1435
1192
|
return this.callbacks
|
|
1436
1193
|
}
|
|
@@ -1443,21 +1200,10 @@ internal constructor(
|
|
|
1443
1200
|
return options
|
|
1444
1201
|
}
|
|
1445
1202
|
|
|
1446
|
-
/**
|
|
1447
|
-
* Gets the current network connectivity state.
|
|
1448
|
-
*
|
|
1449
|
-
* @return true if device is online, false otherwise
|
|
1450
|
-
*/
|
|
1451
1203
|
fun getOnline(): Boolean {
|
|
1452
1204
|
return networkMonitor.getOnline()
|
|
1453
1205
|
}
|
|
1454
1206
|
|
|
1455
|
-
/**
|
|
1456
|
-
* Validates that an index is within bounds [0, trackCount).
|
|
1457
|
-
*
|
|
1458
|
-
* @param index The index to validate.
|
|
1459
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
1460
|
-
*/
|
|
1461
1207
|
private fun validateIndex(index: Int) {
|
|
1462
1208
|
if (index < 0 || index >= sessionPlayer.mediaItemCount) {
|
|
1463
1209
|
throw IllegalArgumentException(
|
|
@@ -1466,12 +1212,6 @@ internal constructor(
|
|
|
1466
1212
|
}
|
|
1467
1213
|
}
|
|
1468
1214
|
|
|
1469
|
-
/**
|
|
1470
|
-
* Validates that an insertion index is within bounds [0, trackCount] or -1 (append).
|
|
1471
|
-
*
|
|
1472
|
-
* @param index The index to validate.
|
|
1473
|
-
* @throws IllegalArgumentException if index is out of bounds.
|
|
1474
|
-
*/
|
|
1475
1215
|
private fun validateInsertIndex(index: Int) {
|
|
1476
1216
|
if (index < -1 || index > sessionPlayer.mediaItemCount) {
|
|
1477
1217
|
throw IllegalArgumentException(
|
|
@@ -1480,21 +1220,10 @@ internal constructor(
|
|
|
1480
1220
|
}
|
|
1481
1221
|
}
|
|
1482
1222
|
|
|
1483
|
-
/**
|
|
1484
|
-
* Gets the MediaSessionCallback for this AudioBrowser.
|
|
1485
|
-
*
|
|
1486
|
-
* @return MediaLibrarySession.Callback instance
|
|
1487
|
-
*/
|
|
1488
1223
|
fun getMediaSessionCallback(): MediaLibraryService.MediaLibrarySession.Callback {
|
|
1489
1224
|
return mediaSessionCallback
|
|
1490
1225
|
}
|
|
1491
1226
|
|
|
1492
|
-
/**
|
|
1493
|
-
* Notifies external controllers (Android Auto, etc.) that content at the given path has changed.
|
|
1494
|
-
* Controllers subscribed to this path will refresh their UI.
|
|
1495
|
-
*
|
|
1496
|
-
* @param path The path where content has changed
|
|
1497
|
-
*/
|
|
1498
1227
|
fun notifyContentChanged(path: String) {
|
|
1499
1228
|
mediaSessionCallback.notifyContentChanged(path)
|
|
1500
1229
|
}
|
|
@@ -1503,41 +1232,24 @@ internal constructor(
|
|
|
1503
1232
|
mediaSessionCallback.invalidateAllContent()
|
|
1504
1233
|
}
|
|
1505
1234
|
|
|
1506
|
-
/**
|
|
1507
|
-
* Returns the recommended artwork size in pixels from the connected media browser (e.g., Android
|
|
1508
|
-
* Auto), or null if not provided.
|
|
1509
|
-
*/
|
|
1235
|
+
/** From the connected media browser (e.g. Android Auto), when it gives one. */
|
|
1510
1236
|
val artworkSizeHintPixels: Int?
|
|
1511
1237
|
get() = mediaSessionCallback.artworkSizeHintPixels
|
|
1512
1238
|
|
|
1513
|
-
/** Returns true if the current media item is a live stream. */
|
|
1514
1239
|
val isCurrentItemLive: Boolean
|
|
1515
1240
|
get() = sessionPlayer.isCurrentMediaItemLive
|
|
1516
1241
|
|
|
1517
1242
|
// MARK: - Buffer Configuration
|
|
1518
1243
|
|
|
1519
|
-
/**
|
|
1520
|
-
* Updates the buffer configuration at runtime.
|
|
1521
|
-
*
|
|
1522
|
-
* The new configuration takes effect immediately for future buffering decisions. Already-buffered
|
|
1523
|
-
* data is not affected.
|
|
1524
|
-
*
|
|
1525
|
-
* @param config The new buffer configuration to apply.
|
|
1526
|
-
*/
|
|
1244
|
+
/** Takes effect for future buffering; what is buffered stays. */
|
|
1527
1245
|
fun updateBufferConfig(config: BufferConfig) {
|
|
1528
1246
|
loadControl.updateBufferConfig(config)
|
|
1529
1247
|
}
|
|
1530
1248
|
|
|
1531
|
-
/**
|
|
1532
|
-
* Gets the current buffer configuration.
|
|
1533
|
-
*
|
|
1534
|
-
* @return The current buffer configuration.
|
|
1535
|
-
*/
|
|
1536
1249
|
fun getBufferConfig(): BufferConfig {
|
|
1537
1250
|
return loadControl.getBufferConfig()
|
|
1538
1251
|
}
|
|
1539
1252
|
|
|
1540
|
-
/** Resets the buffer configuration to defaults. */
|
|
1541
1253
|
fun resetBufferConfig() {
|
|
1542
1254
|
loadControl.resetToDefaults()
|
|
1543
1255
|
}
|