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

*** 20,29 ****
--- 20,30 ----
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
+ 
  package com.sun.media.sound;
  
  import java.io.IOException;
  import java.util.Arrays;
  import java.util.HashMap;
*** 61,72 ****
      boolean portamento = false;
      private final SoftFilter filter_left;
      private final SoftFilter filter_right;
      private final SoftProcess eg = new SoftEnvelopeGenerator();
      private final SoftProcess lfo = new SoftLowFrequencyOscillator();
!     Map<String, SoftControl> objects =
!             new HashMap<String, SoftControl>();
      SoftSynthesizer synthesizer;
      SoftInstrument instrument;
      SoftPerformer performer;
      SoftChannel softchannel = null;
      boolean on = false;
--- 62,72 ----
      boolean portamento = false;
      private final SoftFilter filter_left;
      private final SoftFilter filter_right;
      private final SoftProcess eg = new SoftEnvelopeGenerator();
      private final SoftProcess lfo = new SoftLowFrequencyOscillator();
!     final Map<String, SoftControl> objects = new HashMap<>();
      SoftSynthesizer synthesizer;
      SoftInstrument instrument;
      SoftPerformer performer;
      SoftChannel softchannel = null;
      boolean on = false;
*** 105,114 ****
--- 105,115 ----
      double[] co_noteon_on = new double[1];
      private final SoftControl co_noteon = new SoftControl() {
          double[] keynumber = co_noteon_keynumber;
          double[] velocity = co_noteon_velocity;
          double[] on = co_noteon_on;
+         @Override
          public double[] get(int instance, String name) {
              if (name == null)
                  return null;
              if (name.equals("keynumber"))
                  return keynumber;
*** 124,139 ****
      private final double[] co_mixer_pan = new double[1];
      private final double[] co_mixer_balance = new double[1];
      private final double[] co_mixer_reverb = new double[1];
      private final double[] co_mixer_chorus = new double[1];
      private final SoftControl co_mixer = new SoftControl() {
!         double[] active = co_mixer_active;
!         double[] gain = co_mixer_gain;
!         double[] pan = co_mixer_pan;
!         double[] balance = co_mixer_balance;
!         double[] reverb = co_mixer_reverb;
!         double[] chorus = co_mixer_chorus;
          public double[] get(int instance, String name) {
              if (name == null)
                  return null;
              if (name.equals("active"))
                  return active;
--- 125,141 ----
      private final double[] co_mixer_pan = new double[1];
      private final double[] co_mixer_balance = new double[1];
      private final double[] co_mixer_reverb = new double[1];
      private final double[] co_mixer_chorus = new double[1];
      private final SoftControl co_mixer = new SoftControl() {
!         final double[] active = co_mixer_active;
!         final double[] gain = co_mixer_gain;
!         final double[] pan = co_mixer_pan;
!         final double[] balance = co_mixer_balance;
!         final double[] reverb = co_mixer_reverb;
!         final double[] chorus = co_mixer_chorus;
!         @Override
          public double[] get(int instance, String name) {
              if (name == null)
                  return null;
              if (name.equals("active"))
                  return active;
*** 150,160 ****
              return null;
          }
      };
      private final double[] co_osc_pitch = new double[1];
      private final SoftControl co_osc = new SoftControl() {
!         double[] pitch = co_osc_pitch;
          public double[] get(int instance, String name) {
              if (name == null)
                  return null;
              if (name.equals("pitch"))
                  return pitch;
--- 152,163 ----
              return null;
          }
      };
      private final double[] co_osc_pitch = new double[1];
      private final SoftControl co_osc = new SoftControl() {
!         final double[] pitch = co_osc_pitch;
!         @Override
          public double[] get(int instance, String name) {
              if (name == null)
                  return null;
              if (name.equals("pitch"))
                  return pitch;
*** 163,175 ****
      };
      private final double[] co_filter_freq = new double[1];
      private final double[] co_filter_type = new double[1];
      private final double[] co_filter_q = new double[1];
      private final SoftControl co_filter = new SoftControl() {
!         double[] freq = co_filter_freq;
!         double[] ftype = co_filter_type;
!         double[] q = co_filter_q;
          public double[] get(int instance, String name) {
              if (name == null)
                  return null;
              if (name.equals("freq"))
                  return freq;
--- 166,179 ----
      };
      private final double[] co_filter_freq = new double[1];
      private final double[] co_filter_type = new double[1];
      private final double[] co_filter_q = new double[1];
      private final SoftControl co_filter = new SoftControl() {
!         final double[] freq = co_filter_freq;
!         final double[] ftype = co_filter_type;
!         final double[] q = co_filter_q;
!         @Override
          public double[] get(int instance, String name) {
              if (name == null)
                  return null;
              if (name.equals("freq"))
                  return freq;
*** 911,918 ****
          last_out_mixer_effect2 = out_mixer_effect2;
  
          if (out_mixer_end) {
              stopping = true;
          }
- 
      }
  }
--- 915,921 ----