Rendi affidabile pausa con slate e conferma i controlli laterali.

Evita buchi HLS/YouTube in pausa (path slate ricreata, reload player, no patch recording inutili) e richiede conferma su tasti laterali app/regia. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-20 12:44:23 +02:00
parent e09b3ffcf8
commit 0702cb699c
37 changed files with 1186 additions and 83 deletions
@@ -74,6 +74,7 @@ enum L10n {
    private static let table: [String: [String: String]] = [
        "it": [
            "action.cancel": "Annulla",
+            "action.confirm": "Conferma",
            "action.delete": "Elimina",
            "action.exit": "Esci",
            "action.login": "Accedi",
@@ -174,6 +175,21 @@ enum L10n {
            "broadcast.terminate.confirm": "TERMINA",
            "broadcast.terminate.message": "Lo streaming verrà chiuso per tutti gli spettatori.",
            "broadcast.terminate.title": "Terminare la diretta?",
+            "broadcast.pause.title": "Mettere in pausa?",
+            "broadcast.pause.message": "La diretta passerà alla copertina finché non la riprendi.",
+            "broadcast.resume.title": "Riprendere la diretta?",
+            "broadcast.resume.message": "La telecamera tornerà in onda al posto della copertina.",
+            "broadcast.mute.title": "Silenziare l'audio?",
+            "broadcast.mute.message": "Il microfono non verrà inviato allo stream finché non lo riattivi.",
+            "broadcast.unmute.title": "Riattivare l'audio?",
+            "broadcast.unmute.message": "Il microfono tornerà attivo sullo stream.",
+            "broadcast.advance.period.title": "Passare al periodo successivo?",
+            "broadcast.advance.period.message": "Il tabellone passerà al periodo successivo e il punteggio del periodo corrente sarà salvato.",
+            "broadcast.share.live.title": "Condividere la diretta?",
+            "broadcast.share.live.message": "Aprirai il menu di condivisione con il link pubblico della diretta.",
+            "broadcast.share.regia.title": "Condividere il link regia?",
+            "broadcast.share.regia.message": "Aprirai il menu di condivisione con il link per gestire il punteggio da remoto.",
+            "broadcast.close.set.confirm.message": "Confermi la chiusura del set corrente?",
            "broadcast.tooltip.add.point": "Aggiungi punto %1$@",
            "broadcast.tooltip.plus.side": "+%1$d %2$@",
            "broadcast.tooltip.remove.point": "Togli punto %1$@",
@@ -389,6 +405,7 @@ enum L10n {
        ], 
        "en": [
            "action.cancel": "Cancel",
+            "action.confirm": "Confirm",
            "action.delete": "Delete",
            "action.exit": "Exit",
            "action.login": "Log in",
@@ -489,6 +506,21 @@ enum L10n {
            "broadcast.terminate.confirm": "END",
            "broadcast.terminate.message": "The stream will be closed for all viewers.",
            "broadcast.terminate.title": "End the live stream?",
+            "broadcast.pause.title": "Pause the live stream?",
+            "broadcast.pause.message": "The cover slate will stay on air until you resume.",
+            "broadcast.resume.title": "Resume the live stream?",
+            "broadcast.resume.message": "The camera will go back on air instead of the cover slate.",
+            "broadcast.mute.title": "Mute audio?",
+            "broadcast.mute.message": "The microphone will not be sent to the stream until you unmute.",
+            "broadcast.unmute.title": "Unmute audio?",
+            "broadcast.unmute.message": "The microphone will be active on the stream again.",
+            "broadcast.advance.period.title": "Advance to the next period?",
+            "broadcast.advance.period.message": "The scoreboard will move to the next period and the current period score will be saved.",
+            "broadcast.share.live.title": "Share the live stream?",
+            "broadcast.share.live.message": "This opens the share sheet with the public live link.",
+            "broadcast.share.regia.title": "Share the control room link?",
+            "broadcast.share.regia.message": "This opens the share sheet with the remote scoring link.",
+            "broadcast.close.set.confirm.message": "Confirm closing the current set?",
            "broadcast.tooltip.add.point": "Add point %1$@",
            "broadcast.tooltip.plus.side": "+%1$d %2$@",
            "broadcast.tooltip.remove.point": "Remove point %1$@",
@@ -704,6 +736,7 @@ enum L10n {
        ], 
        "fr": [
            "action.cancel": "Annuler",
+            "action.confirm": "Confirmer",
            "action.delete": "Supprimer",
            "action.exit": "Quitter",
            "action.login": "Connexion",
@@ -804,6 +837,21 @@ enum L10n {
            "broadcast.terminate.confirm": "TERMINER",
            "broadcast.terminate.message": "Le streaming sera fermé pour tous les spectateurs.",
            "broadcast.terminate.title": "Terminer le direct ?",
+            "broadcast.pause.title": "Mettre le direct en pause ?",
+            "broadcast.pause.message": "La couverture restera à l'antenne jusqu'à la reprise.",
+            "broadcast.resume.title": "Reprendre le direct ?",
+            "broadcast.resume.message": "La caméra reviendra à l'antenne à la place de la couverture.",
+            "broadcast.mute.title": "Couper l'audio ?",
+            "broadcast.mute.message": "Le micro ne sera plus envoyé au flux tant que vous ne le réactivez pas.",
+            "broadcast.unmute.title": "Réactiver l'audio ?",
+            "broadcast.unmute.message": "Le micro sera à nouveau actif sur le flux.",
+            "broadcast.advance.period.title": "Passer à la période suivante ?",
+            "broadcast.advance.period.message": "Le tableau passera à la période suivante et le score de la période en cours sera enregistré.",
+            "broadcast.share.live.title": "Partager le direct ?",
+            "broadcast.share.live.message": "Cela ouvre le menu de partage avec le lien public du direct.",
+            "broadcast.share.regia.title": "Partager le lien régie ?",
+            "broadcast.share.regia.message": "Cela ouvre le menu de partage avec le lien de scoring distant.",
+            "broadcast.close.set.confirm.message": "Confirmez la clôture du set en cours ?",
            "broadcast.tooltip.add.point": "Ajouter un point %1$@",
            "broadcast.tooltip.plus.side": "+%1$d %2$@",
            "broadcast.tooltip.remove.point": "Retirer un point %1$@",
@@ -1019,6 +1067,7 @@ enum L10n {
        ], 
        "de": [
            "action.cancel": "Abbrechen",
+            "action.confirm": "Bestätigen",
            "action.delete": "Löschen",
            "action.exit": "Beenden",
            "action.login": "Anmelden",
@@ -1119,6 +1168,21 @@ enum L10n {
            "broadcast.terminate.confirm": "BEENDEN",
            "broadcast.terminate.message": "Der Stream wird für alle Zuschauer beendet.",
            "broadcast.terminate.title": "Livestream beenden?",
+            "broadcast.pause.title": "Livestream pausieren?",
+            "broadcast.pause.message": "Das Cover bleibt on air, bis du fortsetzt.",
+            "broadcast.resume.title": "Livestream fortsetzen?",
+            "broadcast.resume.message": "Die Kamera geht wieder on air statt des Covers.",
+            "broadcast.mute.title": "Audio stummschalten?",
+            "broadcast.mute.message": "Das Mikrofon wird nicht mehr an den Stream gesendet, bis du es wieder aktivierst.",
+            "broadcast.unmute.title": "Audio wieder aktivieren?",
+            "broadcast.unmute.message": "Das Mikrofon ist wieder aktiv im Stream.",
+            "broadcast.advance.period.title": "Zum nächsten Abschnitt wechseln?",
+            "broadcast.advance.period.message": "Die Anzeigetafel wechselt zum nächsten Abschnitt und der aktuelle Stand wird gespeichert.",
+            "broadcast.share.live.title": "Livestream teilen?",
+            "broadcast.share.live.message": "Es öffnet sich das Teilen-Menü mit dem öffentlichen Live-Link.",
+            "broadcast.share.regia.title": "Regie-Link teilen?",
+            "broadcast.share.regia.message": "Es öffnet sich das Teilen-Menü mit dem Link zur Fernsteuerung des Spielstands.",
+            "broadcast.close.set.confirm.message": "Bestätigst du das Beenden des aktuellen Satzes?",
            "broadcast.tooltip.add.point": "Punkt hinzufügen %1$@",
            "broadcast.tooltip.plus.side": "+%1$d %2$@",
            "broadcast.tooltip.remove.point": "Punkt entfernen %1$@",
@@ -1334,6 +1398,7 @@ enum L10n {
        ], 
        "es": [
            "action.cancel": "Cancelar",
+            "action.confirm": "Confirmar",
            "action.delete": "Eliminar",
            "action.exit": "Salir",
            "action.login": "Acceder",
@@ -1434,6 +1499,21 @@ enum L10n {
            "broadcast.terminate.confirm": "TERMINAR",
            "broadcast.terminate.message": "El streaming se cerrará para todos los espectadores.",
            "broadcast.terminate.title": "¿Terminar el directo?",
+            "broadcast.pause.title": "¿Pausar el directo?",
+            "broadcast.pause.message": "La portada seguirá en antena hasta que lo reanudes.",
+            "broadcast.resume.title": "¿Reanudar el directo?",
+            "broadcast.resume.message": "La cámara volverá a antena en lugar de la portada.",
+            "broadcast.mute.title": "¿Silenciar el audio?",
+            "broadcast.mute.message": "El micrófono no se enviará al stream hasta que lo reactives.",
+            "broadcast.unmute.title": "¿Reactivar el audio?",
+            "broadcast.unmute.message": "El micrófono volverá a estar activo en el stream.",
+            "broadcast.advance.period.title": "¿Pasar al periodo siguiente?",
+            "broadcast.advance.period.message": "El marcador pasará al siguiente periodo y se guardará el marcador del periodo actual.",
+            "broadcast.share.live.title": "¿Compartir el directo?",
+            "broadcast.share.live.message": "Se abrirá el menú de compartir con el enlace público del directo.",
+            "broadcast.share.regia.title": "¿Compartir el enlace de regie?",
+            "broadcast.share.regia.message": "Se abrirá el menú de compartir con el enlace para gestionar el marcador a distancia.",
+            "broadcast.close.set.confirm.message": "¿Confirmas el cierre del set actual?",
            "broadcast.tooltip.add.point": "Añadir punto %1$@",
            "broadcast.tooltip.plus.side": "+%1$d %2$@",
            "broadcast.tooltip.remove.point": "Quitar punto %1$@",
@@ -4,6 +4,15 @@ private let sideToolbarWidth: CGFloat = 44
 private let iconButtonSize: CGFloat = 36
 private let scoreButtonHeight: CGFloat = 32

+private enum SideConfirmAction {
+    case shareLive
+    case shareRegia
+    case advancePeriod
+    case pauseOrResume
+    case toggleMute
+    case terminate
+}
+
 struct BroadcastControlsOverlay: View {
    let controlsVisible: Bool
    let onToggleControls: () -> Void
@@ -46,7 +55,7 @@ struct BroadcastControlsOverlay: View {
    var sessionQualityPreset: String = "720p_30_2.5mbps"
    var onSelectMinQuality: (String) -> Void = { _ in }

-    @State private var showTerminateConfirm = false
+    @State private var pendingConfirm: SideConfirmAction?
    @State private var showMinQualityPicker = false

    var body: some View {
@@ -118,11 +127,62 @@ struct BroadcastControlsOverlay: View {
                    )
                }
            }
-        .alert(L10n.t("broadcast.terminate.title"), isPresented: $showTerminateConfirm) {
-            Button(L10n.t("action.cancel"), role: .cancel) {}
-            Button(L10n.t("broadcast.terminate.confirm"), role: .destructive, action: onTerminate)
-        } message: {
-            Text(L10n.t("broadcast.terminate.message"))
+            .alert(
+                sideConfirmTitle,
+                isPresented: Binding(
+                    get: { pendingConfirm != nil },
+                    set: { if !$0 { pendingConfirm = nil } }
+                )
+            ) {
+                Button(L10n.t("action.cancel"), role: .cancel) { pendingConfirm = nil }
+                if pendingConfirm == .terminate {
+                    Button(L10n.t("broadcast.terminate.confirm"), role: .destructive, action: performPendingConfirm)
+                } else {
+                    Button(L10n.t("action.confirm"), action: performPendingConfirm)
+                }
+            } message: {
+                Text(sideConfirmMessage)
+            }
+    }
+
+    private var sideConfirmTitle: String {
+        switch pendingConfirm {
+        case .shareLive: return L10n.t("broadcast.share.live.title")
+        case .shareRegia: return L10n.t("broadcast.share.regia.title")
+        case .advancePeriod: return L10n.t("broadcast.advance.period.title")
+        case .pauseOrResume:
+            return isPaused ? L10n.t("broadcast.resume.title") : L10n.t("broadcast.pause.title")
+        case .toggleMute:
+            return audioMuted ? L10n.t("broadcast.unmute.title") : L10n.t("broadcast.mute.title")
+        case .terminate: return L10n.t("broadcast.terminate.title")
+        case .none: return ""
+        }
+    }
+
+    private var sideConfirmMessage: String {
+        switch pendingConfirm {
+        case .shareLive: return L10n.t("broadcast.share.live.message")
+        case .shareRegia: return L10n.t("broadcast.share.regia.message")
+        case .advancePeriod: return L10n.t("broadcast.advance.period.message")
+        case .pauseOrResume:
+            return isPaused ? L10n.t("broadcast.resume.message") : L10n.t("broadcast.pause.message")
+        case .toggleMute:
+            return audioMuted ? L10n.t("broadcast.unmute.message") : L10n.t("broadcast.mute.message")
+        case .terminate: return L10n.t("broadcast.terminate.message")
+        case .none: return ""
+        }
+    }
+
+    private func performPendingConfirm() {
+        guard let action = pendingConfirm else { return }
+        pendingConfirm = nil
+        switch action {
+        case .shareLive: onShareLive()
+        case .shareRegia: onShareRegia()
+        case .advancePeriod: onAdvancePeriod?()
+        case .pauseOrResume: onPauseOrResume()
+        case .toggleMute: onToggleAudioMute()
+        case .terminate: onTerminate()
        }
    }

@@ -131,13 +191,13 @@ struct BroadcastControlsOverlay: View {
            SideIconButton(
                systemName: "square.and.arrow.up",
                accessibilityLabel: L10n.t("broadcast.share.live.cd"),
-                action: onShareLive,
+                action: { pendingConfirm = .shareLive },
                enabled: shareLiveEnabled
            )
            SideIconButton(
                systemName: "video.fill",
                accessibilityLabel: L10n.t("broadcast.share.regia.cd"),
-                action: onShareRegia
+                action: { pendingConfirm = .shareRegia }
            )
            SideIconButton(
                systemName: "slider.horizontal.3",
@@ -151,11 +211,11 @@ struct BroadcastControlsOverlay: View {
                    action: onCloseSet
                )
            }
-            if let onAdvancePeriod {
+            if onAdvancePeriod != nil {
                SideIconButton(
                    systemName: "forward.end.fill",
                    accessibilityLabel: L10n.t("broadcast.next.period.cd"),
-                    action: onAdvancePeriod
+                    action: { pendingConfirm = .advancePeriod }
                )
            }
        }
@@ -168,19 +228,19 @@ struct BroadcastControlsOverlay: View {
            SideIconButton(
                systemName: isPaused ? "play.fill" : "pause.fill",
                accessibilityLabel: isPaused ? L10n.t("broadcast.resume.cd") : L10n.t("broadcast.pause.cd"),
-                action: onPauseOrResume,
+                action: { pendingConfirm = .pauseOrResume },
                highlighted: isPaused
            )
            SideIconButton(
                systemName: audioMuted ? "speaker.slash.fill" : "speaker.wave.2.fill",
                accessibilityLabel: audioMuted ? L10n.t("broadcast.unmute.cd") : L10n.t("broadcast.mute.cd"),
-                action: onToggleAudioMute,
+                action: { pendingConfirm = .toggleMute },
                highlighted: audioMuted
            )
            SideIconButton(
                systemName: "stop.fill",
                accessibilityLabel: L10n.t("broadcast.terminate.cd"),
-                action: { showTerminateConfirm = true },
+                action: { pendingConfirm = .terminate },
                danger: true
            )
        }
@@ -3,6 +3,7 @@ import SwiftUI

 enum ScoreDialogKind {
    case setWon
+    case closeSet
    case closeSetAnyway
    case matchWon
 }
@@ -92,10 +93,10 @@ final class LiveScoreActions {
            awayPoints: score.awayPoints,
            currentSet: score.currentSet
        )
-        if winner == nil {
-            let ok = await dialogHost.show(ScoreDialogState(kind: .closeSetAnyway))
-            if !ok { return }
-        }
+        let ok = await dialogHost.show(
+            ScoreDialogState(kind: winner == nil ? .closeSetAnyway : .closeSet)
+        )
+        if !ok { return }
        guard await scoreController.closeSetAsync() else { return }
        onScoreboardChanged()
        await afterCloseSet()
@@ -149,6 +150,13 @@ struct ScoreDialogRouter: View {
                primaryButton: .default(Text(L10n.t("score.action.close.set"))) { host.resolve(true) },
                secondaryButton: .cancel(Text(L10n.t("score.action.continue.scoring"))) { host.resolve(false) }
            )
+        case .closeSet:
+            return Alert(
+                title: Text(L10n.t("score.action.close.set")),
+                message: Text(L10n.t("broadcast.close.set.confirm.message")),
+                primaryButton: .default(Text(L10n.t("score.action.close.set"))) { host.resolve(true) },
+                secondaryButton: .cancel(Text(L10n.t("action.cancel"))) { host.resolve(false) }
+            )
        case .closeSetAnyway:
            return Alert(
                title: Text(L10n.t("score.action.close.set")),