react-native-audio-browser 1.0.0-next.4 → 1.0.0-next.6
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 +75 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +41 -6
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
- package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
- package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
- package/android/src/main/res/values/strings.xml +5 -2
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
- package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
- package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
- package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
- package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
- package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
- package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
- package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
- package/ios/AVPlayerEngine.swift +2 -2
- package/ios/Browser/BrowserPathHelper.swift +11 -9
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
- package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
- package/ios/CarPlay/SectionPresentation.swift +7 -0
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Model/NitroTypeStubs.swift +15 -0
- package/ios/Model/PlayerUpdateOptions.swift +2 -1
- package/ios/PlaybackEvent.swift +20 -0
- package/ios/Player/Player.swift +17 -3
- package/ios/Player/QueueManager.swift +23 -41
- package/ios/Tests/AwaitCallbackTests.swift +8 -0
- package/ios/Tests/BrowserPathHelperTests.swift +18 -0
- package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
- package/ios/Tests/DataURLDecodingTests.swift +25 -0
- package/ios/Tests/GenerationMemoTests.swift +136 -0
- package/ios/Tests/JSCallbackErrorTests.swift +33 -0
- package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
- package/ios/Tests/PlayerPolicyTests.swift +51 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/PlayerTests.swift +54 -0
- package/ios/Tests/QueueManagerTests.swift +111 -78
- package/ios/Tests/RequestLayerTests.swift +11 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/SectionPresentationTests.swift +13 -0
- package/ios/Tests/Support/TestTypes.swift +23 -1
- package/ios/Util/ArtworkImageFetcher.swift +40 -16
- package/ios/Util/AwaitCallback.swift +16 -10
- package/ios/Util/GenerationMemo.swift +81 -17
- package/ios/Util/JSCallbackError.swift +23 -0
- package/ios/Util/OutputPicker.swift +25 -5
- package/ios/Util/RoutePickerSourceFrame.swift +17 -0
- package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
- package/lib/commonjs/features/browser-config.js +3 -2
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +7 -8
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/output.js +7 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +37 -65
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +1 -4
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/commonjs/web/util/GenerationMemo.js +92 -0
- package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
- package/lib/module/features/browser-config.js +3 -2
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +7 -8
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/output.js +7 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +43 -2
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +37 -66
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +1 -5
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js +53 -55
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +3 -22
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +5 -7
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/web/util/GenerationMemo.js +87 -0
- package/lib/module/web/util/GenerationMemo.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +7 -8
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +19 -1
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -1
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +55 -8
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
- package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
- package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
- package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
- package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
- package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
- package/package.json +1 -1
- package/src/codegen-js-error-message.test.ts +78 -0
- package/src/features/browser-config.test.ts +7 -0
- package/src/features/browser-config.ts +3 -2
- package/src/features/browser.ts +7 -8
- package/src/features/output.ts +13 -5
- package/src/features/player/options.ts +19 -1
- package/src/specs/audio-browser.nitro.ts +16 -3
- package/src/types/browser-native.ts +4 -1
- package/src/types/browser.ts +60 -8
- package/src/web/NativeAudioBrowser.ts +43 -3
- package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
- package/src/web/browser/BrowserManager.ts +50 -79
- package/src/web/browser/SearchManager.ts +1 -8
- package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
- package/src/web/http/RequestConfigBuilder.test.ts +151 -1
- package/src/web/http/RequestConfigBuilder.ts +72 -57
- package/src/web/player/NowPlayingManager.test.ts +29 -0
- package/src/web/player/NowPlayingManager.ts +4 -27
- package/src/web/util/BrowserPathHelper.test.ts +23 -0
- package/src/web/util/BrowserPathHelper.ts +6 -7
- package/src/web/util/GenerationMemo.test.ts +148 -0
- package/src/web/util/GenerationMemo.ts +103 -0
- package/website/guide/audio-output.md +34 -7
- package/website/guide/browser.md +21 -0
- package/website/guide/carplay.md +1 -1
- package/website/guide/configuration.md +10 -9
- package/website/guide/gate.md +1 -1
- package/website/guide/remote-controls.md +35 -0
|
@@ -19,8 +19,10 @@ import androidx.media3.datasource.cache.SimpleCache
|
|
|
19
19
|
import androidx.media3.exoplayer.ExoPlayer
|
|
20
20
|
import androidx.media3.session.MediaLibraryService
|
|
21
21
|
import androidx.media3.session.MediaSession
|
|
22
|
+
import androidx.media3.session.SessionError
|
|
22
23
|
import com.audiobrowser.AudioBrowser
|
|
23
24
|
import com.audiobrowser.Callbacks
|
|
25
|
+
import com.audiobrowser.browser.FavoriteChange
|
|
24
26
|
import com.audiobrowser.browser.displayArtworkSource
|
|
25
27
|
import com.audiobrowser.browser.resolveArtworkUrl
|
|
26
28
|
import com.audiobrowser.browser.resolveMediaUrl
|
|
@@ -31,6 +33,7 @@ import com.audiobrowser.extension.identity
|
|
|
31
33
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
32
34
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
33
35
|
import com.audiobrowser.model.RetryPolicy
|
|
36
|
+
import com.audiobrowser.navigationErrorFor
|
|
34
37
|
import com.audiobrowser.remote.RemoteOutputsController
|
|
35
38
|
import com.audiobrowser.remote.RemotePlayback
|
|
36
39
|
import com.audiobrowser.remote.RemoteUrls
|
|
@@ -38,6 +41,7 @@ import com.audiobrowser.sonos.SonosRemote
|
|
|
38
41
|
import com.audiobrowser.util.ArtworkRoutes
|
|
39
42
|
import com.audiobrowser.util.ArtworkUris
|
|
40
43
|
import com.audiobrowser.util.Automotive
|
|
44
|
+
import com.audiobrowser.util.BrowserPathHelper
|
|
41
45
|
import com.audiobrowser.util.CoilBitmapLoader
|
|
42
46
|
import com.audiobrowser.util.NetworkConnectivityMonitor
|
|
43
47
|
import com.audiobrowser.util.PlayingStateFactory
|
|
@@ -47,6 +51,7 @@ import com.audiobrowser.util.TrackFactory
|
|
|
47
51
|
import com.audiobrowser.util.TrackFactory.setFavorite
|
|
48
52
|
import com.audiobrowser.util.awaitOrTimeout
|
|
49
53
|
import com.audiobrowser.util.isAutomotive
|
|
54
|
+
import com.audiobrowser.util.withTimeoutAsFailure
|
|
50
55
|
import com.margelo.nitro.audiobrowser.AppKilledPlaybackBehavior
|
|
51
56
|
import com.margelo.nitro.audiobrowser.FavoriteChangedEvent
|
|
52
57
|
import com.margelo.nitro.audiobrowser.GateEvent
|
|
@@ -54,6 +59,8 @@ import com.margelo.nitro.audiobrowser.GateReason
|
|
|
54
59
|
import com.margelo.nitro.audiobrowser.ImageContext
|
|
55
60
|
import com.margelo.nitro.audiobrowser.ImageSource
|
|
56
61
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
62
|
+
import com.margelo.nitro.audiobrowser.NavigationError
|
|
63
|
+
import com.margelo.nitro.audiobrowser.NavigationErrorType
|
|
57
64
|
import com.margelo.nitro.audiobrowser.NowPlayingMetadata
|
|
58
65
|
import com.margelo.nitro.audiobrowser.Playback
|
|
59
66
|
import com.margelo.nitro.audiobrowser.PlaybackError
|
|
@@ -68,16 +75,17 @@ import com.margelo.nitro.audiobrowser.Track
|
|
|
68
75
|
import java.io.File
|
|
69
76
|
import java.io.IOException
|
|
70
77
|
import java.util.concurrent.TimeUnit
|
|
78
|
+
import java.util.concurrent.TimeoutException
|
|
79
|
+
import kotlin.time.Duration
|
|
71
80
|
import kotlin.time.Duration.Companion.seconds
|
|
81
|
+
import kotlinx.coroutines.CancellationException
|
|
72
82
|
import kotlinx.coroutines.CompletableDeferred
|
|
73
83
|
import kotlinx.coroutines.CoroutineScope
|
|
74
84
|
import kotlinx.coroutines.Dispatchers
|
|
75
85
|
import kotlinx.coroutines.MainScope
|
|
76
|
-
import kotlinx.coroutines.TimeoutCancellationException
|
|
77
86
|
import kotlinx.coroutines.currentCoroutineContext
|
|
78
87
|
import kotlinx.coroutines.ensureActive
|
|
79
88
|
import kotlinx.coroutines.withContext
|
|
80
|
-
import kotlinx.coroutines.withTimeout
|
|
81
89
|
import timber.log.Timber
|
|
82
90
|
|
|
83
91
|
/**
|
|
@@ -105,9 +113,15 @@ internal constructor(
|
|
|
105
113
|
internal val context: Context,
|
|
106
114
|
castRemote: (Context, String?) -> RemotePlayback?,
|
|
107
115
|
sonosRemote: (Context, CoroutineScope) -> RemotePlayback,
|
|
116
|
+
private val browserRegistrationTimeout: Duration = 10.seconds,
|
|
108
117
|
) {
|
|
109
118
|
constructor(context: Context) : this(context, ::createCastRemote, ::SonosRemote)
|
|
110
119
|
|
|
120
|
+
internal constructor(
|
|
121
|
+
context: Context,
|
|
122
|
+
browserRegistrationTimeout: Duration,
|
|
123
|
+
) : this(context, ::createCastRemote, ::SonosRemote, browserRegistrationTimeout)
|
|
124
|
+
|
|
111
125
|
val appKilledPlaybackBehavior: AppKilledPlaybackBehavior
|
|
112
126
|
get() = options.appKilledPlaybackBehavior
|
|
113
127
|
|
|
@@ -223,7 +237,7 @@ internal constructor(
|
|
|
223
237
|
PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
|
|
224
238
|
)
|
|
225
239
|
)
|
|
226
|
-
|
|
240
|
+
stopEngine()
|
|
227
241
|
}
|
|
228
242
|
}
|
|
229
243
|
|
|
@@ -315,13 +329,15 @@ internal constructor(
|
|
|
315
329
|
/**
|
|
316
330
|
* The browser [notifyBrowserConfigurationReady] registered, waiting for it if none is.
|
|
317
331
|
*
|
|
318
|
-
* @throws
|
|
332
|
+
* @throws TimeoutException if it is not registered within [browserRegistrationTimeout]
|
|
319
333
|
*/
|
|
320
334
|
suspend fun awaitBrowser(): AudioBrowser =
|
|
321
335
|
try {
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
336
|
+
withTimeoutAsFailure(browserRegistrationTimeout, "Browser registration") {
|
|
337
|
+
browserRegistered.await()
|
|
338
|
+
}
|
|
339
|
+
} catch (e: TimeoutException) {
|
|
340
|
+
Timber.e(e)
|
|
325
341
|
throw e
|
|
326
342
|
}
|
|
327
343
|
|
|
@@ -505,17 +521,29 @@ internal constructor(
|
|
|
505
521
|
var queueVersion = 0
|
|
506
522
|
private set
|
|
507
523
|
|
|
508
|
-
|
|
524
|
+
/**
|
|
525
|
+
* Moves whenever the app replaces what plays: a new queue, a load, a skip or a clear. Not on an
|
|
526
|
+
* edit that leaves the playing item playing, such as adding up next or restamping a track.
|
|
527
|
+
*/
|
|
528
|
+
@Volatile
|
|
529
|
+
internal var playGeneration = 0
|
|
530
|
+
private set
|
|
531
|
+
|
|
532
|
+
private var reportedTracks = emptyList<Track>()
|
|
509
533
|
|
|
510
534
|
/**
|
|
511
|
-
*
|
|
535
|
+
* The queue's tracks when they differ from those at the last call, moving [queueVersion]; null
|
|
536
|
+
* when they don't. Call it on every timeline change: the reason does not tell, since the engine
|
|
537
|
+
* reports an in-place replace of items as a playlist change but `RemoteSwitchingPlayer` as a
|
|
538
|
+
* source update, and an engine rebuild, a now-playing restamp or the playback thread's own source
|
|
539
|
+
* update leave every track as it was.
|
|
512
540
|
*/
|
|
513
|
-
internal fun
|
|
514
|
-
val
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
versionedMediaIds = mediaIds
|
|
541
|
+
internal fun changedQueueTracks(): Array<Track>? {
|
|
542
|
+
val current = tracks
|
|
543
|
+
if (current.asList() == reportedTracks) return null
|
|
544
|
+
reportedTracks = current.toList()
|
|
518
545
|
queueVersion = ++lastQueueVersion
|
|
546
|
+
return current
|
|
519
547
|
}
|
|
520
548
|
|
|
521
549
|
/** The path the queue was expanded from, so selecting from the same source skips re-expanding. */
|
|
@@ -633,6 +661,7 @@ internal constructor(
|
|
|
633
661
|
loadControl = engine.loadControl
|
|
634
662
|
mediaFactory = engine.mediaFactory
|
|
635
663
|
exoPlayer = engine.exoPlayer
|
|
664
|
+
exoPlayer.addListener(engineTrackChanges)
|
|
636
665
|
// A reconnect the old loop held between connections: the engine is carried idle and unprepared.
|
|
637
666
|
val heldIdle = retryLoop?.reconnecting == true && localEngine.isActive
|
|
638
667
|
retryLoop?.suspend()
|
|
@@ -719,6 +748,7 @@ internal constructor(
|
|
|
719
748
|
|
|
720
749
|
/** Replaces the current track, keeping the rest of the queue; on an empty queue, adds it. */
|
|
721
750
|
fun load(track: Track) {
|
|
751
|
+
playGeneration++
|
|
722
752
|
if (sessionPlayer.mediaItemCount == 0) {
|
|
723
753
|
add(track)
|
|
724
754
|
} else {
|
|
@@ -740,6 +770,7 @@ internal constructor(
|
|
|
740
770
|
fun add(tracks: Array<Track>, atIndex: Int = -1) {
|
|
741
771
|
validateInsertIndex(atIndex)
|
|
742
772
|
val count = sessionPlayer.mediaItemCount
|
|
773
|
+
if (count == 0) playGeneration++
|
|
743
774
|
sessionPlayer.addMediaItems(
|
|
744
775
|
if (atIndex == -1) count else atIndex,
|
|
745
776
|
TrackFactory.toMedia3(tracks),
|
|
@@ -768,6 +799,7 @@ internal constructor(
|
|
|
768
799
|
* rebuild carries an ended engine idle, and it stays ended as an ended engine does.
|
|
769
800
|
*/
|
|
770
801
|
private inline fun loadAfter(move: () -> Unit) {
|
|
802
|
+
playGeneration++
|
|
771
803
|
val index = sessionPlayer.currentMediaItemIndex
|
|
772
804
|
move()
|
|
773
805
|
if (playbackState == PlaybackState.ENDED && sessionPlayer.currentMediaItemIndex == index) return
|
|
@@ -787,6 +819,7 @@ internal constructor(
|
|
|
787
819
|
/** @throws IllegalArgumentException if [index] is out of bounds. */
|
|
788
820
|
fun skipTo(index: Int) {
|
|
789
821
|
validateIndex(index)
|
|
822
|
+
playGeneration++
|
|
790
823
|
sessionPlayer.seekTo(index, C.TIME_UNSET)
|
|
791
824
|
sessionPlayer.prepare()
|
|
792
825
|
}
|
|
@@ -797,6 +830,7 @@ internal constructor(
|
|
|
797
830
|
startPositionMs: Long = 0,
|
|
798
831
|
sourcePath: String? = null,
|
|
799
832
|
) {
|
|
833
|
+
playGeneration++
|
|
800
834
|
val mediaItems = TrackFactory.toMedia3(tracks).toMutableList()
|
|
801
835
|
sessionPlayer.setMediaItems(mediaItems, startIndex, startPositionMs)
|
|
802
836
|
leadShuffleOrder(startIndex, mediaItems.size)
|
|
@@ -820,28 +854,21 @@ internal constructor(
|
|
|
820
854
|
}
|
|
821
855
|
|
|
822
856
|
/**
|
|
823
|
-
*
|
|
824
|
-
*
|
|
857
|
+
* Sets the active track's favorite state in the browser's favorite set, then restamps every copy
|
|
858
|
+
* of the track, on the page on screen and in the queue.
|
|
859
|
+
*
|
|
860
|
+
* @return false when there is no current track or it has no identity, so MediaSession callers can
|
|
861
|
+
* report an invalid state instead of a success the controller then watches revert.
|
|
825
862
|
*/
|
|
826
863
|
fun setActiveTrackFavorited(favorited: Boolean): Boolean {
|
|
827
864
|
val currentTrack = this.currentTrack ?: return false
|
|
865
|
+
val identity = currentTrack.identity ?: return false
|
|
828
866
|
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
}
|
|
832
|
-
|
|
833
|
-
val index = sessionPlayer.currentMediaItemIndex
|
|
834
|
-
// Still applied: the favorite is persisted above, and there is no heart to revert.
|
|
835
|
-
if (index == C.INDEX_UNSET) return true
|
|
836
|
-
|
|
837
|
-
val updatedTrack = currentTrack.copy(favorited = favorited)
|
|
838
|
-
restampMediaItem(index, updatedTrack) { setFavorite(favorited) }
|
|
867
|
+
browser?.browserManager?.updateFavorite(identity, favorited)
|
|
868
|
+
applyFavoriteChange(FavoriteChange.toggle(identity, favorited))
|
|
839
869
|
|
|
840
|
-
|
|
841
|
-
|
|
842
|
-
// The only emit: a favorite toggle mutates the active track in place, so the track and queue
|
|
843
|
-
// change events stay transition-only.
|
|
844
|
-
callbacks?.onFavoriteChanged(FavoriteChangedEvent(updatedTrack, favorited))
|
|
870
|
+
// The active track is mutated in place, so the active-track event stays transition-only.
|
|
871
|
+
callbacks?.onFavoriteChanged(FavoriteChangedEvent(this.currentTrack!!, favorited))
|
|
845
872
|
return true
|
|
846
873
|
}
|
|
847
874
|
|
|
@@ -927,18 +954,31 @@ internal constructor(
|
|
|
927
954
|
)
|
|
928
955
|
|
|
929
956
|
/**
|
|
930
|
-
*
|
|
931
|
-
*
|
|
957
|
+
* Restamps every queued copy of a track whose favorite state [change] moved. The heart button
|
|
958
|
+
* then follows the current track.
|
|
959
|
+
*/
|
|
960
|
+
internal fun applyFavoriteChange(change: FavoriteChange) {
|
|
961
|
+
restampQueue { change.restamp(it) }
|
|
962
|
+
updateFavoriteButtonState(currentTrack?.favorited)
|
|
963
|
+
}
|
|
964
|
+
|
|
965
|
+
/**
|
|
966
|
+
* Replaces each queued item whose track [transform] returns with that track and its heart rating,
|
|
967
|
+
* in one replacement: one queue event when a track changed, no transition, and the current track
|
|
968
|
+
* keeps playing.
|
|
932
969
|
*/
|
|
933
|
-
private fun
|
|
934
|
-
if (!::sessionPlayer.isInitialized
|
|
970
|
+
private fun restampQueue(transform: (Track) -> Track?) {
|
|
971
|
+
if (!::sessionPlayer.isInitialized) return
|
|
972
|
+
var replaced = false
|
|
935
973
|
val items =
|
|
936
974
|
(0 until sessionPlayer.mediaItemCount).map { index ->
|
|
937
975
|
val item = sessionPlayer.getMediaItemAt(index)
|
|
938
976
|
val track = item.localConfiguration?.tag as? Track ?: return@map item
|
|
939
|
-
|
|
977
|
+
val restamped = transform(track) ?: return@map item
|
|
978
|
+
replaced = true
|
|
979
|
+
item.restamped(restamped) { setFavorite(restamped.favorited) }
|
|
940
980
|
}
|
|
941
|
-
sessionPlayer.replaceMediaItems(0, items.size, items)
|
|
981
|
+
if (replaced) sessionPlayer.replaceMediaItems(0, items.size, items)
|
|
942
982
|
}
|
|
943
983
|
|
|
944
984
|
private fun restampMediaItem(
|
|
@@ -1067,7 +1107,8 @@ internal constructor(
|
|
|
1067
1107
|
browserManager.displayArtworkSource(uri, imageContext)?.let {
|
|
1068
1108
|
return it
|
|
1069
1109
|
}
|
|
1070
|
-
//
|
|
1110
|
+
// The queue may publish provider URIs (see sessionArtworkUri); the resolutions are keyed by
|
|
1111
|
+
// URL.
|
|
1071
1112
|
TrackFactory.artworkRoutes
|
|
1072
1113
|
?.publicUrl(uri.toUri())
|
|
1073
1114
|
?.takeIf { it != uri }
|
|
@@ -1122,11 +1163,15 @@ internal constructor(
|
|
|
1122
1163
|
*/
|
|
1123
1164
|
suspend fun playFromSearch(params: SearchParams): Boolean {
|
|
1124
1165
|
return try {
|
|
1125
|
-
val tracks = voiceSearch(params)
|
|
1166
|
+
val tracks = voiceSearch(params)
|
|
1126
1167
|
Timber.d("Found ${tracks.size} track(s), playing first: ${tracks[0].title}")
|
|
1127
1168
|
setQueue(tracks)
|
|
1128
1169
|
play()
|
|
1129
1170
|
true
|
|
1171
|
+
} catch (e: RequestGatedException) {
|
|
1172
|
+
false
|
|
1173
|
+
} catch (e: VoiceSearchFailedException) {
|
|
1174
|
+
false
|
|
1130
1175
|
} catch (e: Exception) {
|
|
1131
1176
|
currentCoroutineContext().ensureActive()
|
|
1132
1177
|
Timber.e(e, "Error handling voice search: ${params}")
|
|
@@ -1136,12 +1181,16 @@ internal constructor(
|
|
|
1136
1181
|
|
|
1137
1182
|
/**
|
|
1138
1183
|
* The playable results of a voice search, from the first. Gated like browsing, or voice search
|
|
1139
|
-
* would be a way around the gate.
|
|
1184
|
+
* would be a way around the gate. A search that finds nothing playable, or fails, tells
|
|
1185
|
+
* controllers why in the app's words for a search (ADR 0001), offline as offline, as a non-fatal
|
|
1186
|
+
* error: what played keeps playing.
|
|
1140
1187
|
*
|
|
1141
|
-
* @
|
|
1142
|
-
* @throws
|
|
1188
|
+
* @throws RequestGatedException when gated, after onGate
|
|
1189
|
+
* @throws VoiceSearchFailedException when nothing playable is found or the search fails, after
|
|
1190
|
+
* the SessionError
|
|
1191
|
+
* @throws Exception when the browser is not registered in time
|
|
1143
1192
|
*/
|
|
1144
|
-
suspend fun voiceSearch(params: SearchParams): Array<Track
|
|
1193
|
+
suspend fun voiceSearch(params: SearchParams): Array<Track> {
|
|
1145
1194
|
val audioBrowser = awaitBrowser()
|
|
1146
1195
|
val gateOutcome =
|
|
1147
1196
|
audioBrowser.gateDecision(
|
|
@@ -1150,14 +1199,45 @@ internal constructor(
|
|
|
1150
1199
|
if (gateOutcome.gated) {
|
|
1151
1200
|
Timber.i("Voice search refused: request is gated")
|
|
1152
1201
|
audioBrowser.onGate(GateEvent(GateReason.SEARCH))
|
|
1153
|
-
|
|
1202
|
+
throw RequestGatedException()
|
|
1154
1203
|
}
|
|
1155
1204
|
Timber.d(
|
|
1156
1205
|
"Executing voice search: mode=${params.mode}, query='${params.query}', artist='${params.artist}', album='${params.album}'"
|
|
1157
1206
|
)
|
|
1158
|
-
|
|
1159
|
-
|
|
1207
|
+
val tracks =
|
|
1208
|
+
try {
|
|
1209
|
+
audioBrowser.browserManager.searchPlayable(params)
|
|
1210
|
+
} catch (e: Exception) {
|
|
1211
|
+
if (e is CancellationException) throw e
|
|
1212
|
+
Timber.e(e, "Voice search failed: $params")
|
|
1213
|
+
sendSearchError(audioBrowser, params, offlineErrorOr { navigationErrorFor(e) })
|
|
1214
|
+
throw VoiceSearchFailedException("Voice search failed: $params", e)
|
|
1215
|
+
}
|
|
1216
|
+
if (tracks == null) {
|
|
1217
|
+
Timber.w("No tracks found for search: ${params}")
|
|
1218
|
+
// Offline, no result most likely means the search could not reach its source.
|
|
1219
|
+
sendSearchError(audioBrowser, params, offlineErrorOr { emptyContentError() })
|
|
1220
|
+
throw VoiceSearchFailedException("No playable result for: $params")
|
|
1160
1221
|
}
|
|
1222
|
+
return tracks
|
|
1223
|
+
}
|
|
1224
|
+
|
|
1225
|
+
private inline fun offlineErrorOr(error: () -> NavigationError): NavigationError =
|
|
1226
|
+
if (networkMonitor.isOnline.value) error() else offlineError()
|
|
1227
|
+
|
|
1228
|
+
@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
|
|
1229
|
+
private suspend fun sendSearchError(
|
|
1230
|
+
audioBrowser: AudioBrowser,
|
|
1231
|
+
params: SearchParams,
|
|
1232
|
+
error: NavigationError,
|
|
1233
|
+
) {
|
|
1234
|
+
val formatted =
|
|
1235
|
+
audioBrowser.resolveFormattedError(error, BrowserPathHelper.createSearchPath(params.query))
|
|
1236
|
+
val message = listOfNotNull(formatted.title, formatted.message).joinToString("\n")
|
|
1237
|
+
val code =
|
|
1238
|
+
if (error.code == NavigationErrorType.NETWORK_ERROR) SessionError.ERROR_IO
|
|
1239
|
+
else SessionError.ERROR_UNKNOWN
|
|
1240
|
+
mainHandler.post { mediaSession.sendError(SessionError(code, message)) }
|
|
1161
1241
|
}
|
|
1162
1242
|
|
|
1163
1243
|
/** An ended queue stays ended, as on an ended engine. */
|
|
@@ -1189,13 +1269,14 @@ internal constructor(
|
|
|
1189
1269
|
playWhenReady = false
|
|
1190
1270
|
// The next play is a new Load.
|
|
1191
1271
|
retryLoop?.suspend()
|
|
1192
|
-
sessionPlayer
|
|
1272
|
+
stopEngine(sessionPlayer)
|
|
1193
1273
|
playerListener.fenceOutgoingMetadata()
|
|
1194
1274
|
// Idle at its end, the next prepare would end it again at once.
|
|
1195
1275
|
if (ended) sessionPlayer.seekToDefaultPosition()
|
|
1196
1276
|
}
|
|
1197
1277
|
|
|
1198
1278
|
fun clear() {
|
|
1279
|
+
playGeneration++
|
|
1199
1280
|
sessionPlayer.clearMediaItems()
|
|
1200
1281
|
queueSourcePath = null
|
|
1201
1282
|
}
|
|
@@ -1263,6 +1344,16 @@ internal constructor(
|
|
|
1263
1344
|
retryingErrorGeneration++
|
|
1264
1345
|
}
|
|
1265
1346
|
|
|
1347
|
+
/**
|
|
1348
|
+
* The engine's own transition, heard as the track is set and before it connects. The session's
|
|
1349
|
+
* can come after the connection started: a hand-back from a remote output prepares the engine
|
|
1350
|
+
* before the switch reports it.
|
|
1351
|
+
*/
|
|
1352
|
+
private val engineTrackChanges =
|
|
1353
|
+
object : MediaPlayer.Listener {
|
|
1354
|
+
override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) = dropFailureReports()
|
|
1355
|
+
}
|
|
1356
|
+
|
|
1266
1357
|
private fun showRetryingError(error: PlaybackError) {
|
|
1267
1358
|
// Paused, the retry would run unseen and its failure be terminal. STOPPED, ERROR and ENDED
|
|
1268
1359
|
// reach here only from a post that raced them.
|
|
@@ -1337,17 +1428,28 @@ internal constructor(
|
|
|
1337
1428
|
// Before the stop: the state machine holds PAUSED through the IDLE that follows.
|
|
1338
1429
|
setPlaybackState(PlaybackState.PAUSED)
|
|
1339
1430
|
clearRetryingError()
|
|
1340
|
-
|
|
1431
|
+
stopEngine()
|
|
1341
1432
|
// An engine the loop already holds idle leaves no IDLE for the listener to see.
|
|
1342
1433
|
retryLoop?.engineStopped()
|
|
1343
1434
|
}
|
|
1344
1435
|
|
|
1436
|
+
/** Stops [engine]; an error the local engine delivers before its next prepare is dropped. */
|
|
1437
|
+
private fun stopEngine(engine: MediaPlayer = exoPlayer) {
|
|
1438
|
+
playerListener.engineStopping()
|
|
1439
|
+
engine.stop()
|
|
1440
|
+
}
|
|
1441
|
+
|
|
1442
|
+
/** Drops the retrying error and the failure reports still on their way. */
|
|
1443
|
+
internal fun clearRetryingError() {
|
|
1444
|
+
dropFailureReports()
|
|
1445
|
+
hideRetryingError()
|
|
1446
|
+
}
|
|
1447
|
+
|
|
1345
1448
|
/**
|
|
1346
1449
|
* Drops the retrying error of a track that is gone. The new track may stay LOADING or BUFFERING
|
|
1347
1450
|
* with no state change to emit the clear.
|
|
1348
1451
|
*/
|
|
1349
|
-
internal fun
|
|
1350
|
-
dropFailureReports()
|
|
1452
|
+
internal fun hideRetryingError() {
|
|
1351
1453
|
if (playbackError?.retrying != true) return
|
|
1352
1454
|
playbackError = null
|
|
1353
1455
|
callbacks?.onPlaybackChanged(Playback(playbackState, null))
|
|
@@ -1461,7 +1563,7 @@ internal constructor(
|
|
|
1461
1563
|
browser?.browserManager?.setFavoriteEnabled(options.capabilities.favoriteEnabled)
|
|
1462
1564
|
TrackFactory.favoriteEnabled = options.capabilities.favoriteEnabled
|
|
1463
1565
|
if (previousOptions.capabilities.favoriteEnabled != options.capabilities.favoriteEnabled) {
|
|
1464
|
-
|
|
1566
|
+
restampQueue { it }
|
|
1465
1567
|
}
|
|
1466
1568
|
}
|
|
1467
1569
|
|
|
@@ -1540,6 +1642,14 @@ internal constructor(
|
|
|
1540
1642
|
mediaSessionCallback.invalidateAllContent()
|
|
1541
1643
|
}
|
|
1542
1644
|
|
|
1645
|
+
/**
|
|
1646
|
+
* Tells controllers subscribed to the root, whose children are the tabs, to re-query it. Safe
|
|
1647
|
+
* from any thread.
|
|
1648
|
+
*/
|
|
1649
|
+
fun notifyTabsChanged() {
|
|
1650
|
+
mediaSessionCallback.notifyContentChanged(BrowserPathHelper.ROOT_PATH)
|
|
1651
|
+
}
|
|
1652
|
+
|
|
1543
1653
|
/** From the connected media browser (e.g. Android Auto), when it gives one. */
|
|
1544
1654
|
val artworkSizeHintPixels: Int?
|
|
1545
1655
|
get() = mediaSessionCallback.artworkSizeHintPixels
|
|
@@ -1577,3 +1687,10 @@ internal constructor(
|
|
|
1577
1687
|
var lastQueueVersion = 0
|
|
1578
1688
|
}
|
|
1579
1689
|
}
|
|
1690
|
+
|
|
1691
|
+
/** A request the consumer's gate refused: app state, which onGate reports, not a failure. */
|
|
1692
|
+
internal class RequestGatedException : IllegalStateException("Request is gated")
|
|
1693
|
+
|
|
1694
|
+
/** A voice search that played nothing, whose SessionError has already told controllers why. */
|
|
1695
|
+
internal class VoiceSearchFailedException(message: String, cause: Throwable? = null) :
|
|
1696
|
+
IllegalStateException(message, cause)
|
|
@@ -30,6 +30,12 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
30
30
|
|
|
31
31
|
@MediaPlayer.State private var lastEngineState = MediaPlayer.STATE_IDLE
|
|
32
32
|
|
|
33
|
+
/**
|
|
34
|
+
* From the library's stop of the local engine until the engine leaves idle. An error it delivers
|
|
35
|
+
* meanwhile is the ended connection's: its playback thread was still failing it at the stop.
|
|
36
|
+
*/
|
|
37
|
+
private var connectionEnded = false
|
|
38
|
+
|
|
33
39
|
/**
|
|
34
40
|
* Set from an app-started command that ends the stream until the playback thread has handled it.
|
|
35
41
|
* Until then every metadata delivery is the outgoing stream's: its renderer posted them to the
|
|
@@ -126,7 +132,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
126
132
|
player.startRetryLoad()
|
|
127
133
|
|
|
128
134
|
// Emits on its own: the incoming track may hold LOADING/BUFFERING and emit no state change.
|
|
129
|
-
player.
|
|
135
|
+
player.hideRetryingError()
|
|
130
136
|
|
|
131
137
|
player.playbackStateStore.save()
|
|
132
138
|
player.playbackStateStore.resetPeriodicSave()
|
|
@@ -137,9 +143,14 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
137
143
|
player.retryLoop?.isPlayingChanged(isPlaying && !player.retryMasksPlaying)
|
|
138
144
|
}
|
|
139
145
|
|
|
146
|
+
internal fun engineStopping() {
|
|
147
|
+
if (player.localEngine.isActive) connectionEnded = true
|
|
148
|
+
}
|
|
149
|
+
|
|
140
150
|
/** A new engine or session player is attached: what this listener knew of the old one is gone. */
|
|
141
151
|
internal fun engineAttached() {
|
|
142
152
|
lastEngineState = player.exoPlayer.playbackState
|
|
153
|
+
connectionEnded = false
|
|
143
154
|
localActive = player.localEngine.isActive
|
|
144
155
|
}
|
|
145
156
|
|
|
@@ -179,6 +190,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
179
190
|
val engineState = player.sessionPlayer.playbackState
|
|
180
191
|
val left = lastEngineState == MediaPlayer.STATE_IDLE && engineState != MediaPlayer.STATE_IDLE
|
|
181
192
|
lastEngineState = engineState
|
|
193
|
+
if (left) connectionEnded = false
|
|
182
194
|
val loop = player.retryLoop
|
|
183
195
|
// A prepare: the retry's reconnect, or the listener's play, which after a give-up or a stop is
|
|
184
196
|
// a new Load.
|
|
@@ -243,6 +255,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
243
255
|
}
|
|
244
256
|
|
|
245
257
|
override fun onPlayerError(error: PlaybackException) {
|
|
258
|
+
if (connectionEnded) return
|
|
246
259
|
if (player.localEngine.isActive && recoverLocally(error)) return
|
|
247
260
|
surface(error)
|
|
248
261
|
}
|
|
@@ -336,13 +349,11 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
336
349
|
}
|
|
337
350
|
|
|
338
351
|
override fun onTimelineChanged(timeline: Timeline, reason: Int) {
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
player.updateLiveState(player.currentTrack?.live == true)
|
|
345
|
-
}
|
|
352
|
+
val tracks = player.changedQueueTracks() ?: return
|
|
353
|
+
player.callbacks?.onPlaybackQueueChanged(tracks)
|
|
354
|
+
// Replacing the current item with one of the same URL updates it in place, without a
|
|
355
|
+
// transition, so a changed `live` arrives only here.
|
|
356
|
+
player.updateLiveState(player.currentTrack?.live == true)
|
|
346
357
|
}
|
|
347
358
|
|
|
348
359
|
override fun onAudioSessionIdChanged(audioSessionId: Int) {
|
|
@@ -58,7 +58,7 @@ internal class RetryLoop(
|
|
|
58
58
|
|
|
59
59
|
/**
|
|
60
60
|
* Whether the policy reported the current connection's end. Outlives [failedAtMs] when the engine
|
|
61
|
-
* is stopped
|
|
61
|
+
* is stopped: a report still on its way is the stopped connection's.
|
|
62
62
|
*/
|
|
63
63
|
private var endReported = false
|
|
64
64
|
|
|
@@ -8,6 +8,7 @@ import androidx.media3.common.Metadata
|
|
|
8
8
|
import androidx.media3.common.PlaybackException
|
|
9
9
|
import androidx.media3.common.Player as MediaPlayer
|
|
10
10
|
import androidx.media3.common.SimpleBasePlayer
|
|
11
|
+
import androidx.media3.common.SimpleBasePlayer.PositionSupplier
|
|
11
12
|
import androidx.media3.common.Timeline
|
|
12
13
|
import com.google.common.util.concurrent.Futures
|
|
13
14
|
import com.google.common.util.concurrent.ListenableFuture
|
|
@@ -98,8 +99,14 @@ internal class RemoteSwitchingPlayer(
|
|
|
98
99
|
/** [item] went to the receiver, which doesn't report holding it yet. */
|
|
99
100
|
class Sent(val item: MediaItem, val positionMs: Long) : Load
|
|
100
101
|
|
|
101
|
-
/**
|
|
102
|
-
|
|
102
|
+
/**
|
|
103
|
+
* The receiver holds [item]: what it reports is the current item's. [lastPosition] is where it
|
|
104
|
+
* last reported [item] loaded, running on while it played; until then, where it was sent from.
|
|
105
|
+
*/
|
|
106
|
+
class Playing(val item: MediaItem, var lastPosition: PositionSupplier) : Load {
|
|
107
|
+
/** Whether the receiver has reported [item] past its first buffering. */
|
|
108
|
+
var wasReady = false
|
|
109
|
+
}
|
|
103
110
|
|
|
104
111
|
class Failed(val error: PlaybackException, val positionMs: Long) : Load
|
|
105
112
|
|
|
@@ -172,11 +179,42 @@ internal class RemoteSwitchingPlayer(
|
|
|
172
179
|
val remote = remoteRoute ?: return
|
|
173
180
|
if (player !== remote.receiver) return
|
|
174
181
|
val changed = followReceiver(remote)
|
|
182
|
+
noteReport(remote)
|
|
175
183
|
if (remote.startTimeout != null && started(remote)) disarmStart(remote)
|
|
176
184
|
if (changed) invalidateState()
|
|
177
185
|
}
|
|
178
186
|
}
|
|
179
187
|
|
|
188
|
+
private fun noteReport(remote: Route.Remote) {
|
|
189
|
+
val load = remote.load as? Load.Playing ?: return
|
|
190
|
+
if (!reportsPosition(remote, load)) {
|
|
191
|
+
// Where it stopped reporting is the last it can be known to have played to.
|
|
192
|
+
load.lastPosition = PositionSupplier.getConstant(load.lastPosition.get())
|
|
193
|
+
return
|
|
194
|
+
}
|
|
195
|
+
val receiver = remote.receiver
|
|
196
|
+
// Cast reports a load buffering at 0 before its first PLAYING or PAUSED (Media3's ready) at
|
|
197
|
+
// the position it was sent from.
|
|
198
|
+
if (receiver.playbackState != STATE_BUFFERING) load.wasReady = true
|
|
199
|
+
else if (!load.wasReady) return
|
|
200
|
+
val running =
|
|
201
|
+
PositionSupplier.getExtrapolating(
|
|
202
|
+
receiver.currentPosition,
|
|
203
|
+
if (receiver.isPlaying) receiver.playbackParameters.speed else 0f,
|
|
204
|
+
)
|
|
205
|
+
val durationMs = receiver.duration
|
|
206
|
+
load.lastPosition =
|
|
207
|
+
if (durationMs == C.TIME_UNSET) running
|
|
208
|
+
else PositionSupplier { minOf(running.get(), durationMs) }
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
/**
|
|
212
|
+
* Whether the receiver holds [load]'s item, not idle, so that its position is the item's. Cast's
|
|
213
|
+
* player takes a failed status, idle at 0, before the failure is reported.
|
|
214
|
+
*/
|
|
215
|
+
private fun reportsPosition(remote: Route.Remote, load: Load.Playing): Boolean =
|
|
216
|
+
receiverHolds(remote, load.item) && remote.receiver.playbackState != STATE_IDLE
|
|
217
|
+
|
|
180
218
|
private fun enter(remote: Route.Remote, load: Load) {
|
|
181
219
|
remote.load = load
|
|
182
220
|
route = remote
|
|
@@ -317,8 +355,11 @@ internal class RemoteSwitchingPlayer(
|
|
|
317
355
|
is Load.Sent -> load.positionMs
|
|
318
356
|
is Load.Failed -> load.positionMs
|
|
319
357
|
is Load.Playing ->
|
|
320
|
-
|
|
321
|
-
|
|
358
|
+
when {
|
|
359
|
+
load.item.isRemoteLive -> C.TIME_UNSET
|
|
360
|
+
reportsPosition(remote, load) -> remote.receiver.currentPosition
|
|
361
|
+
else -> load.lastPosition.get()
|
|
362
|
+
}
|
|
322
363
|
is Load.Ended -> C.TIME_UNSET
|
|
323
364
|
}
|
|
324
365
|
|
|
@@ -445,6 +486,8 @@ internal class RemoteSwitchingPlayer(
|
|
|
445
486
|
private fun onReceiverPlaying() {
|
|
446
487
|
val remote = remoteRoute ?: return
|
|
447
488
|
val changed = followReceiver(remote)
|
|
489
|
+
// Sonos reports each poll this way, a seek made in its own app included.
|
|
490
|
+
noteReport(remote)
|
|
448
491
|
when (remote.load) {
|
|
449
492
|
is Load.Playing -> {
|
|
450
493
|
remote.reportedPlaying = true
|
|
@@ -541,7 +584,9 @@ internal class RemoteSwitchingPlayer(
|
|
|
541
584
|
.setContentPositionMs(position(load.positionMs))
|
|
542
585
|
is Load.Ended ->
|
|
543
586
|
setPlaybackState(STATE_ENDED).setContentPositionMs(position(load.positionMs))
|
|
544
|
-
is Load.Playing ->
|
|
587
|
+
is Load.Playing ->
|
|
588
|
+
if (!holds)
|
|
589
|
+
setPlaybackState(STATE_IDLE).setContentPositionMs(position(positionOn(remote)))
|
|
545
590
|
}
|
|
546
591
|
if (queue.isEmpty) setPlaybackState(STATE_IDLE)
|
|
547
592
|
if (pendingAutoTransition) {
|
|
@@ -574,7 +619,7 @@ internal class RemoteSwitchingPlayer(
|
|
|
574
619
|
when (val load = remote.load) {
|
|
575
620
|
is Load.Sent ->
|
|
576
621
|
if (receiverHolds(remote, load.item)) {
|
|
577
|
-
remote.load = Load.Playing(load.item)
|
|
622
|
+
remote.load = Load.Playing(load.item, PositionSupplier.getConstant(load.positionMs))
|
|
578
623
|
playIntent = remote.receiver.playWhenReady
|
|
579
624
|
if (remote.reportedPlaying) disarmStart(remote)
|
|
580
625
|
return true
|
|
@@ -608,7 +653,7 @@ internal class RemoteSwitchingPlayer(
|
|
|
608
653
|
when (val load = remote.load) {
|
|
609
654
|
is Load.Idle -> load(remote, load.positionMs)
|
|
610
655
|
is Load.Failed -> load(remote, load.positionMs)
|
|
611
|
-
is Load.Playing -> if (!receiverHolds(remote, load.item)) load(remote,
|
|
656
|
+
is Load.Playing -> if (!receiverHolds(remote, load.item)) load(remote, positionOn(remote))
|
|
612
657
|
else -> Unit
|
|
613
658
|
}
|
|
614
659
|
return done()
|
|
@@ -19,7 +19,7 @@ import timber.log.Timber
|
|
|
19
19
|
* Serves browse artwork to Android Auto and AAOS as PNG files. It is exported because both run in
|
|
20
20
|
* another uid and Media3 issues no URI grant. So it never fetches a URL the caller supplies: the
|
|
21
21
|
* URI carries an opaque token, and only a token in [com.audiobrowser.browser.BrowseArtworkRegistry]
|
|
22
|
-
* whose URL is
|
|
22
|
+
* whose URL is [ArtworkUris.isServable] resolves; anything else returns null.
|
|
23
23
|
*
|
|
24
24
|
* The response is an on-disk file in [ARTWORK_SUBDIR], not a pipe: the car's image loader seeks and
|
|
25
25
|
* reads statSize, which a pipe reports as -1. The file doubles as the cache, keyed by token.
|
|
@@ -36,8 +36,7 @@ class ArtworkContentProvider : ContentProvider() {
|
|
|
36
36
|
val token = ArtworkUris.parseToken(uri) ?: return null
|
|
37
37
|
val deps = CoilArtworkLoaderHolder.get() ?: return null
|
|
38
38
|
val art: ResolvedArtwork = deps.registry.lookup(token) ?: return null
|
|
39
|
-
|
|
40
|
-
if (scheme != "http" && scheme != "https") return null
|
|
39
|
+
if (!ArtworkUris.isServable(Uri.parse(art.finalUrl))) return null
|
|
41
40
|
|
|
42
41
|
val artworkDir = File(context!!.cacheDir, ARTWORK_SUBDIR)
|
|
43
42
|
val file = File(artworkDir, "$token.png")
|