bvandeusen/minstrel
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 40 Wiki Activity

dev → main: Android UPnP/Sonos transport parity + server stream URL extension #79

Merged
bvandeusen merged 69 commits from dev into main 2026-06-04 08:15:15 -04:00
Conversation 0 Commits 69 Files Changed 35
+28 -25
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5437d517e - Show all commits
android/app/src/main/java/com/fabledsword/minstrel/player/output/OutputPickerController.kt
+6 -3
View File
@@ -353,11 +353,13 @@ class OutputPickerController @Inject constructor(
) )
var consecutiveFailures = 0 var consecutiveFailures = 0
var succeeded = 0 var succeeded = 0
var aborted = false
for ((i, ref) in tracks.withIndex()) { for ((i, ref) in tracks.withIndex()) {
if (aborted) break
if (activeUpnpHolder.active.value?.routeId != route.id) { if (activeUpnpHolder.active.value?.routeId != route.id) {
Timber.w("UPnP extend: cancelled at offset %d (route changed)", i) Timber.w("UPnP extend: cancelled at offset %d (route changed)", i)
break aborted = true
} } else {
val outcome = runCatching { val outcome = runCatching {
val token = streamTokens.mint(ref.id) val token = streamTokens.mint(ref.id)
transport.addURIToQueue( transport.addURIToQueue(
@@ -382,7 +384,8 @@ class OutputPickerController @Inject constructor(
"UPnP extend: aborting after %d consecutive failures", "UPnP extend: aborting after %d consecutive failures",
consecutiveFailures, consecutiveFailures,
) )
break aborted = true
}
} }
} }
} }