AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use modern API to read all the bytes rather than buggily hand-rolling it.

Browse Source
This commit is contained in:
Ray J. Greenwell
2026-05-10 18:33:59 -07:00
parent 908c16569b
commit 4b3ab93baa
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/threerings/openal/util/WaveData.java
+5 -15
View File
@@ -205,28 +205,18 @@ public class WaveData {
assert false : "Only mono or stereo is supported"; assert false : "Only mono or stereo is supported";
} }
//read data into buffer ByteBuffer buffer;
ByteBuffer buffer = null;
try { try {
int available = ais.available(); buffer = convertAudioBytes(ais.readAllBytes(),
if(available <= 0) { audioformat.getSampleSizeInBits() == 16,
available = ais.getFormat().getChannels() * (int) ais.getFrameLength() * ais.getFormat().getSampleSizeInBits() / 8; audioformat.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN);
}
byte[] buf = new byte[available];
int read = 0, total = 0;
while ((read = ais.read(buf, total, buf.length - total)) != -1
&& total < buf.length) {
total += read;
}
buffer = convertAudioBytes(buf, audioformat.getSampleSizeInBits() == 16, audioformat.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN);
} catch (IOException ioe) { } catch (IOException ioe) {
return null; return null;
} }
//create our result //create our result
WaveData wavedata = WaveData wavedata = new WaveData(buffer, channels, (int)audioformat.getSampleRate());
new WaveData(buffer, channels, (int) audioformat.getSampleRate());
//close stream //close stream
try { try {