jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java
changeset 32865 f9cb6e427f9e
parent 25859 3317bb8137f4
child 40444 afabcfc2f3ef
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java	Fri Sep 18 11:31:15 2015 -0700
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SF2Region.java	Sat Sep 19 15:45:59 2015 -0700
@@ -36,67 +36,67 @@
  */
 public class SF2Region {
 
-    public final static int GENERATOR_STARTADDRSOFFSET = 0;
-    public final static int GENERATOR_ENDADDRSOFFSET = 1;
-    public final static int GENERATOR_STARTLOOPADDRSOFFSET = 2;
-    public final static int GENERATOR_ENDLOOPADDRSOFFSET = 3;
-    public final static int GENERATOR_STARTADDRSCOARSEOFFSET = 4;
-    public final static int GENERATOR_MODLFOTOPITCH = 5;
-    public final static int GENERATOR_VIBLFOTOPITCH = 6;
-    public final static int GENERATOR_MODENVTOPITCH = 7;
-    public final static int GENERATOR_INITIALFILTERFC = 8;
-    public final static int GENERATOR_INITIALFILTERQ = 9;
-    public final static int GENERATOR_MODLFOTOFILTERFC = 10;
-    public final static int GENERATOR_MODENVTOFILTERFC = 11;
-    public final static int GENERATOR_ENDADDRSCOARSEOFFSET = 12;
-    public final static int GENERATOR_MODLFOTOVOLUME = 13;
-    public final static int GENERATOR_UNUSED1 = 14;
-    public final static int GENERATOR_CHORUSEFFECTSSEND = 15;
-    public final static int GENERATOR_REVERBEFFECTSSEND = 16;
-    public final static int GENERATOR_PAN = 17;
-    public final static int GENERATOR_UNUSED2 = 18;
-    public final static int GENERATOR_UNUSED3 = 19;
-    public final static int GENERATOR_UNUSED4 = 20;
-    public final static int GENERATOR_DELAYMODLFO = 21;
-    public final static int GENERATOR_FREQMODLFO = 22;
-    public final static int GENERATOR_DELAYVIBLFO = 23;
-    public final static int GENERATOR_FREQVIBLFO = 24;
-    public final static int GENERATOR_DELAYMODENV = 25;
-    public final static int GENERATOR_ATTACKMODENV = 26;
-    public final static int GENERATOR_HOLDMODENV = 27;
-    public final static int GENERATOR_DECAYMODENV = 28;
-    public final static int GENERATOR_SUSTAINMODENV = 29;
-    public final static int GENERATOR_RELEASEMODENV = 30;
-    public final static int GENERATOR_KEYNUMTOMODENVHOLD = 31;
-    public final static int GENERATOR_KEYNUMTOMODENVDECAY = 32;
-    public final static int GENERATOR_DELAYVOLENV = 33;
-    public final static int GENERATOR_ATTACKVOLENV = 34;
-    public final static int GENERATOR_HOLDVOLENV = 35;
-    public final static int GENERATOR_DECAYVOLENV = 36;
-    public final static int GENERATOR_SUSTAINVOLENV = 37;
-    public final static int GENERATOR_RELEASEVOLENV = 38;
-    public final static int GENERATOR_KEYNUMTOVOLENVHOLD = 39;
-    public final static int GENERATOR_KEYNUMTOVOLENVDECAY = 40;
-    public final static int GENERATOR_INSTRUMENT = 41;
-    public final static int GENERATOR_RESERVED1 = 42;
-    public final static int GENERATOR_KEYRANGE = 43;
-    public final static int GENERATOR_VELRANGE = 44;
-    public final static int GENERATOR_STARTLOOPADDRSCOARSEOFFSET = 45;
-    public final static int GENERATOR_KEYNUM = 46;
-    public final static int GENERATOR_VELOCITY = 47;
-    public final static int GENERATOR_INITIALATTENUATION = 48;
-    public final static int GENERATOR_RESERVED2 = 49;
-    public final static int GENERATOR_ENDLOOPADDRSCOARSEOFFSET = 50;
-    public final static int GENERATOR_COARSETUNE = 51;
-    public final static int GENERATOR_FINETUNE = 52;
-    public final static int GENERATOR_SAMPLEID = 53;
-    public final static int GENERATOR_SAMPLEMODES = 54;
-    public final static int GENERATOR_RESERVED3 = 55;
-    public final static int GENERATOR_SCALETUNING = 56;
-    public final static int GENERATOR_EXCLUSIVECLASS = 57;
-    public final static int GENERATOR_OVERRIDINGROOTKEY = 58;
-    public final static int GENERATOR_UNUSED5 = 59;
-    public final static int GENERATOR_ENDOPR = 60;
+    public static final int GENERATOR_STARTADDRSOFFSET = 0;
+    public static final int GENERATOR_ENDADDRSOFFSET = 1;
+    public static final int GENERATOR_STARTLOOPADDRSOFFSET = 2;
+    public static final int GENERATOR_ENDLOOPADDRSOFFSET = 3;
+    public static final int GENERATOR_STARTADDRSCOARSEOFFSET = 4;
+    public static final int GENERATOR_MODLFOTOPITCH = 5;
+    public static final int GENERATOR_VIBLFOTOPITCH = 6;
+    public static final int GENERATOR_MODENVTOPITCH = 7;
+    public static final int GENERATOR_INITIALFILTERFC = 8;
+    public static final int GENERATOR_INITIALFILTERQ = 9;
+    public static final int GENERATOR_MODLFOTOFILTERFC = 10;
+    public static final int GENERATOR_MODENVTOFILTERFC = 11;
+    public static final int GENERATOR_ENDADDRSCOARSEOFFSET = 12;
+    public static final int GENERATOR_MODLFOTOVOLUME = 13;
+    public static final int GENERATOR_UNUSED1 = 14;
+    public static final int GENERATOR_CHORUSEFFECTSSEND = 15;
+    public static final int GENERATOR_REVERBEFFECTSSEND = 16;
+    public static final int GENERATOR_PAN = 17;
+    public static final int GENERATOR_UNUSED2 = 18;
+    public static final int GENERATOR_UNUSED3 = 19;
+    public static final int GENERATOR_UNUSED4 = 20;
+    public static final int GENERATOR_DELAYMODLFO = 21;
+    public static final int GENERATOR_FREQMODLFO = 22;
+    public static final int GENERATOR_DELAYVIBLFO = 23;
+    public static final int GENERATOR_FREQVIBLFO = 24;
+    public static final int GENERATOR_DELAYMODENV = 25;
+    public static final int GENERATOR_ATTACKMODENV = 26;
+    public static final int GENERATOR_HOLDMODENV = 27;
+    public static final int GENERATOR_DECAYMODENV = 28;
+    public static final int GENERATOR_SUSTAINMODENV = 29;
+    public static final int GENERATOR_RELEASEMODENV = 30;
+    public static final int GENERATOR_KEYNUMTOMODENVHOLD = 31;
+    public static final int GENERATOR_KEYNUMTOMODENVDECAY = 32;
+    public static final int GENERATOR_DELAYVOLENV = 33;
+    public static final int GENERATOR_ATTACKVOLENV = 34;
+    public static final int GENERATOR_HOLDVOLENV = 35;
+    public static final int GENERATOR_DECAYVOLENV = 36;
+    public static final int GENERATOR_SUSTAINVOLENV = 37;
+    public static final int GENERATOR_RELEASEVOLENV = 38;
+    public static final int GENERATOR_KEYNUMTOVOLENVHOLD = 39;
+    public static final int GENERATOR_KEYNUMTOVOLENVDECAY = 40;
+    public static final int GENERATOR_INSTRUMENT = 41;
+    public static final int GENERATOR_RESERVED1 = 42;
+    public static final int GENERATOR_KEYRANGE = 43;
+    public static final int GENERATOR_VELRANGE = 44;
+    public static final int GENERATOR_STARTLOOPADDRSCOARSEOFFSET = 45;
+    public static final int GENERATOR_KEYNUM = 46;
+    public static final int GENERATOR_VELOCITY = 47;
+    public static final int GENERATOR_INITIALATTENUATION = 48;
+    public static final int GENERATOR_RESERVED2 = 49;
+    public static final int GENERATOR_ENDLOOPADDRSCOARSEOFFSET = 50;
+    public static final int GENERATOR_COARSETUNE = 51;
+    public static final int GENERATOR_FINETUNE = 52;
+    public static final int GENERATOR_SAMPLEID = 53;
+    public static final int GENERATOR_SAMPLEMODES = 54;
+    public static final int GENERATOR_RESERVED3 = 55;
+    public static final int GENERATOR_SCALETUNING = 56;
+    public static final int GENERATOR_EXCLUSIVECLASS = 57;
+    public static final int GENERATOR_OVERRIDINGROOTKEY = 58;
+    public static final int GENERATOR_UNUSED5 = 59;
+    public static final int GENERATOR_ENDOPR = 60;
     protected Map<Integer, Short> generators = new HashMap<Integer, Short>();
     protected List<SF2Modulator> modulators = new ArrayList<SF2Modulator>();
 
@@ -108,7 +108,7 @@
         return generators.containsKey(generator);
     }
 
-    static public short getDefaultValue(int generator) {
+    public static short getDefaultValue(int generator) {
         if (generator == 8) return (short)13500;
         if (generator == 21) return (short)-12000;
         if (generator == 23) return (short)-12000;