Muting the speaker now results in muted clients as well

web/app/rtc/voice/Connection.ts

@@ -22,6 +22,7 @@ export class RtpVoiceConnection extends AbstractVoiceConnection {
     private readonly listenerRtcAudioAssignment;
     private readonly listenerRtcStateChanged;
     private listenerClientMoved;
+    private listenerSpeakerStateChanged;
 
     private connectionState: VoiceConnectionStatus;
     private localFailedReason: string;
@@ -30,6 +31,7 @@ export class RtpVoiceConnection extends AbstractVoiceConnection {
     private currentAudioSourceNode: AudioNode;
     private currentAudioSource: RecorderProfile;
 
+    private speakerMuted: boolean;
     private voiceClients: RtpVoiceClient[] = [];
 
     private currentlyReplayingVoice: boolean = false;
@@ -49,6 +51,12 @@ export class RtpVoiceConnection extends AbstractVoiceConnection {
         this.rtcConnection.getEvents().on("notify_state_changed",
             this.listenerRtcStateChanged = event => this.handleRtcConnectionStateChanged(event));
 
+        this.listenerSpeakerStateChanged = connection.client.events().on("notify_state_updated", event => {
+            if(event.state === "speaker") {
+                this.updateSpeakerState();
+            }
+        });
+
         /* FIXME: Listener for audio! */
 
         this.listenerClientMoved = this.rtcConnection.getConnection().command_handler_boss().register_explicit_handler("notifyclientmoved", event => {
@@ -61,6 +69,7 @@ export class RtpVoiceConnection extends AbstractVoiceConnection {
             }
         });
 
+        this.speakerMuted = connection.client.isSpeakerMuted() || connection.client.isSpeakerDisabled();
 
         this.setConnectionState(VoiceConnectionStatus.Disconnected);
         aplayer.on_ready(() => {
@@ -77,6 +86,11 @@ export class RtpVoiceConnection extends AbstractVoiceConnection {
             this.listenerClientMoved = undefined;
         }
 
+        if(this.listenerSpeakerStateChanged) {
+            this.listenerSpeakerStateChanged();
+            this.listenerSpeakerStateChanged = undefined;
+        }
+
         this.rtcConnection.getEvents().off("notify_audio_assignment_changed", this.listenerRtcAudioAssignment);
         this.rtcConnection.getEvents().off("notify_state_changed", this.listenerRtcStateChanged);
 
@@ -195,7 +209,7 @@ export class RtpVoiceConnection extends AbstractVoiceConnection {
         log.info(LogCategory.VOICE, tr("Local voice started"));
 
         const ch = chandler.getClient();
-        if(ch) ch.speaking = true;
+        if(ch) { ch.speaking = true; }
         this.rtcConnection.setTrackSource("audio", this.localAudioDestination.stream.getAudioTracks()[0])
             .catch(error => {
                 logError(LogCategory.AUDIO, tr("Failed to set current audio track: %o"), error);
@@ -370,4 +384,12 @@ export class RtpVoiceConnection extends AbstractVoiceConnection {
             bytesSend: stats.voiceBytesSent
         };
     }
+
+    private updateSpeakerState() {
+        const newState = this.connection.client.isSpeakerMuted() || this.connection.client.isSpeakerDisabled();
+        if(this.speakerMuted === newState) { return; }
+
+        this.speakerMuted = newState;
+        this.voiceClients.forEach(client => client.setGloballyMuted(this.speakerMuted));
+    }
 }

web/app/rtc/voice/VoiceClient.ts

@@ -9,6 +9,8 @@ export class RtpVoiceClient implements VoiceClient {
     private readonly listenerTrackStateChanged;
     private readonly clientId: number;
 
+    private globallyMuted: boolean;
+
     private volume: number;
     private currentState: VoicePlayerState;
     private currentRtpTrack: RemoteRTPAudioTrack;
@@ -24,6 +26,13 @@ export class RtpVoiceClient implements VoiceClient {
         this.events.destroy();
     }
 
+    setGloballyMuted(muted: boolean) {
+        if(this.globallyMuted === muted) { return; }
+
+        this.globallyMuted = muted;
+        this.updateVolume();
+    }
+
     getClientId(): number {
         return this.clientId;
     }
@@ -52,7 +61,7 @@ export class RtpVoiceClient implements VoiceClient {
 
     setVolume(volume: number) {
         this.volume = volume;
-        this.currentRtpTrack?.setGain(volume);
+        this.updateVolume();
     }
 
     getLatencySettings(): Readonly<VoicePlayerLatencySettings> {
@@ -95,4 +104,8 @@ export class RtpVoiceClient implements VoiceClient {
                 break;
         }
     }
+
+    private updateVolume() {
+        this.currentRtpTrack?.setGain(this.globallyMuted ? 0 : this.volume);
+    }
 }