summaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-01-28 02:08:07 +0100
committerSven Gothel <[email protected]>2015-01-28 02:08:07 +0100
commit8de464ff1b87aa8312f8b935bfe04cf60c28fe9f (patch)
tree9f254e8a5ba00a2708d98c1a3a09f25b64261e32 /src/java
parentb9f915e11d0ad2f7f8b270e550e54ca39cbb68c3 (diff)
WAVLoader: Adopt to GlueGen's Bitstream commit 9e13e8c78ed69bb7afcd49abe8bf69340dc06223
Diffstat (limited to 'src/java')
-rw-r--r--src/java/com/jogamp/openal/util/WAVLoader.java22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/java/com/jogamp/openal/util/WAVLoader.java b/src/java/com/jogamp/openal/util/WAVLoader.java
index bb3507e..ef8d12a 100644
--- a/src/java/com/jogamp/openal/util/WAVLoader.java
+++ b/src/java/com/jogamp/openal/util/WAVLoader.java
@@ -103,7 +103,7 @@ public class WAVLoader {
try {
final boolean bigEndian; // FIXME: for all data incl. signatures ?
- final long riffMarker = bs.readUInt32(true /* msbFirst */, true /* bigEndian */);
+ final long riffMarker = bs.readUInt32(true /* bigEndian */);
if ( RIFF == riffMarker ) {
bigEndian = false;
} else if( RIFX == riffMarker ) {
@@ -111,9 +111,9 @@ public class WAVLoader {
} else {
throw new ALException("Invalid RIF header: 0x"+Integer.toHexString((int)riffMarker)+", "+bs);
}
- final long riffLenL = bs.readUInt32(true /*msbFirst*/, bigEndian);
+ final long riffLenL = bs.readUInt32(bigEndian);
final int riffLenI = Bitstream.uint32LongToInt(riffLenL);
- final long wavMarker = bs.readUInt32(true /* msbFirst */, true /* bigEndian */);
+ final long wavMarker = bs.readUInt32(true /* bigEndian */);
if ( WAVE != wavMarker ) {
throw new ALException("Invalid WAV header: 0x"+Integer.toHexString((int)wavMarker)+", "+bs);
}
@@ -125,20 +125,20 @@ public class WAVLoader {
long chunkLength = 0;
while (!foundData) {
- final int chunkId = (int)bs.readUInt32(true /* msbFirst */, true /* bigEndian */);
- chunkLength = bs.readUInt32(true /* msbFirst */, bigEndian);
+ final int chunkId = (int)bs.readUInt32(true /* bigEndian */);
+ chunkLength = bs.readUInt32(bigEndian);
switch (chunkId) {
case FMT:
foundFmt = true;
@SuppressWarnings("unused")
- final int compressionCode = bs.readUInt16(true /* msbFirst */, bigEndian);
- sChannels = (short)bs.readUInt16(true /* msbFirst */, bigEndian);
- sampleRate = bs.readUInt32(true /* msbFirst */, bigEndian);
+ final int compressionCode = bs.readUInt16(bigEndian);
+ sChannels = (short)bs.readUInt16(bigEndian);
+ sampleRate = bs.readUInt32(bigEndian);
@SuppressWarnings("unused")
- final long bytesPerSeconds = bs.readUInt32(true /* msbFirst */, bigEndian);
+ final long bytesPerSeconds = bs.readUInt32(bigEndian);
@SuppressWarnings("unused")
- final short blockAlignment = (short) bs.readUInt16(true /* msbFirst */, bigEndian);
- sSampleSizeInBits = (short) bs.readUInt16(true /* msbFirst */, bigEndian);
+ final short blockAlignment = (short) bs.readUInt16(bigEndian);
+ sSampleSizeInBits = (short) bs.readUInt16(bigEndian);
bs.skip( 8 * ( chunkLength - 16 ) );
break;
case FACT: