src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -28,10 +28,11 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFileFormat.Type;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.UnsupportedAudioFileException;
 
 /**

@@ -54,20 +55,20 @@
             throw new UnsupportedAudioFileException("not an AU file");
         }
 
         final int headerSize = dis.readInt();
         final int dataSize = dis.readInt();
-        final int encoding_local = dis.readInt();
+        final int auType = dis.readInt();
         final int sampleRate = dis.readInt();
         final int channels = dis.readInt();
         if (channels <= 0) {
             throw new UnsupportedAudioFileException("Invalid number of channels");
         }
 
         final int sampleSizeInBits;
         final AudioFormat.Encoding encoding;
-        switch (encoding_local) {
+        switch (auType) {
         case AuFileFormat.AU_ULAW_8:
             encoding = AudioFormat.Encoding.ULAW;
             sampleSizeInBits = 8;
             break;
         case AuFileFormat.AU_ALAW_8:

@@ -83,24 +84,22 @@
             encoding = AudioFormat.Encoding.PCM_SIGNED;
             sampleSizeInBits = 16;
             break;
         case AuFileFormat.AU_LINEAR_24:
             encoding = AudioFormat.Encoding.PCM_SIGNED;
-
             sampleSizeInBits = 24;
             break;
         case AuFileFormat.AU_LINEAR_32:
             encoding = AudioFormat.Encoding.PCM_SIGNED;
-
             sampleSizeInBits = 32;
             break;
-            // $jb: 03.19.99: we don't support these ...
-            /*          case AuFileFormat.AU_FLOAT:
-                        encoding = new AudioFormat.FLOAT;
+            case AuFileFormat.AU_FLOAT:
+                encoding = AudioFormat.Encoding.PCM_FLOAT;
                         sampleSizeInBits = 32;
                         break;
-                        case AuFileFormat.AU_DOUBLE:
+            // we don't support these ...
+            /*          case AuFileFormat.AU_DOUBLE:
                         encoding = new AudioFormat.DOUBLE;
                         sampleSizeInBits = 8;
                         break;
                         case AuFileFormat.AU_ADPCM_G721:
                         encoding = new AudioFormat.G721_ADPCM;

@@ -134,9 +133,8 @@
         // now seek past the header
         dis.skipBytes(headerSize - AuFileFormat.AU_HEADERSIZE);
         final AudioFormat format = new AudioFormat(encoding, sampleRate,
                                                    sampleSizeInBits, channels,
                                                    frameSize, sampleRate, true);
-        return new AuFileFormat(AudioFileFormat.Type.AU, dataSize + headerSize,
-                                format, length);
+        return new AuFileFormat(Type.AU, dataSize + headerSize, format, length);
     }
 }