shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-01-05 00:09:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup and better logging - no longer prints stacktrace

Browse source 
changed AudioInputStream method to use available() instead of calculating it.
This commit is contained in:
Brian Matzon 2010-02-20 10:43:22 +00:00
parent 604e52013a
commit 7a507bd7d1
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/java/org/lwjgl/util/WaveData.java
View file

@ -96,8 +96,7 @@ public class WaveData {
AudioSystem.getAudioInputStream(
new BufferedInputStream(path.openStream())));
} catch (Exception e) {
org.lwjgl.LWJGLUtil.log("Unable to create from: " + path);
e.printStackTrace();
org.lwjgl.LWJGLUtil.log("Unable to create from: " + path + ", " + e.getMessage());
return null;
}
}
@ -123,8 +122,7 @@ public class WaveData {
return create(
AudioSystem.getAudioInputStream(is));
} catch (Exception e) {
org.lwjgl.LWJGLUtil.log("Unable to create from inputstream");
e.printStackTrace();
org.lwjgl.LWJGLUtil.log("Unable to create from inputstream, " + e.getMessage());
return null;
}
}
@ -141,7 +139,7 @@ public class WaveData {
AudioSystem.getAudioInputStream(
new BufferedInputStream(new ByteArrayInputStream(buffer))));
} catch (Exception e) {
e.printStackTrace();
org.lwjgl.LWJGLUtil.log("Unable to create from byte array, " + e.getMessage());
return null;
}
}
@ -166,7 +164,7 @@ public class WaveData {
}
return create(bytes);
} catch (Exception e) {
e.printStackTrace();
org.lwjgl.LWJGLUtil.log("Unable to create from ByteBuffer, " + e.getMessage());
return null;
}
}
@ -204,26 +202,23 @@ public class WaveData {
}
//read data into buffer
byte[] buf =
new byte[audioformat.getChannels()
* (int) ais.getFrameLength()
* audioformat.getSampleSizeInBits()
/ 8];
int read = 0, total = 0;
ByteBuffer buffer = null;
try {
int available = ais.available();
if(available <= 0) {
available = ais.getFormat().getChannels() * (int) ais.getFrameLength() * ais.getFormat().getSampleSizeInBits() / 8;
}
byte[] buf = new byte[ais.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);
} catch (IOException ioe) {
return null;
}
//insert data into bytebuffer
ByteBuffer buffer = convertAudioBytes(buf, audioformat.getSampleSizeInBits() == 16);
/* ByteBuffer buffer = ByteBuffer.allocateDirect(buf.length);
buffer.put(buf);
buffer.rewind();*/
//create our result
WaveData wavedata =