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
|
@@ -6,93 +6,62 @@ import com.margelo.nitro.audiobrowser.NavigationErrorKind
|
|
|
6
6
|
import java.net.URLEncoder
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* 1. System paths (prefixed with `/__`): root, search, offline, error, gate, and empty paths
|
|
13
|
-
* 2. Contextual URLs: Embed parent context in track identifiers for Media3 integration
|
|
14
|
-
*
|
|
15
|
-
* Contextual URL format: `{parentPath}?__trackId={trackIdentity}&__index={childIndex}` (the
|
|
16
|
-
* identity is the track's `id` when non-blank, else its `src`) Example:
|
|
17
|
-
* "/library/radio?__trackId=song.mp3&__index=2"
|
|
18
|
-
*
|
|
19
|
-
* `__trackId` is the identity check; `__index` (the child's position on the page at stamp time) is
|
|
20
|
-
* only a tie-breaker between surfaces that carry the same identity — a stale index never selects a
|
|
21
|
-
* different track.
|
|
22
|
-
*
|
|
23
|
-
* This allows:
|
|
24
|
-
* - Media3 to reference playable-only tracks (tracks with `src` but no `path`)
|
|
25
|
-
* - Cache lookup to work consistently
|
|
26
|
-
* - Parent context to be preserved for queue restoration
|
|
9
|
+
* Builds and parses the library's own browse paths: the `/__` system paths, and contextual paths
|
|
10
|
+
* `{parentPath}?__trackId={identity}&__index={childIndex}`, which give Media3 a media ID for a
|
|
11
|
+
* playable-only track while keeping its parent for queue restoration (docs/adr/0009).
|
|
27
12
|
*/
|
|
28
13
|
object BrowserPathHelper {
|
|
29
|
-
/** Root path for media browsing */
|
|
30
14
|
const val ROOT_PATH = "/__root"
|
|
31
15
|
|
|
32
|
-
/**
|
|
16
|
+
/** Full search paths are `/__search?q=<query>`; see [createSearchPath]. */
|
|
33
17
|
const val SEARCH_PATH_PREFIX = "/__search"
|
|
34
18
|
|
|
35
|
-
/**
|
|
19
|
+
/** Placeholder media ID for the offline tile. */
|
|
36
20
|
const val OFFLINE_PATH = "/__offline"
|
|
37
21
|
|
|
38
|
-
/**
|
|
22
|
+
/** Placeholder media ID for a generic browse error tile. */
|
|
39
23
|
const val ERROR_PATH = "/__error"
|
|
40
24
|
|
|
41
|
-
/** Browse Gate
|
|
25
|
+
/** Placeholder media ID for a Browse Gate tile (subscription, login or region block). */
|
|
42
26
|
const val GATE_PATH = "/__gate"
|
|
43
27
|
|
|
44
|
-
/**
|
|
28
|
+
/** Placeholder media ID for a level that resolved with zero children (docs/adr/0001). */
|
|
45
29
|
const val EMPTY_PATH = "/__empty"
|
|
46
30
|
|
|
47
|
-
// Query parameter name for contextual track identifiers
|
|
48
31
|
private const val CONTEXTUAL_TRACK_PARAM = "__trackId"
|
|
49
32
|
|
|
50
|
-
//
|
|
33
|
+
// Only a tie-breaker between surfaces carrying the same identity: a stale index never selects a
|
|
34
|
+
// different track.
|
|
51
35
|
private const val CONTEXTUAL_INDEX_PARAM = "__index"
|
|
52
36
|
|
|
53
|
-
/** Whether a navigation error on this path came from a browse or a search */
|
|
54
37
|
fun navigationErrorKind(path: String): NavigationErrorKind =
|
|
55
38
|
if (path.startsWith("$SEARCH_PATH_PREFIX?")) NavigationErrorKind.SEARCH
|
|
56
39
|
else NavigationErrorKind.BROWSE
|
|
57
40
|
|
|
58
|
-
/** Check if a path is a special system path (not a regular navigation path) */
|
|
59
41
|
fun isSpecialPath(path: String): Boolean {
|
|
60
42
|
return path == ROOT_PATH || path.startsWith("$SEARCH_PATH_PREFIX?")
|
|
61
43
|
}
|
|
62
44
|
|
|
63
45
|
/**
|
|
64
|
-
* The tile sentinels a drill-in dead-ends on (see `deadEndChildren`
|
|
65
|
-
*
|
|
46
|
+
* The tile sentinels a drill-in dead-ends on (see `deadEndChildren`). [GATE_PATH] is not one: it
|
|
47
|
+
* re-serves the gate tile so the message stays readable.
|
|
66
48
|
*/
|
|
67
49
|
fun isDeadEndPath(path: String): Boolean {
|
|
68
50
|
return path == OFFLINE_PATH || path == ERROR_PATH || path == EMPTY_PATH
|
|
69
51
|
}
|
|
70
52
|
|
|
71
|
-
/** Create a search path for a given query */
|
|
72
53
|
fun createSearchPath(query: String): String {
|
|
73
54
|
val encodedQuery = URLEncoder.encode(query, "UTF-8")
|
|
74
55
|
return "$SEARCH_PATH_PREFIX?q=$encodedQuery"
|
|
75
56
|
}
|
|
76
57
|
|
|
77
|
-
/**
|
|
78
|
-
* Checks if a path contains a contextual track identifier.
|
|
79
|
-
*
|
|
80
|
-
* @param path The URL path to check
|
|
81
|
-
* @return true if the path contains the contextual track parameter
|
|
82
|
-
*/
|
|
83
58
|
fun isContextual(path: String): Boolean {
|
|
84
59
|
return path.contains("?$CONTEXTUAL_TRACK_PARAM=") || path.contains("&$CONTEXTUAL_TRACK_PARAM=")
|
|
85
60
|
}
|
|
86
61
|
|
|
87
62
|
/**
|
|
88
|
-
*
|
|
89
|
-
*
|
|
90
|
-
*
|
|
91
|
-
* @param url The URL to process
|
|
92
|
-
* @return The URL without the contextual parameters
|
|
93
|
-
*
|
|
94
|
-
* Example: "/library/radio?__trackId=song.mp3&__index=2" → "/library/radio" Example:
|
|
95
|
-
* "/search?q=jazz&__trackId=song.mp3" → "/search?q=jazz"
|
|
63
|
+
* The parent path: [url] without `__trackId` and `__index`, its other query parameters kept.
|
|
64
|
+
* Returns a non-contextual [url] unchanged.
|
|
96
65
|
*/
|
|
97
66
|
fun stripTrackId(url: String): String {
|
|
98
67
|
if (!isContextual(url)) {
|
|
@@ -101,11 +70,9 @@ object BrowserPathHelper {
|
|
|
101
70
|
|
|
102
71
|
val uri = url.toUri()
|
|
103
72
|
|
|
104
|
-
// Build URL preserving everything except the contextual parameters
|
|
105
73
|
val builder = uri.buildUpon()
|
|
106
74
|
builder.clearQuery()
|
|
107
75
|
|
|
108
|
-
// Re-add all query params except __trackId and __index
|
|
109
76
|
uri.queryParameterNames.forEach { paramName ->
|
|
110
77
|
if (paramName != CONTEXTUAL_TRACK_PARAM && paramName != CONTEXTUAL_INDEX_PARAM) {
|
|
111
78
|
uri.getQueryParameters(paramName).forEach { value ->
|
|
@@ -118,16 +85,10 @@ object BrowserPathHelper {
|
|
|
118
85
|
}
|
|
119
86
|
|
|
120
87
|
/**
|
|
121
|
-
*
|
|
122
|
-
* page position — to a parent path. Handles existing query parameters correctly.
|
|
123
|
-
*
|
|
124
|
-
* @param parentPath The parent container path
|
|
125
|
-
* @param trackId The track identity (`id` when non-blank, else `src` — see Track.identity)
|
|
126
|
-
* @param index The child's position on the page at stamp time (tie-breaker)
|
|
127
|
-
* @return A contextual URL combining parent path, track ID, and index
|
|
88
|
+
* Appends the contextual parameters to [parentPath], which may already carry a query.
|
|
128
89
|
*
|
|
129
|
-
*
|
|
130
|
-
*
|
|
90
|
+
* @param trackId the track identity (`id` when non-blank, else `src`; docs/adr/0008)
|
|
91
|
+
* @param index the child's position on the page when tapped
|
|
131
92
|
*/
|
|
132
93
|
fun build(parentPath: String, trackId: String, index: Int? = null): String {
|
|
133
94
|
val separator = if (parentPath.contains('?')) '&' else '?'
|
|
@@ -135,15 +96,7 @@ object BrowserPathHelper {
|
|
|
135
96
|
return "$parentPath$separator$CONTEXTUAL_TRACK_PARAM=${Uri.encode(trackId)}$indexParam"
|
|
136
97
|
}
|
|
137
98
|
|
|
138
|
-
/**
|
|
139
|
-
* Extracts the track ID from a contextual URL. Returns null if the URL is not contextual or
|
|
140
|
-
* doesn't contain the track ID parameter.
|
|
141
|
-
*
|
|
142
|
-
* @param path The contextual URL to parse
|
|
143
|
-
* @return The extracted track ID, or null if not found
|
|
144
|
-
*
|
|
145
|
-
* Example: "/library/radio?__trackId=song.mp3" → "song.mp3"
|
|
146
|
-
*/
|
|
99
|
+
/** The decoded `__trackId`, or null when [path] is not contextual. */
|
|
147
100
|
fun extractTrackId(path: String): String? {
|
|
148
101
|
if (!isContextual(path)) {
|
|
149
102
|
return null
|
|
@@ -153,12 +106,7 @@ object BrowserPathHelper {
|
|
|
153
106
|
return uri.getQueryParameter(CONTEXTUAL_TRACK_PARAM)
|
|
154
107
|
}
|
|
155
108
|
|
|
156
|
-
/**
|
|
157
|
-
* Extracts the stamped page index from a contextual URL, or null when the URL is not contextual
|
|
158
|
-
* or carries no (valid, non-negative) index.
|
|
159
|
-
*
|
|
160
|
-
* Example: "/library/radio?__trackId=song.mp3&__index=2" → 2
|
|
161
|
-
*/
|
|
109
|
+
/** The `__index`, or null when [path] is not contextual or its index is missing or negative. */
|
|
162
110
|
fun extractIndex(path: String): Int? {
|
|
163
111
|
if (!isContextual(path)) {
|
|
164
112
|
return null
|
|
@@ -169,30 +117,18 @@ object BrowserPathHelper {
|
|
|
169
117
|
}
|
|
170
118
|
|
|
171
119
|
/**
|
|
172
|
-
*
|
|
173
|
-
*
|
|
174
|
-
* @param baseUrl The base URL (can be null)
|
|
175
|
-
* @param path The path to append
|
|
176
|
-
* @return The combined URL with proper slash handling
|
|
177
|
-
*
|
|
178
|
-
* Examples:
|
|
179
|
-
* - buildUrl("http://example.com", "api/test") → "http://example.com/api/test"
|
|
180
|
-
* - buildUrl("http://example.com/", "/api/test") → "http://example.com/api/test"
|
|
181
|
-
* - buildUrl(null, "/api/test") → "/api/test"
|
|
182
|
-
* - buildUrl(null, "http://full.url") → "http://full.url"
|
|
120
|
+
* Joins [baseUrl] and [path] with exactly one slash. Returns [path] unchanged when it is already
|
|
121
|
+
* an http(s) URL or [baseUrl] is null.
|
|
183
122
|
*/
|
|
184
123
|
fun buildUrl(baseUrl: String?, path: String): String {
|
|
185
|
-
// If path is already a full URL, return it as-is
|
|
186
124
|
if (path.startsWith("http://") || path.startsWith("https://")) {
|
|
187
125
|
return path
|
|
188
126
|
}
|
|
189
127
|
|
|
190
|
-
// If no baseUrl, return path as-is
|
|
191
128
|
if (baseUrl == null) {
|
|
192
129
|
return path
|
|
193
130
|
}
|
|
194
131
|
|
|
195
|
-
// Ensure baseUrl ends with / and path doesn't start with /
|
|
196
132
|
val normalizedBase = "${baseUrl.trimEnd('/')}/"
|
|
197
133
|
val normalizedPath = path.trimStart('/')
|
|
198
134
|
return "$normalizedBase$normalizedPath"
|
|
@@ -10,17 +10,17 @@ import coil3.request.allowHardware
|
|
|
10
10
|
import coil3.svg.SvgDecoder
|
|
11
11
|
import coil3.toBitmap
|
|
12
12
|
|
|
13
|
-
/**
|
|
14
|
-
* Shared "resolved source → Bitmap" core. Used by both [CoilBitmapLoader] (now-playing) and
|
|
15
|
-
* [ArtworkContentProvider] (browse). Adds `.size()` so raster decodes are downsampled to the hint
|
|
16
|
-
* (the prior loadBitmap path decoded at full resolution). SVG is forced via [isSvg], carried from
|
|
17
|
-
* build time rather than re-derived from a possibly-suffixless transformed URL.
|
|
18
|
-
*/
|
|
19
13
|
class CoilArtworkLoader(
|
|
20
14
|
private val context: Context,
|
|
21
15
|
private val imageLoader: ImageLoader,
|
|
22
16
|
private val defaultSizePixels: Int = 512,
|
|
23
17
|
) {
|
|
18
|
+
/**
|
|
19
|
+
* Fetches and decodes [finalUrl], downsampled to [sizeHintPixels] (or the default). [isSvg]
|
|
20
|
+
* forces the SVG decoder, because a transformed URL may have lost its `.svg` suffix.
|
|
21
|
+
*
|
|
22
|
+
* @throws IllegalStateException when the response yields no image.
|
|
23
|
+
*/
|
|
24
24
|
suspend fun load(
|
|
25
25
|
finalUrl: String,
|
|
26
26
|
headers: Map<String, String>?,
|
|
@@ -31,7 +31,7 @@ class CoilArtworkLoader(
|
|
|
31
31
|
ImageRequest.Builder(context)
|
|
32
32
|
.data(finalUrl)
|
|
33
33
|
.size(sizeHintPixels ?: defaultSizePixels)
|
|
34
|
-
.allowHardware(false) //
|
|
34
|
+
.allowHardware(false) // Media3's notification cannot use hardware bitmaps
|
|
35
35
|
|
|
36
36
|
if (!headers.isNullOrEmpty()) {
|
|
37
37
|
val net = NetworkHeaders.Builder()
|
|
@@ -3,7 +3,7 @@ package com.audiobrowser.util
|
|
|
3
3
|
import com.audiobrowser.browser.BrowseArtworkRegistry
|
|
4
4
|
import kotlinx.coroutines.CoroutineScope
|
|
5
5
|
|
|
6
|
-
/**
|
|
6
|
+
/** What [ArtworkContentProvider] needs to serve artwork; the media Service builds it. */
|
|
7
7
|
data class ArtworkProviderDeps(
|
|
8
8
|
val loader: CoilArtworkLoader,
|
|
9
9
|
val registry: BrowseArtworkRegistry,
|
|
@@ -12,9 +12,9 @@ data class ArtworkProviderDeps(
|
|
|
12
12
|
)
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
15
|
+
* Hands the Service's [ArtworkProviderDeps] to [ArtworkContentProvider], which the OS instantiates
|
|
16
|
+
* itself and may create before the Service exists: [get] is null until then. Read on binder
|
|
17
|
+
* threads, written on the main thread.
|
|
18
18
|
*/
|
|
19
19
|
object CoilArtworkLoaderHolder {
|
|
20
20
|
@Volatile private var deps: ArtworkProviderDeps? = null
|
|
@@ -25,10 +25,7 @@ object CoilArtworkLoaderHolder {
|
|
|
25
25
|
|
|
26
26
|
fun get(): ArtworkProviderDeps? = deps
|
|
27
27
|
|
|
28
|
-
/**
|
|
29
|
-
* Clears only if [deps] is still the current one — prevents a stale Service from blanking a
|
|
30
|
-
* newer.
|
|
31
|
-
*/
|
|
28
|
+
/** Clears only if [deps] is still current, so a destroyed Service never clears a newer one's. */
|
|
32
29
|
@Synchronized
|
|
33
30
|
fun clearIf(deps: ArtworkProviderDeps) {
|
|
34
31
|
if (this.deps === deps) this.deps = null
|
|
@@ -16,22 +16,14 @@ import kotlinx.coroutines.launch
|
|
|
16
16
|
import timber.log.Timber
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
|
-
*
|
|
19
|
+
* Media3 [BitmapLoader] that fetches artwork through Coil, with request headers, SVG and
|
|
20
|
+
* downsampling to the media browser's size hint.
|
|
20
21
|
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
-
* -
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
* - Size-aware image loading using Android Auto's artwork size hints
|
|
27
|
-
*
|
|
28
|
-
* @param context Android context
|
|
29
|
-
* @param imageLoader Coil ImageLoader instance (should be shared app-wide)
|
|
30
|
-
* @param resolveDisplayArtwork Track-first display-time artwork resolution (see
|
|
31
|
-
* Player.resolveDisplayArtwork). Returns the fetchable ImageSource for a URI Media3 hands us, or
|
|
32
|
-
* null when the URI is not ours to transform (it is then fetched as-is).
|
|
33
|
-
* @param getArtworkSizeHint Callback to get the recommended artwork size in pixels from the media
|
|
34
|
-
* browser (e.g., Android Auto)
|
|
22
|
+
* @param resolveDisplayArtwork maps a URI Media3 hands over to the source to fetch (see
|
|
23
|
+
* Player.resolveDisplayArtwork); null means the URI is not the library's to rewrite and is
|
|
24
|
+
* fetched as-is. If it throws, the URI is also fetched as-is.
|
|
25
|
+
* @param getArtworkSizeHint the size in pixels the connected media browser (e.g. Android Auto) asks
|
|
26
|
+
* for, or null for none.
|
|
35
27
|
*/
|
|
36
28
|
@UnstableApi
|
|
37
29
|
class CoilBitmapLoader(
|
|
@@ -43,10 +35,7 @@ class CoilBitmapLoader(
|
|
|
43
35
|
|
|
44
36
|
private val scope = CoroutineScope(Dispatchers.IO)
|
|
45
37
|
|
|
46
|
-
|
|
47
|
-
* Default artwork size in pixels when no hint is provided by the media browser. Lock screen media
|
|
48
|
-
* controls are ~128dp, at 4x density (xxxhdpi) = 512px.
|
|
49
|
-
*/
|
|
38
|
+
// Lock screen controls are ~128dp; at 4x density (xxxhdpi) that is 512px.
|
|
50
39
|
private val defaultArtworkSizePixels = 512
|
|
51
40
|
|
|
52
41
|
private val core = CoilArtworkLoader(context, imageLoader, defaultArtworkSizePixels)
|
|
@@ -78,12 +67,8 @@ class CoilBitmapLoader(
|
|
|
78
67
|
scope.launch {
|
|
79
68
|
try {
|
|
80
69
|
val originalUrl = uri.toString()
|
|
81
|
-
// Use hint from media browser (Android Auto), or fall back to screen-based size
|
|
82
70
|
val sizeHint = getArtworkSizeHint() ?: defaultArtworkSizePixels
|
|
83
71
|
|
|
84
|
-
// Track-first resolution (registry / queue lookup). Null → the URI was not
|
|
85
|
-
// produced by us (or predates the registry): fetch it as-is, never
|
|
86
|
-
// re-transform a URL we cannot attribute.
|
|
87
72
|
val source =
|
|
88
73
|
try {
|
|
89
74
|
resolveDisplayArtwork(originalUrl, sizeHint)
|
|
@@ -94,7 +79,6 @@ class CoilBitmapLoader(
|
|
|
94
79
|
val finalUrl = source?.uri ?: originalUrl
|
|
95
80
|
val headers = source?.headers?.toMap() ?: emptyMap()
|
|
96
81
|
|
|
97
|
-
// Check if this is an SVG that needs special decoding
|
|
98
82
|
val isSvg = SvgArtworkRenderer.isSvgUrl(finalUrl)
|
|
99
83
|
|
|
100
84
|
Timber.d("Loading artwork: $finalUrl (headers: ${headers.keys}, svg: $isSvg)")
|
|
@@ -6,10 +6,8 @@ import com.margelo.nitro.audiobrowser.EqualizerSettings
|
|
|
6
6
|
import timber.log.Timber
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* Provides access to equalizer presets, band levels, and enables/disables the effect. The equalizer
|
|
12
|
-
* is attached to a specific audio session ID.
|
|
9
|
+
* The platform [Equalizer] on one audio session. Where the device refuses to create one, every
|
|
10
|
+
* setter is a no-op and [getSettings] returns null.
|
|
13
11
|
*/
|
|
14
12
|
internal class EqualizerManager(override val audioSessionId: Int) : EqualizerEffect {
|
|
15
13
|
private var equalizer: Equalizer? = null
|
|
@@ -25,19 +23,11 @@ internal class EqualizerManager(override val audioSessionId: Int) : EqualizerEff
|
|
|
25
23
|
}
|
|
26
24
|
}
|
|
27
25
|
|
|
28
|
-
|
|
29
|
-
* Cleans preset name by removing null terminators and whitespace. Android's Equalizer API
|
|
30
|
-
* sometimes returns preset names with trailing null characters.
|
|
31
|
-
*/
|
|
26
|
+
// Some devices return preset names with trailing NUL characters.
|
|
32
27
|
private fun cleanPresetName(name: String): String {
|
|
33
28
|
return name.trim().replace("\u0000", "")
|
|
34
29
|
}
|
|
35
30
|
|
|
36
|
-
/**
|
|
37
|
-
* Gets the current equalizer settings.
|
|
38
|
-
*
|
|
39
|
-
* @return Current settings or null if equalizer is not available
|
|
40
|
-
*/
|
|
41
31
|
override fun getSettings(): EqualizerSettings? {
|
|
42
32
|
val eq = equalizer ?: return null
|
|
43
33
|
|
|
@@ -86,44 +76,32 @@ internal class EqualizerManager(override val audioSessionId: Int) : EqualizerEff
|
|
|
86
76
|
}
|
|
87
77
|
}
|
|
88
78
|
|
|
89
|
-
/**
|
|
90
|
-
* Enables or disables the equalizer.
|
|
91
|
-
*
|
|
92
|
-
* @param enabled true to enable, false to disable
|
|
93
|
-
*/
|
|
94
79
|
override fun setEnabled(enabled: Boolean) {
|
|
95
80
|
val eq = equalizer ?: return
|
|
96
81
|
|
|
97
|
-
// Only notify if state actually changed
|
|
98
82
|
if (eq.enabled != enabled) {
|
|
99
83
|
eq.enabled = enabled
|
|
100
84
|
notifySettingsChanged()
|
|
101
85
|
}
|
|
102
86
|
}
|
|
103
87
|
|
|
104
|
-
/**
|
|
105
|
-
* Applies a preset to the equalizer.
|
|
106
|
-
*
|
|
107
|
-
* @param presetName Name of the preset to apply
|
|
108
|
-
*/
|
|
88
|
+
/** Matches [presetName] case-insensitively; an unknown name is logged and changes nothing. */
|
|
109
89
|
override fun setPreset(presetName: String) {
|
|
110
90
|
val eq = equalizer ?: return
|
|
111
91
|
|
|
112
92
|
try {
|
|
113
|
-
// Find preset by case-insensitive name match
|
|
114
93
|
val presetIndex =
|
|
115
94
|
(0 until eq.numberOfPresets).firstOrNull { index ->
|
|
116
95
|
cleanPresetName(eq.getPresetName(index.toShort())).equals(presetName, ignoreCase = true)
|
|
117
96
|
}
|
|
118
97
|
|
|
119
98
|
if (presetIndex != null) {
|
|
120
|
-
// Applied even when it is already the current preset: usePreset costs nothing
|
|
121
|
-
//
|
|
99
|
+
// Applied even when it is already the current preset: usePreset costs nothing then,
|
|
100
|
+
// and the caller gets an event whatever the effect reports as current.
|
|
122
101
|
eq.usePreset(presetIndex.toShort())
|
|
123
102
|
Timber.d("Applied equalizer preset: $presetName")
|
|
124
103
|
notifySettingsChanged()
|
|
125
104
|
} else {
|
|
126
|
-
// Log available presets to help debug
|
|
127
105
|
val availablePresets =
|
|
128
106
|
(0 until eq.numberOfPresets).joinToString(", ") { index ->
|
|
129
107
|
cleanPresetName(eq.getPresetName(index.toShort()))
|
|
@@ -135,11 +113,7 @@ internal class EqualizerManager(override val audioSessionId: Int) : EqualizerEff
|
|
|
135
113
|
}
|
|
136
114
|
}
|
|
137
115
|
|
|
138
|
-
/**
|
|
139
|
-
* Sets custom band levels for the equalizer.
|
|
140
|
-
*
|
|
141
|
-
* @param levels Array of levels in millibels for each band
|
|
142
|
-
*/
|
|
116
|
+
/** [levels] are millibels, one per band; an array of any other length changes nothing. */
|
|
143
117
|
override fun setLevels(levels: DoubleArray) {
|
|
144
118
|
val eq = equalizer ?: return
|
|
145
119
|
|
|
@@ -161,11 +135,6 @@ internal class EqualizerManager(override val audioSessionId: Int) : EqualizerEff
|
|
|
161
135
|
}
|
|
162
136
|
}
|
|
163
137
|
|
|
164
|
-
/**
|
|
165
|
-
* Sets a callback to be invoked when equalizer settings change.
|
|
166
|
-
*
|
|
167
|
-
* @param callback Function to call with new settings
|
|
168
|
-
*/
|
|
169
138
|
override fun setOnSettingsChanged(callback: (EqualizerSettings) -> Unit) {
|
|
170
139
|
onSettingsChanged = callback
|
|
171
140
|
}
|
|
@@ -174,7 +143,6 @@ internal class EqualizerManager(override val audioSessionId: Int) : EqualizerEff
|
|
|
174
143
|
getSettings()?.let { settings -> onSettingsChanged?.invoke(settings) }
|
|
175
144
|
}
|
|
176
145
|
|
|
177
|
-
/** Releases the equalizer resources. Call this when the equalizer is no longer needed. */
|
|
178
146
|
override fun release() {
|
|
179
147
|
try {
|
|
180
148
|
equalizer?.release()
|
|
@@ -6,13 +6,12 @@ import com.margelo.nitro.audiobrowser.Section
|
|
|
6
6
|
import com.margelo.nitro.audiobrowser.StyleDisplay
|
|
7
7
|
import com.margelo.nitro.audiobrowser.Track
|
|
8
8
|
|
|
9
|
-
/**
|
|
9
|
+
/** Content-style extras for media items on Android Auto and AAOS. */
|
|
10
10
|
object MediaExtrasBuilder {
|
|
11
11
|
|
|
12
12
|
/**
|
|
13
|
-
*
|
|
14
|
-
* android.resource:// URI
|
|
15
|
-
* small vector icons).
|
|
13
|
+
* The CATEGORY_* variants pad the artwork, which suits the small vector icons an
|
|
14
|
+
* android.resource:// URI points at.
|
|
16
15
|
*
|
|
17
16
|
* @see <a href="https://developer.android.com/training/cars/media#default-content-style">Default
|
|
18
17
|
* content style</a>
|
|
@@ -36,16 +35,13 @@ object MediaExtrasBuilder {
|
|
|
36
35
|
}
|
|
37
36
|
|
|
38
37
|
/**
|
|
39
|
-
* Extras for
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
* opens — emitted as the parent-level BROWSABLE/PLAYABLE hint, the only below-root hint
|
|
47
|
-
* AOSP-derived AAOS media UIs honor. Declared or it doesn't exist: the library never derives a
|
|
48
|
-
* promise from pages it hasn't resolved, and never back-fills from ones it has.
|
|
38
|
+
* Extras for [track] on a browse surface. The owning [section] supplies the group-title hint and,
|
|
39
|
+
* from its page-folded style, the item's display hint: these extras are all of a section the flat
|
|
40
|
+
* MediaBrowser protocol carries (ADR 0010). The track's own `display` never sets its item hint,
|
|
41
|
+
* since display is positional (ADR 0011). For a browsable track (no `src`), its declared
|
|
42
|
+
* `display` is the promise for the page it opens, sent as the parent-level BROWSABLE/PLAYABLE
|
|
43
|
+
* hint, the only below-root hint AOSP-derived AAOS media UIs honor. A promise is only ever
|
|
44
|
+
* declared, never derived from resolved pages.
|
|
49
45
|
*/
|
|
50
46
|
fun build(track: Track, section: Section? = null): Bundle =
|
|
51
47
|
build(
|
|
@@ -11,8 +11,8 @@ import com.margelo.nitro.audiobrowser.TrackMetadata
|
|
|
11
11
|
sealed class MetadataAdapter {
|
|
12
12
|
companion object {
|
|
13
13
|
/**
|
|
14
|
-
*
|
|
15
|
-
*
|
|
14
|
+
* Reads the ID3 CHAP frames in [metadata], times in seconds. A chapter without a TIT2/TT2
|
|
15
|
+
* sub-frame is titled "CHAP", the frame ID.
|
|
16
16
|
*/
|
|
17
17
|
fun extractChapters(metadata: Metadata): List<ChapterMetadata> {
|
|
18
18
|
val chapters = mutableListOf<ChapterMetadata>()
|
|
@@ -20,13 +20,11 @@ sealed class MetadataAdapter {
|
|
|
20
20
|
for (i in 0 until metadata.length()) {
|
|
21
21
|
val entry = metadata[i]
|
|
22
22
|
if (entry is ChapterFrame) {
|
|
23
|
-
// TODO:
|
|
24
|
-
//
|
|
25
|
-
// See also: iOS implementation in ChapterMetadata+AVFoundation.swift
|
|
23
|
+
// TODO: chapter artwork (APIC sub-frames) is not extracted; it needs the image bytes
|
|
24
|
+
// turned into a URL. iOS: ChapterMetadata+AVFoundation.swift
|
|
26
25
|
var title: String? = null
|
|
27
26
|
var url: String? = null
|
|
28
27
|
|
|
29
|
-
// Parse sub-frames for chapter metadata
|
|
30
28
|
for (j in 0 until entry.subFrameCount) {
|
|
31
29
|
when (val subFrame = entry.getSubFrame(j)) {
|
|
32
30
|
is TextInformationFrame -> {
|
|
@@ -41,7 +39,6 @@ sealed class MetadataAdapter {
|
|
|
41
39
|
}
|
|
42
40
|
}
|
|
43
41
|
|
|
44
|
-
// Convert milliseconds to seconds
|
|
45
42
|
val startTime = entry.startTimeMs / 1_000.0
|
|
46
43
|
val endTime = entry.endTimeMs / 1_000.0
|
|
47
44
|
|
|
@@ -60,10 +57,9 @@ sealed class MetadataAdapter {
|
|
|
60
57
|
}
|
|
61
58
|
|
|
62
59
|
fun trackMetadataFromMediaMetadata(metadata: MediaMetadata): TrackMetadata {
|
|
63
|
-
//
|
|
60
|
+
// DDMM, the order of ID3v2.3's TDAT frame
|
|
64
61
|
val creationDate =
|
|
65
62
|
(metadata.recordingDay to metadata.recordingMonth).let { (day, month) ->
|
|
66
|
-
// if both are not null, combine them into a single string
|
|
67
63
|
if (day != null && month != null) {
|
|
68
64
|
"${String.format("%02d", day)}${String.format("%02d", month)}"
|
|
69
65
|
} else if (day != null) {
|
|
@@ -12,10 +12,7 @@ import kotlinx.coroutines.flow.launchIn
|
|
|
12
12
|
import kotlinx.coroutines.flow.onEach
|
|
13
13
|
import timber.log.Timber
|
|
14
14
|
|
|
15
|
-
/**
|
|
16
|
-
* Whether the device is online: whether its default network has INTERNET and VALIDATED. Monitoring
|
|
17
|
-
* starts on construction.
|
|
18
|
-
*/
|
|
15
|
+
/** Whether the default network has INTERNET and VALIDATED. Monitoring starts on construction. */
|
|
19
16
|
class NetworkConnectivityMonitor(private val context: Context) {
|
|
20
17
|
private val connectivityManager =
|
|
21
18
|
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
|
@@ -29,10 +26,7 @@ class NetworkConnectivityMonitor(private val context: Context) {
|
|
|
29
26
|
|
|
30
27
|
fun getOnline(): Boolean = _isOnline.value
|
|
31
28
|
|
|
32
|
-
/**
|
|
33
|
-
* Observes network state changes and invokes the callback when state changes. The callback is
|
|
34
|
-
* invoked on the scope's dispatcher.
|
|
35
|
-
*/
|
|
29
|
+
/** Calls [onStateChanged] with the current state and on each change, on [scope]'s dispatcher. */
|
|
36
30
|
fun observeOnline(scope: CoroutineScope, onStateChanged: (Boolean) -> Unit) {
|
|
37
31
|
isOnline.onEach { isOnline -> onStateChanged(isOnline) }.launchIn(scope)
|
|
38
32
|
}
|
|
@@ -40,6 +34,8 @@ class NetworkConnectivityMonitor(private val context: Context) {
|
|
|
40
34
|
private fun capabilitiesOf(network: Network): NetworkCapabilities? =
|
|
41
35
|
connectivityManager.getNetworkCapabilities(network)
|
|
42
36
|
|
|
37
|
+
// INTERNET alone is also true behind a captive portal; VALIDATED means the system reached the
|
|
38
|
+
// internet through it.
|
|
43
39
|
private fun isOnline(capabilities: NetworkCapabilities?): Boolean =
|
|
44
40
|
capabilities != null &&
|
|
45
41
|
capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
|
|
@@ -79,7 +75,7 @@ class NetworkConnectivityMonitor(private val context: Context) {
|
|
|
79
75
|
}
|
|
80
76
|
}
|
|
81
77
|
|
|
82
|
-
/** Stops monitoring
|
|
78
|
+
/** Stops monitoring. A failed unregister leaves it running, so a later call retries. */
|
|
83
79
|
fun destroy() {
|
|
84
80
|
if (destroyed) {
|
|
85
81
|
return
|