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
|
@@ -4,20 +4,14 @@ import androidx.media3.exoplayer.source.ShuffleOrder
|
|
|
4
4
|
import kotlin.random.Random
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
* A shuffle order over [count] items with [startIndex]
|
|
7
|
+
* A shuffle order over [count] items with [startIndex] (clamped into range) at shuffle position 0
|
|
8
|
+
* and the rest in random order. [random] only seeds the order's later reshuffles on insert.
|
|
8
9
|
*
|
|
9
|
-
* Media3
|
|
10
|
-
* `
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* shuffle
|
|
14
|
-
* share of queues put it last: `nextMediaItemIndex` is then `INDEX_UNSET` from the very first
|
|
15
|
-
* track, so auto-advance ends the queue after one track and fires `onQueueEnded`. The
|
|
16
|
-
* voice-assistant cold resume expands a queue exactly this way, so it sits squarely on that path.
|
|
17
|
-
*
|
|
18
|
-
* Applied unconditionally by `Player.setQueue`, like the Swift twin's `adoptInitialCurrent`:
|
|
19
|
-
* enabling shuffle later does not regenerate the order, so it has to be sane whether or not shuffle
|
|
20
|
-
* is on right now.
|
|
10
|
+
* Media3 discards the start index: `ShuffleOrder.cloneAndSet(insertionCount, startIndex)` defaults
|
|
11
|
+
* to `cloneAndClear().cloneAndInsert(0, insertionCount)` and `DefaultShuffleOrder` does not
|
|
12
|
+
* override it, so with shuffle on the starting track lands at a random position, and when it lands
|
|
13
|
+
* last the queue ends after its first track. Apply it whether or not shuffle is on: enabling
|
|
14
|
+
* shuffle later does not regenerate the order.
|
|
21
15
|
*/
|
|
22
16
|
internal fun shuffleOrderLedBy(startIndex: Int, count: Int, random: Random = Random): ShuffleOrder {
|
|
23
17
|
val first = startIndex.coerceIn(0, (count - 1).coerceAtLeast(0))
|
|
@@ -4,13 +4,11 @@ import android.os.Handler
|
|
|
4
4
|
import android.os.Looper
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* The timer stores the expiration time as a timestamp and uses a Handler to schedule the completion
|
|
10
|
-
* callback. Supports both time-based and end-of-track modes, plus an optional fade-out that starts
|
|
11
|
-
* `fadeDuration` seconds before the deadline so silence lands exactly when the timer completes.
|
|
7
|
+
* A sleep timer whose hooks run on the main looper: [onComplete] at the deadline, and with a fade,
|
|
8
|
+
* [onFadeStart] early enough that the fade ends at the deadline. Subclass it to act on the hooks.
|
|
12
9
|
*/
|
|
13
10
|
open class SleepTimer {
|
|
11
|
+
// Deadline in epoch milliseconds; null when idle or in end-of-track mode.
|
|
14
12
|
var time: Double? = null
|
|
15
13
|
private set
|
|
16
14
|
|
|
@@ -25,10 +23,8 @@ open class SleepTimer {
|
|
|
25
23
|
get() = time != null || sleepWhenPlayedToEnd
|
|
26
24
|
|
|
27
25
|
/**
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
* @param seconds Number of seconds until the timer completes
|
|
31
|
-
* @param fadeDuration Seconds over which to fade out before completion; clamped to [seconds]
|
|
26
|
+
* Completes after [seconds], replacing any armed timer. [fadeDuration] seconds is clamped to
|
|
27
|
+
* [seconds]; null or non-positive means no fade.
|
|
32
28
|
*/
|
|
33
29
|
fun sleepAfter(seconds: Double, fadeDuration: Double? = null) {
|
|
34
30
|
stopTimer()
|
|
@@ -52,8 +48,8 @@ open class SleepTimer {
|
|
|
52
48
|
}
|
|
53
49
|
|
|
54
50
|
/**
|
|
55
|
-
*
|
|
56
|
-
*
|
|
51
|
+
* Arms end-of-track mode, replacing any armed timer. The timer never completes this mode itself:
|
|
52
|
+
* the caller acts when the track ends and calls [clear].
|
|
57
53
|
*/
|
|
58
54
|
fun sleepWhenPlayedToEnd() {
|
|
59
55
|
stopTimer()
|
|
@@ -62,11 +58,7 @@ open class SleepTimer {
|
|
|
62
58
|
sleepWhenPlayedToEnd = true
|
|
63
59
|
}
|
|
64
60
|
|
|
65
|
-
/**
|
|
66
|
-
* Clears the active timer.
|
|
67
|
-
*
|
|
68
|
-
* @return true if a timer was running and was cleared, false otherwise
|
|
69
|
-
*/
|
|
61
|
+
/** Disarms the timer; returns whether one was armed. */
|
|
70
62
|
fun clear(): Boolean {
|
|
71
63
|
val wasRunning = isRunning
|
|
72
64
|
stopTimer()
|
|
@@ -76,25 +68,16 @@ open class SleepTimer {
|
|
|
76
68
|
return wasRunning
|
|
77
69
|
}
|
|
78
70
|
|
|
79
|
-
|
|
80
|
-
open fun onComplete() {
|
|
81
|
-
// Default implementation does nothing - override in subclass
|
|
82
|
-
}
|
|
71
|
+
open fun onComplete() {}
|
|
83
72
|
|
|
84
|
-
|
|
85
|
-
open fun onFadeStart(durationSeconds: Double) {
|
|
86
|
-
// Default implementation does nothing - override in subclass
|
|
87
|
-
}
|
|
73
|
+
open fun onFadeStart(durationSeconds: Double) {}
|
|
88
74
|
|
|
89
|
-
/**
|
|
90
|
-
open fun onFadeCancel() {
|
|
91
|
-
// Default implementation does nothing - override in subclass
|
|
92
|
-
}
|
|
75
|
+
/** Called on every re-arm or clear, whether or not a fade is running; not on completion. */
|
|
76
|
+
open fun onFadeCancel() {}
|
|
93
77
|
|
|
94
78
|
private fun complete() {
|
|
95
79
|
if (!isRunning) return
|
|
96
|
-
//
|
|
97
|
-
// restores the volume.
|
|
80
|
+
// No onFadeCancel: onComplete pauses first, then restores the volume itself.
|
|
98
81
|
stopTimer()
|
|
99
82
|
time = null
|
|
100
83
|
sleepWhenPlayedToEnd = false
|
|
@@ -7,11 +7,9 @@ import com.margelo.nitro.core.NullType
|
|
|
7
7
|
import timber.log.Timber
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* resume at full volume. Mirrors iOS's SleepTimerManager. [pause] is the player's pause;
|
|
14
|
-
* [onChanged] emits onSleepTimerChanged.
|
|
10
|
+
* Runs the sleep timer's volume fade and emits each state change through [onChanged]. Completion
|
|
11
|
+
* pauses rather than stops, and restores the pre-fade volume so the listener resumes at full
|
|
12
|
+
* volume. Mirrors iOS's SleepTimerManager.
|
|
15
13
|
*/
|
|
16
14
|
internal class SleepTimerManager(
|
|
17
15
|
private val volumeFader: VolumeFader,
|
|
@@ -38,7 +36,6 @@ internal class SleepTimerManager(
|
|
|
38
36
|
|
|
39
37
|
private fun none(): NitroSleepTimer = NitroSleepTimer.create(NullType.NULL)
|
|
40
38
|
|
|
41
|
-
/** The current state: a time-based deadline, end-of-track, or none. */
|
|
42
39
|
fun get(): NitroSleepTimer =
|
|
43
40
|
when {
|
|
44
41
|
timer.time != null -> NitroSleepTimer.create(SleepTimerTime(timer.time!!))
|
|
@@ -47,28 +44,27 @@ internal class SleepTimerManager(
|
|
|
47
44
|
}
|
|
48
45
|
|
|
49
46
|
/**
|
|
50
|
-
* Pauses
|
|
51
|
-
*
|
|
47
|
+
* Pauses after [seconds]. A [fadeDuration] (seconds) fades out over the last part of that
|
|
48
|
+
* interval, clamped to [seconds].
|
|
52
49
|
*/
|
|
53
50
|
fun setAfter(seconds: Double, fadeDuration: Double? = null) {
|
|
54
51
|
timer.sleepAfter(seconds, fadeDuration)
|
|
55
52
|
onChanged(get())
|
|
56
53
|
}
|
|
57
54
|
|
|
58
|
-
/** Pauses playback when the current track finishes playing. */
|
|
59
55
|
fun setEndOfTrack() {
|
|
60
56
|
timer.sleepWhenPlayedToEnd()
|
|
61
57
|
onChanged(get())
|
|
62
58
|
}
|
|
63
59
|
|
|
64
|
-
/**
|
|
60
|
+
/** @return true when a timer was armed and is now cleared. */
|
|
65
61
|
fun clear(): Boolean {
|
|
66
62
|
val wasRunning = timer.clear()
|
|
67
63
|
if (wasRunning) onChanged(none())
|
|
68
64
|
return wasRunning
|
|
69
65
|
}
|
|
70
66
|
|
|
71
|
-
/**
|
|
67
|
+
/** Call when a track plays to its end; pauses only if an end-of-track sleep is armed. */
|
|
72
68
|
fun onTrackEnd() {
|
|
73
69
|
if (timer.sleepWhenPlayedToEnd) {
|
|
74
70
|
Timber.d("Sleep timer triggered on track end, pausing playback")
|
|
@@ -1,22 +1,13 @@
|
|
|
1
1
|
package com.audiobrowser.player
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
|
-
* Caps how
|
|
5
|
-
* [androidx.media3.common.util.StuckPlayerException] before
|
|
4
|
+
* Caps how often the player recovers from a media3
|
|
5
|
+
* [androidx.media3.common.util.StuckPlayerException] before it surfaces a terminal error. Once the
|
|
6
|
+
* cap is passed, every call gives up until [reset], so a dead stream yields one error instead of a
|
|
7
|
+
* recover/error sawtooth.
|
|
6
8
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* a transient stall should reconnect, not stop playback. But a genuinely dead stream would re-fire
|
|
10
|
-
* forever, so we allow at most [maxRecoveries] recoveries. The budget refills only when the caller
|
|
11
|
-
* has proof the stream is alive (sustained playback) or on a track change — both via [reset]. Once
|
|
12
|
-
* the cap is exceeded the decision stays [Decision.GIVE_UP] (it does not self-refill), so a dead
|
|
13
|
-
* stream produces one clean terminal error instead of a recover/error sawtooth.
|
|
14
|
-
*
|
|
15
|
-
* Deliberately holds no clock or time-window: a time-window keyed on recovery timing lets a stream
|
|
16
|
-
* that re-stalls just outside the window recover indefinitely. "Is it alive?" is answered by the
|
|
17
|
-
* caller from actual playback progress, not elapsed time.
|
|
18
|
-
*
|
|
19
|
-
* @param maxRecoveries Maximum recoveries allowed before giving up.
|
|
9
|
+
* It holds no time window on purpose: a stream that re-stalls just outside one would recover
|
|
10
|
+
* forever. Whether the stream is alive is the caller's call, from playback progress.
|
|
20
11
|
*/
|
|
21
12
|
class StuckRecoveryPolicy(private val maxRecoveries: Int = DEFAULT_MAX_RECOVERIES) {
|
|
22
13
|
enum class Decision {
|
|
@@ -27,19 +18,15 @@ class StuckRecoveryPolicy(private val maxRecoveries: Int = DEFAULT_MAX_RECOVERIE
|
|
|
27
18
|
private var recoveryCount = 0
|
|
28
19
|
|
|
29
20
|
/**
|
|
30
|
-
* Records a stuck event
|
|
31
|
-
*
|
|
32
|
-
* terminal error. Stays [Decision.GIVE_UP] until [reset] is called.
|
|
21
|
+
* Records a stuck event. [Decision.RECOVER] for the first [maxRecoveries] calls, then
|
|
22
|
+
* [Decision.GIVE_UP] until [reset].
|
|
33
23
|
*/
|
|
34
24
|
fun onStuck(): Decision {
|
|
35
25
|
recoveryCount++
|
|
36
26
|
return if (recoveryCount > maxRecoveries) Decision.GIVE_UP else Decision.RECOVER
|
|
37
27
|
}
|
|
38
28
|
|
|
39
|
-
/**
|
|
40
|
-
* Refills the recovery budget. Call on proof the stream is alive (sustained playback) or on a
|
|
41
|
-
* track change.
|
|
42
|
-
*/
|
|
29
|
+
/** Refills the budget. Call on sustained playback or a track change. */
|
|
43
30
|
fun reset() {
|
|
44
31
|
recoveryCount = 0
|
|
45
32
|
}
|
|
@@ -11,22 +11,20 @@ import java.io.IOException
|
|
|
11
11
|
import timber.log.Timber
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
|
-
*
|
|
14
|
+
* Wraps an upstream [DataSource] and resolves each track's media URL through its request config
|
|
15
|
+
* (which may call into JS) in [open], on ExoPlayer's IO thread. Resolving on the main thread, in
|
|
16
|
+
* `createMediaSource`, deadlocks while a synchronous Nitro call such as `seekTo` holds the JS
|
|
17
|
+
* thread.
|
|
15
18
|
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
* data. By deferring URL transformation (which may invoke a JS callback via `runBlocking`) to
|
|
19
|
-
* [open], we avoid blocking the main thread and prevent deadlocks when the JS thread is occupied by
|
|
20
|
-
* synchronous Nitro calls (e.g., `seekTo`).
|
|
21
|
-
*
|
|
22
|
-
* The transform is resolved once per track on the first [open] call (the manifest/media URL). The
|
|
23
|
-
* resulting headers and user-agent are cached on the [Factory] and reused for subsequent requests
|
|
24
|
-
* (segments, encryption keys) without calling the JS transform again.
|
|
19
|
+
* The first open resolves the media URL and caches the result on the [Factory]; later opens of
|
|
20
|
+
* other URLs (HLS segments, keys) keep their own URL and reuse the cached headers and user agent.
|
|
25
21
|
*/
|
|
26
22
|
class TransformingDataSource(private val upstream: DataSource, private val factory: Factory) :
|
|
27
23
|
DataSource {
|
|
28
24
|
|
|
29
25
|
companion object {
|
|
26
|
+
// Matches the default request property MediaFactory sets upstream; a config with this user
|
|
27
|
+
// agent adds no User-Agent header of its own.
|
|
30
28
|
private const val DEFAULT_USER_AGENT = "react-native-audio-browser"
|
|
31
29
|
}
|
|
32
30
|
|
|
@@ -35,17 +33,13 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
35
33
|
override fun open(dataSpec: DataSpec): Long {
|
|
36
34
|
val originalUrl = dataSpec.uri.toString()
|
|
37
35
|
|
|
38
|
-
// The first open() resolves the transform and caches it on the Factory; subsequent opens
|
|
39
|
-
// (segments, keys, replays) reuse the cached headers/user-agent but keep their own URLs.
|
|
40
36
|
val cached = factory.cachedTransform
|
|
41
37
|
val (finalUrl, headers, userAgent) =
|
|
42
38
|
when {
|
|
43
39
|
cached == null -> resolveAndCache(originalUrl)
|
|
44
|
-
// Re-open of the
|
|
45
|
-
//
|
|
46
|
-
//
|
|
47
|
-
// re-resolve once (see the catch below): the URL/token may be stale. The fresh URL is still
|
|
48
|
-
// absolute, so that hazard stays avoided.
|
|
40
|
+
// Re-open of the media URL (a retry) reuses the resolved URL: the original may be
|
|
41
|
+
// schemeless ("/listen/<id>/x.mp3"), which DefaultDataSource routes to a file and fails.
|
|
42
|
+
// After a failed load it re-resolves once instead, since the URL or token may have expired.
|
|
49
43
|
originalUrl == factory.cachedOriginalUrl ->
|
|
50
44
|
if (factory.reresolveOnNextMediaOpen) {
|
|
51
45
|
factory.reresolveOnNextMediaOpen = false
|
|
@@ -53,12 +47,10 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
53
47
|
} else {
|
|
54
48
|
cached
|
|
55
49
|
}
|
|
56
|
-
//
|
|
57
|
-
// its own URL.
|
|
50
|
+
// An already-absolute segment or key URL: keep it, reuse the headers.
|
|
58
51
|
else -> Triple(originalUrl, cached.second, cached.third)
|
|
59
52
|
}
|
|
60
53
|
|
|
61
|
-
// Build merged headers including user-agent override
|
|
62
54
|
val mergedHeaders = buildMap {
|
|
63
55
|
putAll(dataSpec.httpRequestHeaders)
|
|
64
56
|
putAll(headers)
|
|
@@ -67,7 +59,6 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
67
59
|
}
|
|
68
60
|
}
|
|
69
61
|
|
|
70
|
-
// Build a new DataSpec with the (possibly transformed) URL and merged headers
|
|
71
62
|
val transformedSpec =
|
|
72
63
|
dataSpec.buildUpon().setUri(finalUrl.toUri()).setHttpRequestHeaders(mergedHeaders).build()
|
|
73
64
|
|
|
@@ -75,10 +66,7 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
75
66
|
return try {
|
|
76
67
|
upstream.open(transformedSpec)
|
|
77
68
|
} catch (e: IOException) {
|
|
78
|
-
//
|
|
79
|
-
// refreshed instead of replayed. Scoped to the media URL (segment/key failures keep their own
|
|
80
|
-
// URL). The flag lives on this item's Factory, so it stays correct when several tracks'
|
|
81
|
-
// factories are alive at once (a queue).
|
|
69
|
+
// Only a media-URL failure refreshes the URL; a failed segment or key leaves it alone.
|
|
82
70
|
if (originalUrl == factory.cachedOriginalUrl) {
|
|
83
71
|
factory.reresolveOnNextMediaOpen = true
|
|
84
72
|
}
|
|
@@ -86,7 +74,6 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
86
74
|
}
|
|
87
75
|
}
|
|
88
76
|
|
|
89
|
-
/** Resolves the transform for [originalUrl] and caches the result on the [Factory]. */
|
|
90
77
|
private fun resolveAndCache(originalUrl: String): Triple<String, Map<String, String>, String> {
|
|
91
78
|
val resolved = resolveRequestConfig(originalUrl)
|
|
92
79
|
factory.cachedTransform = resolved
|
|
@@ -108,13 +95,10 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
108
95
|
}
|
|
109
96
|
|
|
110
97
|
/**
|
|
111
|
-
*
|
|
112
|
-
*
|
|
113
|
-
*
|
|
114
|
-
*
|
|
115
|
-
* override this transparent wrapper would swallow the ICY headers — playback keeps working but
|
|
116
|
-
* `onMetadata` never fires (live "now playing" song goes missing). Swallowing them also leaves
|
|
117
|
-
* the interleaved metadata bytes in the audio stream, where they decode as audible chirping.
|
|
98
|
+
* Upstream's response headers. Media3's `ProgressiveMediaPeriod` reads `icy-metaint` from them to
|
|
99
|
+
* install `IcyDataSource`; the `DataSource` default of an empty map would lose ICY song metadata
|
|
100
|
+
* (`onMetadata` never fires) and leave the metadata bytes in the stream, decoded as audible
|
|
101
|
+
* chirps.
|
|
118
102
|
*/
|
|
119
103
|
override fun getResponseHeaders(): Map<String, List<String>> {
|
|
120
104
|
return upstream.responseHeaders
|
|
@@ -126,10 +110,9 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
126
110
|
}
|
|
127
111
|
|
|
128
112
|
/**
|
|
129
|
-
*
|
|
130
|
-
*
|
|
131
|
-
*
|
|
132
|
-
* @return Triple of (finalUrl, headers, userAgent)
|
|
113
|
+
* Runs the request config callback for [originalUrl], blocking on JS if needed; call only off the
|
|
114
|
+
* main thread. Returns (finalUrl, headers, userAgent); without a config, or when the callback
|
|
115
|
+
* throws, the original URL with no headers and the default user agent.
|
|
133
116
|
*/
|
|
134
117
|
private fun resolveRequestConfig(
|
|
135
118
|
originalUrl: String
|
|
@@ -151,32 +134,17 @@ class TransformingDataSource(private val upstream: DataSource, private val facto
|
|
|
151
134
|
}
|
|
152
135
|
}
|
|
153
136
|
|
|
154
|
-
/** Factory that creates [TransformingDataSource] instances wrapping an upstream factory. */
|
|
155
137
|
class Factory(
|
|
156
138
|
private val upstreamFactory: DataSource.Factory,
|
|
157
139
|
internal val getRequestConfig: (originalUrl: String) -> MediaRequestConfig?,
|
|
158
140
|
) : DataSource.Factory {
|
|
159
141
|
|
|
160
|
-
|
|
161
|
-
* Cached transform result (url, headers, userAgent) from the first open() call. Shared across
|
|
162
|
-
* all DataSource instances created by this factory. A new Factory is created per
|
|
163
|
-
* [MediaFactory.createMediaSource] call (per track), so the cache naturally resets on track
|
|
164
|
-
* transitions.
|
|
165
|
-
*/
|
|
142
|
+
// One Factory per track (MediaFactory.createMediaSource), so the cache resets on track change.
|
|
166
143
|
@Volatile internal var cachedTransform: Triple<String, Map<String, String>, String>? = null
|
|
167
144
|
|
|
168
|
-
/**
|
|
169
|
-
* The original (pre-transform) URL that [cachedTransform] was resolved from. Used to recognise
|
|
170
|
-
* a re-open of the same media URL (e.g. a retry) so it reuses the resolved URL instead of the
|
|
171
|
-
* raw original.
|
|
172
|
-
*/
|
|
173
145
|
@Volatile internal var cachedOriginalUrl: String? = null
|
|
174
146
|
|
|
175
|
-
|
|
176
|
-
* Set when a media-URL load fails so the next media-URL open re-runs the transform instead of
|
|
177
|
-
* replaying [cachedTransform] — recovers an expired short-lived URL/token across a retry.
|
|
178
|
-
* Self-clearing: consumed by the first re-resolve.
|
|
179
|
-
*/
|
|
147
|
+
// Set by a failed media-URL open; the next media-URL open re-resolves and clears it.
|
|
180
148
|
@Volatile internal var reresolveOnNextMediaOpen: Boolean = false
|
|
181
149
|
|
|
182
150
|
override fun createDataSource(): DataSource {
|
|
@@ -5,18 +5,14 @@ import android.os.Looper
|
|
|
5
5
|
import android.os.SystemClock
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
|
-
* Ramps the player volume
|
|
9
|
-
*
|
|
10
|
-
* than a fade.
|
|
8
|
+
* Ramps the player volume to silence over a duration (the sleep timer's fade), on the main looper.
|
|
9
|
+
* The gain follows a squared curve: a linear gain ramp sounds like a late cutoff, not a fade.
|
|
11
10
|
*/
|
|
12
11
|
class VolumeFader(private val getVolume: () -> Float, private val setVolume: (Float) -> Unit) {
|
|
13
12
|
private val handler = Handler(Looper.getMainLooper())
|
|
14
13
|
private var stepRunnable: Runnable? = null
|
|
15
14
|
|
|
16
|
-
/**
|
|
17
|
-
* Volume captured when the fade started; restored after the fade resolves. Non-null from fade
|
|
18
|
-
* start until cancel/completion, even once the ramp has reached silence.
|
|
19
|
-
*/
|
|
15
|
+
/** The pre-fade volume; non-null from [start] until [cancel] or [resolve], even at silence. */
|
|
20
16
|
var originalVolume: Float? = null
|
|
21
17
|
private set
|
|
22
18
|
|
|
@@ -24,8 +20,7 @@ class VolumeFader(private val getVolume: () -> Float, private val setVolume: (Fl
|
|
|
24
20
|
get() = originalVolume != null
|
|
25
21
|
|
|
26
22
|
fun start(durationSeconds: Double) {
|
|
27
|
-
//
|
|
28
|
-
// (partially faded) volume is not the value to restore.
|
|
23
|
+
// Restarting mid-fade keeps the first fade's baseline, not the partly faded current volume.
|
|
29
24
|
val baseVolume = originalVolume ?: getVolume()
|
|
30
25
|
cancel(restoreVolume = false)
|
|
31
26
|
originalVolume = baseVolume
|
|
@@ -51,9 +46,8 @@ class VolumeFader(private val getVolume: () -> Float, private val setVolume: (Fl
|
|
|
51
46
|
}
|
|
52
47
|
|
|
53
48
|
/**
|
|
54
|
-
* Stops the ramp. With [restoreVolume] the pre-fade volume
|
|
55
|
-
*
|
|
56
|
-
* would let full-volume audio slip out).
|
|
49
|
+
* Stops the ramp. With [restoreVolume] the pre-fade volume comes back at once; without it the
|
|
50
|
+
* volume stays where the ramp left it and the pre-fade volume is forgotten.
|
|
57
51
|
*/
|
|
58
52
|
fun cancel(restoreVolume: Boolean) {
|
|
59
53
|
stepRunnable?.let { handler.removeCallbacks(it) }
|
|
@@ -64,9 +58,8 @@ class VolumeFader(private val getVolume: () -> Float, private val setVolume: (Fl
|
|
|
64
58
|
}
|
|
65
59
|
|
|
66
60
|
/**
|
|
67
|
-
*
|
|
68
|
-
*
|
|
69
|
-
* slip out. The restore is skipped when no fade was running.
|
|
61
|
+
* Stops the ramp, runs [halt], then restores the pre-fade volume, in that order so no audio plays
|
|
62
|
+
* at full volume before the halt. Restores nothing when no fade was running.
|
|
70
63
|
*/
|
|
71
64
|
fun resolve(halt: () -> Unit) {
|
|
72
65
|
val preFadeVolume = originalVolume
|
|
@@ -9,9 +9,10 @@ import androidx.media3.common.MimeTypes
|
|
|
9
9
|
import androidx.media3.common.util.Util
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
|
-
* [item]
|
|
13
|
-
*
|
|
14
|
-
*
|
|
12
|
+
* [item] rewritten for a receiver, which fetches [url] and the artwork itself, without the app's
|
|
13
|
+
* request headers. Artwork is [artworkUrl], else the item's own, and is dropped unless http(s). A
|
|
14
|
+
* [live] item gets a live configuration (see [isRemoteLive]) and the radio-station media type, and
|
|
15
|
+
* loads at its live edge.
|
|
15
16
|
*/
|
|
16
17
|
internal fun remoteItemOf(
|
|
17
18
|
item: MediaItem,
|
|
@@ -39,9 +40,9 @@ internal fun remoteItemOf(
|
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
/**
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
43
|
+
* [declared] when non-null, else HLS or DASH inferred from [url], else the audio type of its
|
|
44
|
+
* extension, else `audio/mpeg`: a Cast receiver skips an item with no type, and sniffs the codec of
|
|
45
|
+
* one it plays.
|
|
45
46
|
*/
|
|
46
47
|
internal fun remoteMimeType(url: String, declared: String?): String {
|
|
47
48
|
if (declared != null) return declared
|
|
@@ -55,10 +56,10 @@ internal fun remoteMimeType(url: String, declared: String?): String {
|
|
|
55
56
|
} ?: MimeTypes.AUDIO_MPEG
|
|
56
57
|
}
|
|
57
58
|
|
|
58
|
-
/** Whether
|
|
59
|
+
/** Whether [remoteItemOf] built this item as live, so a receiver loads it at its live edge. */
|
|
59
60
|
internal val MediaItem.isRemoteLive: Boolean
|
|
60
61
|
get() = liveConfiguration != MediaItem.LiveConfiguration.UNSET
|
|
61
62
|
|
|
62
|
-
//
|
|
63
|
+
// Speed fixed at 1: no catching up or falling back at the live edge.
|
|
63
64
|
private val LIVE: MediaItem.LiveConfiguration =
|
|
64
65
|
MediaItem.LiveConfiguration.Builder().setMinPlaybackSpeed(1f).setMaxPlaybackSpeed(1f).build()
|
|
@@ -16,15 +16,13 @@ import kotlinx.coroutines.MainScope
|
|
|
16
16
|
import kotlinx.coroutines.cancel
|
|
17
17
|
import kotlinx.coroutines.withContext
|
|
18
18
|
|
|
19
|
-
/**
|
|
20
|
-
* The URLs a receiver fetches for a track: its media through the media transform, and its artwork.
|
|
21
|
-
*/
|
|
19
|
+
/** What a receiver fetches for a track: its media URL, after the media transform, and artwork. */
|
|
22
20
|
internal data class RemoteUrls(val url: String, val artworkUrl: String?)
|
|
23
21
|
|
|
24
22
|
/**
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
23
|
+
* Sets up the Output Switcher's routes and the Sonos route provider as [RemoteOutputsOptions] says,
|
|
24
|
+
* and owns the remote of each output turned on and the [RemoteSwitchingPlayer] that plays on them,
|
|
25
|
+
* resolving the items it sends through [resolveUrls].
|
|
28
26
|
*/
|
|
29
27
|
internal class RemoteOutputsController(
|
|
30
28
|
private val context: Context,
|
|
@@ -37,13 +35,14 @@ internal class RemoteOutputsController(
|
|
|
37
35
|
private var cast: RemotePlayback? = null
|
|
38
36
|
private var sonos: RemotePlayback? = null
|
|
39
37
|
|
|
40
|
-
/**
|
|
38
|
+
/** Plays while any output is on; null when none is. */
|
|
41
39
|
var player: RemoteSwitchingPlayer? = null
|
|
42
40
|
private set
|
|
43
41
|
|
|
44
42
|
/**
|
|
45
43
|
* Turns the outputs in [options] on and the rest off; null turns remote outputs off. An output
|
|
46
|
-
* that stays on keeps its session and what it plays
|
|
44
|
+
* that stays on keeps its remote, session and what it plays, even if the receiver ID changes.
|
|
45
|
+
* [local] is used only when the switch is built. Returns whether [player] changed.
|
|
47
46
|
*/
|
|
48
47
|
@MainThread
|
|
49
48
|
fun apply(options: RemoteOutputsOptions?, local: MediaPlayer): Boolean {
|
|
@@ -58,6 +57,7 @@ internal class RemoteOutputsController(
|
|
|
58
57
|
SonosOutputs.setEnabled(context, wantSonos)
|
|
59
58
|
val had = this.options
|
|
60
59
|
this.options = options
|
|
60
|
+
// A remote turned off is only dropped here; the switch releases it below.
|
|
61
61
|
if (wantCast != (had?.cast == true))
|
|
62
62
|
cast = if (wantCast) castRemote(context, receiver) else null
|
|
63
63
|
if (wantSonos != (had?.sonos == true))
|
|
@@ -77,7 +77,10 @@ internal class RemoteOutputsController(
|
|
|
77
77
|
player?.setLocal(local)
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
/**
|
|
80
|
+
/**
|
|
81
|
+
* Brings playback back to the local player and lets go of the remotes; the controller is unusable
|
|
82
|
+
* after. The Output Switcher routes and Sonos route provider stay as [apply] left them.
|
|
83
|
+
*/
|
|
81
84
|
fun release() {
|
|
82
85
|
player?.release()
|
|
83
86
|
player = null
|
|
@@ -87,7 +90,7 @@ internal class RemoteOutputsController(
|
|
|
87
90
|
scope.cancel()
|
|
88
91
|
}
|
|
89
92
|
|
|
90
|
-
/** [item] as a receiver loads it
|
|
93
|
+
/** [item] as a receiver loads it; an item without a [Track] tag plays its own URI. */
|
|
91
94
|
private suspend fun resolve(item: MediaItem): MediaItem {
|
|
92
95
|
val track = item.localConfiguration?.tag as? Track
|
|
93
96
|
val urls =
|
|
@@ -4,14 +4,14 @@ import androidx.media3.common.PlaybackException
|
|
|
4
4
|
import androidx.media3.common.Player as MediaPlayer
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
* A remote output
|
|
8
|
-
* apart from its SDK or protocol so the
|
|
7
|
+
* A remote output (a Cast receiver or a Sonos room) as [RemoteSwitchingPlayer] drives it, kept
|
|
8
|
+
* apart from its SDK or protocol so the library builds without them.
|
|
9
9
|
*/
|
|
10
10
|
internal interface RemotePlayback {
|
|
11
11
|
/**
|
|
12
|
-
*
|
|
13
|
-
* loads it there
|
|
14
|
-
* [MediaPlayer.prepare]. A session can bring a new player
|
|
12
|
+
* The receiver of the current session; read it only while [isSessionAvailable]. It plays one item
|
|
13
|
+
* at a time: setting an item loads it there from the given position, and plays it if
|
|
14
|
+
* `playWhenReady` is set, without [MediaPlayer.prepare]. A new session can bring a new player.
|
|
15
15
|
*/
|
|
16
16
|
val player: MediaPlayer
|
|
17
17
|
|
|
@@ -20,7 +20,7 @@ internal interface RemotePlayback {
|
|
|
20
20
|
/** Calls [listener] on the main thread; null stops the calls. */
|
|
21
21
|
fun setListener(listener: Listener?)
|
|
22
22
|
|
|
23
|
-
/** Ends the session on this side; the receiver
|
|
23
|
+
/** Ends the session on this side; the receiver may stop or play on. */
|
|
24
24
|
fun release()
|
|
25
25
|
|
|
26
26
|
interface Listener {
|
|
@@ -28,8 +28,8 @@ internal interface RemotePlayback {
|
|
|
28
28
|
fun onSessionChanged()
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
|
-
* The receiver reports its item playing
|
|
32
|
-
*
|
|
31
|
+
* The receiver reports its item playing. [player]'s play state turns to playing as soon as play
|
|
32
|
+
* is asked, before the receiver does.
|
|
33
33
|
*/
|
|
34
34
|
fun onPlaying()
|
|
35
35
|
|