ericek111/ts3java
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Open a new line when a speaker's playback line dies

Browse Source 
Both desktop backends dropped writes to a line whose device had gone
away, and the per-speaker playout ignored any failure, so that speaker
stayed silent for the rest of the session. A write to a dead line now
throws; the playout drops that line and the speaker's next packet
opens a fresh one. Sound effects and the microphone test's loopback
reopen their line the same way.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ericek111
2026-09-25 10:48:22 +00:00
parent 6234ec6d97
commit 12ca585d90
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ts3-client/desktop/src/main/java/com/ts3client/audio/desktop/JavaSoundPlayback.java
View File

@@ -25,11 +25,13 @@ final class JavaSoundPlayback implements AudioPlayback {
@Override
public void write(byte[] buffer, int offset, int length) {
int written;
try {
line.write(buffer, offset, length);
} catch (Exception ignored) {
// The line went away (device unplugged); the caller sees silence.
written = line.write(buffer, offset, length);
} catch (RuntimeException e) {
throw new IllegalStateException("The playback line failed", e);
}
if (written < length && !line.isOpen()) throw new IllegalStateException("The playback line closed");
}
@Override

4
ts3-client/desktop/src/main/java/com/ts3client/audio/desktop/pipewire/PipeWirePlayback.java
View File

@@ -37,7 +37,9 @@ final class PipeWirePlayback extends PipeWireStream implements AudioPlayback {
@Override
public void write(byte[] buffer, int offset, int length) {
ring.write(buffer, offset, length);
if (ring.write(buffer, offset, length) < length && ring.isClosed()) {
throw new IllegalStateException("The PipeWire stream ended");
}
}
@Override