From 8390d0bbd7f94b0cefb9ffa0efef15c176a401ca Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 20 Dec 2013 19:41:52 -0500 Subject: [PATCH 1/2] Try to workaround Java's poor OS X mixer --- .../limelight/binding/audio/JavaxAudioRenderer.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/limelight/binding/audio/JavaxAudioRenderer.java b/src/com/limelight/binding/audio/JavaxAudioRenderer.java index 134b390..09620d4 100644 --- a/src/com/limelight/binding/audio/JavaxAudioRenderer.java +++ b/src/com/limelight/binding/audio/JavaxAudioRenderer.java @@ -48,7 +48,15 @@ public class JavaxAudioRenderer implements AudioRenderer { DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat); try { soundLine = (SourceDataLine) AudioSystem.getLine(info); - soundLine.open(audioFormat); + + // Java's OS X mixer performs very badly with the default buffer size + if (System.getProperty("os.name").contains("Mac OS X")) { + soundLine.open(audioFormat, 16384); + } + else { + soundLine.open(audioFormat); + } + soundLine.start(); lineBuffer = new byte[soundLine.getBufferSize()]; From 958e9a3c72b225ee6c144be0ba5b40c3f660041d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 20 Dec 2013 19:44:35 -0500 Subject: [PATCH 2/2] Revert "Try to workaround Java's poor OS X mixer" This reverts commit 8390d0bbd7f94b0cefb9ffa0efef15c176a401ca. --- .../limelight/binding/audio/JavaxAudioRenderer.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/com/limelight/binding/audio/JavaxAudioRenderer.java b/src/com/limelight/binding/audio/JavaxAudioRenderer.java index 09620d4..134b390 100644 --- a/src/com/limelight/binding/audio/JavaxAudioRenderer.java +++ b/src/com/limelight/binding/audio/JavaxAudioRenderer.java @@ -48,15 +48,7 @@ public class JavaxAudioRenderer implements AudioRenderer { DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat); try { soundLine = (SourceDataLine) AudioSystem.getLine(info); - - // Java's OS X mixer performs very badly with the default buffer size - if (System.getProperty("os.name").contains("Mac OS X")) { - soundLine.open(audioFormat, 16384); - } - else { - soundLine.open(audioFormat); - } - + soundLine.open(audioFormat); soundLine.start(); lineBuffer = new byte[soundLine.getBufferSize()];