changeset in /hg/icedtea: Import Gervill fixes from CVS. See CHA...
Mark Wielaard
mark at klomp.org
Fri May 22 07:58:47 PDT 2009
changeset b443c3bc7e25 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b443c3bc7e25
description:
Import Gervill fixes from CVS. See CHANGES.txt:
6823446: Gervill SoftLowFrequencyOscillator fails when freq is
set to 0 cent or 8.1758 Hz.
6823445: Gervill SoftChannel/ResetAllControllers jtreg test
fails after portamento fix from last merge.
6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009
- Fix: Notes get stuck on when we overflow the synthesizer
with rapid note on /off messages.
JTreg test has been created:
test/com/sun/media/sound/SoftChannel/NoteOverFlowTest
- Fix: Portamento controller reset to wrong value in
SoftChannel.resetAllControllers.
This caused incorrect glider effect in some midi files.
For example in TuningApplet1 in TET-7 keyboard,
when note was pressed for first time a glider effect could be
heard.
- Fix: Delay modulation calculation in SoftChorus.LFODelay where
incorrect.
- Fix: Removed unnecessary volatile keywords in SoftChorus.
* fsg.sh: Don't remove (non-existing) com/sun/media/sound services.
* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services:
removed.
diffstat:
35 files changed, 622 insertions(+), 469 deletions(-)
ChangeLog | 29 +
fsg.sh | 7
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 13
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java | 46 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java | 30 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 32 --
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 2
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java | 10
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 4
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java | 4
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider | 5
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader | 2
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter | 2
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader | 5
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader | 6
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter | 4
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider | 5
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider | 3
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider | 6
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider | 6
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider | 6
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 42 +-
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 64 ++--
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++-----
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 46 +-
overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java | 24 -
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 42 +-
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 64 ++--
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 158 +++++-----
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 46 +-
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java | 55 ++-
overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java | 2
overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java | 2
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLowFrequencyOscillator/TestProcessControlLogic.java | 106 ++++++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java | 55 ++-
diffs (truncated from 1638 to 500 lines):
diff -r 6124157d5bdb -r b443c3bc7e25 ChangeLog
--- a/ChangeLog Fri May 22 01:12:07 2009 +0100
+++ b/ChangeLog Fri May 22 16:55:42 2009 +0200
@@ -1,3 +1,32 @@ 2009-05-21 Andrew John Hughes <ahughes
+2009-05-22 Mark Wielaard <mark at klomp.org>
+
+ * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/*,
+ overlays/openjdk/jdk/test/com/sun/media/sound/*:
+ Import Gervill fixes from CVS. See CHANGES.txt:
+
+ 6823446: Gervill SoftLowFrequencyOscillator fails when freq is
+ set to 0 cent or 8.1758 Hz.
+ 6823445: Gervill SoftChannel/ResetAllControllers jtreg test
+ fails after portamento fix from last merge.
+ 6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009
+
+ - Fix: Notes get stuck on when we overflow the synthesizer
+ with rapid note on /off messages.
+ JTreg test has been created:
+ test/com/sun/media/sound/SoftChannel/NoteOverFlowTest
+ - Fix: Portamento controller reset to wrong value in
+ SoftChannel.resetAllControllers.
+ This caused incorrect glider effect in some midi files.
+ For example in TuningApplet1 in TET-7 keyboard,
+ when note was pressed for first time a glider effect could be
+ heard.
+ - Fix: Delay modulation calculation in SoftChorus.LFODelay where
+ incorrect.
+ - Fix: Removed unnecessary volatile keywords in SoftChorus.
+ * fsg.sh: Don't remove (non-existing) com/sun/media/sound services.
+ * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services:
+ removed.
+
2009-05-21 Andrew John Hughes <ahughes at redhat.com>
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
diff -r 6124157d5bdb -r b443c3bc7e25 fsg.sh
--- a/fsg.sh Fri May 22 01:12:07 2009 +0100
+++ b/fsg.sh Fri May 22 16:55:42 2009 +0200
@@ -102,12 +102,5 @@ rm -rf openjdk/jdk/src/share/classes/com
rm -rf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
rm -rf openjdk/jdk/test/com/sun/jmx/snmp
-# Remove support for proprietary sound
-rm -rf openjdk/jdk/src/share/classes/com/sun/media/sound/services
-rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/MixerSynthProvider.java
-rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/RmfFileReader.java
-rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/HsbParser.java
-rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInputDeviceProvider.java
-
# Remove registration tests
rm -rf openjdk/jdk/test/com/sun/servicetag
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Fri May 22 16:55:42 2009 +0200
@@ -1,3 +1,16 @@
+6823446: Gervill SoftLowFrequencyOscillator fails when freq is set to 0 cent or 8.1758 Hz.
+6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge.
+6821030: Merge OpenJDK Gervill with upstream sources, Q1CY2009
+
+ - Fix: Notes get stuck on when we overflow the synthesizer with rapid note on/off messages.
+ JTreg test has been created:
+ test/com/sun/media/sound/SoftChannel/NoteOverFlowTest
+ - Fix: Portamento controller reset to wrong value in SoftChannel.resetAllControllers.
+ This caused incorrect glider effect in some midi files.
+ For example in TuningApplet1 in TET-7 keyboard,
+ when note was pressed for first time a glider effect could be heard.
+ - Fix: Delay modulation calculation in SoftChorus.LFODelay where incorrect.
+ - Fix: Removed unnecessary volatile keywords in SoftChorus.
- Fix: Throw IllegalArgumentException Exception on
invalid soundbank to:
SoftSynthesizer.unloadAllInstruments(Soundbank soundbank)
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java Fri May 22 16:55:42 2009 +0200
@@ -1,27 +1,27 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
+ * Copyright 2007 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
package com.sun.media.sound;
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java Fri May 22 16:55:42 2009 +0200
@@ -93,7 +93,6 @@ public class SoftChannel implements Midi
protected double portamento_time = 1; // keyschanges per control buffer time
protected int[] portamento_lastnote = new int[128];
protected int portamento_lastnote_ix = 0;
- private int portamento_control_note = -1;
private boolean portamento = false;
private boolean mono = false;
private boolean mute = false;
@@ -369,12 +368,12 @@ public class SoftChannel implements Midi
voice.setSoloMute(solomute);
if (releaseTriggered)
return;
- if (portamento_control_note != -1) {
+ if (controller[84] != 0) {
voice.co_noteon_keynumber[0]
- = (tuning.getTuning(portamento_control_note) / 100.0)
+ = (tuning.getTuning(controller[84]) / 100.0)
* (1f / 128f);
voice.portamento = true;
- portamento_control_note = -1;
+ controlChange(84, 0);
} else if (portamento) {
if (mono) {
if (portamento_lastnote[0] != -1) {
@@ -382,7 +381,7 @@ public class SoftChannel implements Midi
= (tuning.getTuning(portamento_lastnote[0]) / 100.0)
* (1f / 128f);
voice.portamento = true;
- portamento_control_note = -1;
+ controlChange(84, 0);
}
portamento_lastnote[0] = noteNumber;
} else {
@@ -449,19 +448,19 @@ public class SoftChannel implements Midi
}
}
- if (portamento_control_note != -1) {
+ if (controller[84] != 0) {
boolean n_found = false;
for (int i = 0; i < voices.length; i++) {
if (voices[i].on && voices[i].channel == channel
&& voices[i].active
- && voices[i].note == portamento_control_note
+ && voices[i].note == controller[84]
&& voices[i].releaseTriggered == false) {
voices[i].portamento = true;
voices[i].setNote(noteNumber);
n_found = true;
}
}
- portamento_control_note = -1;
+ controlChange(84, 0);
if (n_found)
return;
}
@@ -556,6 +555,18 @@ public class SoftChannel implements Midi
&& voices[i].releaseTriggered == false) {
voices[i].noteOff(velocity);
}
+ // We must also check stolen voices
+ if (voices[i].stealer_channel == this && voices[i].stealer_noteNumber == noteNumber) {
+ SoftVoice v = voices[i];
+ v.stealer_releaseTriggered = false;
+ v.stealer_channel = null;
+ v.stealer_performer = null;
+ v.stealer_voiceID = -1;
+ v.stealer_noteNumber = 0;
+ v.stealer_velocity = 0;
+ v.stealer_extendedConnectionBlocks = null;
+ v.stealer_channelmixer = null;
+ }
}
// Try play back note-off triggered voices,
@@ -1141,9 +1152,6 @@ 121 |79H |**Coarse Tuning |0
}
}
break;
- case 84:
- portamento_control_note = value;
- break;
case 98:
nrpn_control = (nrpn_control & (127 << 7)) + value;
rpn_control = RPN_NULL_VALUE;
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java Fri May 22 16:55:42 2009 +0200
@@ -38,11 +38,11 @@ public class SoftChorus implements SoftA
private float[] delaybuffer;
private int rovepos = 0;
- private volatile float gain = 1;
- private volatile float rgain = 0;
- private volatile float delay = 0;
+ private float gain = 1;
+ private float rgain = 0;
+ private float delay = 0;
private float lastdelay = 0;
- private volatile float feedback = 0;
+ private float feedback = 0;
public VariableDelay(int maxbuffersize) {
delaybuffer = new float[maxbuffersize];
@@ -115,10 +115,8 @@ public class SoftChorus implements SoftA
private static class LFODelay {
- private volatile double c_cos_delta;
- private volatile double c_sin_delta;
- private double c_cos = 1;
- private double c_sin = 0;
+ private double phase = 1;
+ private double phase_step = 0;
private double depth = 0;
private VariableDelay vdelay;
private double samplerate;
@@ -139,13 +137,11 @@ public class SoftChorus implements SoftA
public void setRate(double rate) {
double g = (Math.PI * 2) * (rate / controlrate);
- c_cos_delta = Math.cos(g);
- c_sin_delta = Math.sin(g);
+ phase_step = g;
}
public void setPhase(double phase) {
- c_cos = Math.cos(phase);
- c_sin = Math.sin(phase);
+ this.phase = phase;
}
public void setFeedBack(float feedback) {
@@ -161,16 +157,16 @@ public class SoftChorus implements SoftA
}
public void processMix(float[] in, float[] out, float[] rout) {
- c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta;
- c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta;
- vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2)));
+ phase += phase_step;
+ while(phase > (Math.PI * 2)) phase -= (Math.PI * 2);
+ vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2)));
vdelay.processMix(in, out, rout);
}
public void processReplace(float[] in, float[] out, float[] rout) {
- c_cos = c_cos * c_cos_delta - c_sin * c_sin_delta;
- c_sin = c_cos * c_sin_delta + c_sin * c_cos_delta;
- vdelay.setDelay((float) (depth * 0.5 * (c_cos + 2)));
+ phase += phase_step;
+ while(phase > (Math.PI * 2)) phase -= (Math.PI * 2);
+ vdelay.setDelay((float) (depth * 0.5 * (Math.cos(phase) + 2)));
vdelay.processReplace(in, out, rout);
}
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java Fri May 22 16:55:42 2009 +0200
@@ -613,4 +613,4 @@ public class SoftFilter {
this.last_gain = this.gain;
this.last_wet = this.wet;
}
-}
\ No newline at end of file
+}
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java Fri May 22 16:55:42 2009 +0200
@@ -45,6 +45,13 @@ public class SoftLowFrequencyOscillator
private double sin_factor = 0;
private static double PI2 = 2.0 * Math.PI;
+ public SoftLowFrequencyOscillator() {
+ // If sin_step is 0 then sin_stepfreq must be -INF
+ for (int i = 0; i < sin_stepfreq.length; i++) {
+ sin_stepfreq[i] = Double.NEGATIVE_INFINITY;
+ }
+ }
+
public void reset() {
for (int i = 0; i < used_count; i++) {
out[i][0] = 0;
@@ -53,7 +60,8 @@ public class SoftLowFrequencyOscillator
freq[i][0] = 0;
delay_counter[i] = 0;
sin_phase[i] = 0;
- sin_stepfreq[i] = 0;
+ // If sin_step is 0 then sin_stepfreq must be -INF
+ sin_stepfreq[i] = Double.NEGATIVE_INFINITY;
sin_step[i] = 0;
}
used_count = 0;
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java Fri May 22 16:55:42 2009 +0200
@@ -521,7 +521,7 @@ public class SoftMainMixer {
cur_registeredMixers = null;
}
}
-
+
if(!buffers[CHANNEL_MONO].isSilent())
{
float[] mono = buffers[CHANNEL_MONO].array();
@@ -572,7 +572,7 @@ public class SoftMainMixer {
if (voicestatus[i].active)
if (voicestatus[i].channelmixer == null)
voicestatus[i].processAudioLogic(buffers);
-
+
if(!buffers[CHANNEL_MONO].isSilent())
{
float[] mono = buffers[CHANNEL_MONO].array();
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java Fri May 22 16:55:42 2009 +0200
@@ -803,7 +803,7 @@ public class SoftVoice extends VoiceStat
if (rightdry != null)
mixAudioStream(rightdry, left, last_out_mixer_left,
out_mixer_left);
- } else {
+ } else {
if(rightdry == null &&
last_out_mixer_left == last_out_mixer_right &&
out_mixer_left == out_mixer_right)
@@ -822,7 +822,7 @@ public class SoftVoice extends VoiceStat
}
}
- if (rightdry == null) {
+ if (rightdry == null) {
mixAudioStream(leftdry, eff1, last_out_mixer_effect1,
out_mixer_effect1);
mixAudioStream(leftdry, eff2, last_out_mixer_effect2,
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# Providers for midi devices
-com.sun.media.sound.RealTimeSequencerProvider
-com.sun.media.sound.MidiOutDeviceProvider
-com.sun.media.sound.MidiInDeviceProvider
-com.sun.media.sound.SoftProvider
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-# Providers for midi sequences
-com.sun.media.sound.StandardMidiFileReader
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-# Providers for Midi file writing
-com.sun.media.sound.StandardMidiFileWriter
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# Providers for Soundbanks
-com.sun.media.sound.SF2SoundbankReader
-com.sun.media.sound.DLSSoundbankReader
-com.sun.media.sound.AudioFileSoundbankReader
-com.sun.media.sound.JARSoundbankReader
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# Providers for audio file reading
-com.sun.media.sound.AuFileReader
-com.sun.media.sound.AiffFileReader
-com.sun.media.sound.WaveFileReader
-com.sun.media.sound.WaveFloatFileReader
-com.sun.media.sound.SoftMidiAudioFileReader
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# Providers for writing audio files
-com.sun.media.sound.AuFileWriter
-com.sun.media.sound.AiffFileWriter
-com.sun.media.sound.WaveFileWriter
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# Providers for FormatConversion
-com.sun.media.sound.UlawCodec
-com.sun.media.sound.AlawCodec
-com.sun.media.sound.PCMtoPCMCodec
-com.sun.media.sound.AudioFloatFormatConverter
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# last mixer is default mixer
-com.sun.media.sound.PortMixerProvider
-com.sun.media.sound.DirectAudioDeviceProvider
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# service provider file for Linux: with DirectAudioDeviceProvider
-# last mixer is default mixer
-com.sun.media.sound.PortMixerProvider
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# service provider file for Windows: with DirectAudioDeviceProvider
-# last mixer is default mixer
-com.sun.media.sound.PortMixerProvider
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider Fri May 22 01:12:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# service provider file for Windows IA64: with DirectAudioDeviceProvider
-# last mixer is default mixer
-com.sun.media.sound.PortMixerProvider
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
diff -r 6124157d5bdb -r b443c3bc7e25 overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java
--- a/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Fri May 22 01:12:07 2009 +0100
+++ b/overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java Fri May 22 16:55:42 2009 +0200
@@ -1,10 +1,3 @@ import java.io.File;
-import java.io.File;
-
-import javax.sound.midi.Patch;
-import javax.sound.midi.Soundbank;
-
-import com.sun.media.sound.DLSSoundbankReader;
-
/*
* Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,20 +26,27 @@ import com.sun.media.sound.DLSSoundbankR
/* @test
@summary Test DLSSoundbankReader getSoundbank(File) method */
+import java.io.File;
+
+import javax.sound.midi.Patch;
+import javax.sound.midi.Soundbank;
+
+import com.sun.media.sound.DLSSoundbankReader;
+
public class TestGetSoundbankFile {
- private static void assertTrue(boolean value) throws Exception
- {
- if(!value)
- throw new RuntimeException("assertTrue fails!");
- }
-
- public static void main(String[] args) throws Exception {
- File file = new File(System.getProperty("test.src", "."), "ding.dls");
- Soundbank dls = new DLSSoundbankReader().getSoundbank(file);
- assertTrue(dls.getInstruments().length == 1);
- Patch patch = dls.getInstruments()[0].getPatch();
- assertTrue(patch.getProgram() == 0);
- assertTrue(patch.getBank() == 0);
- }
+ private static void assertTrue(boolean value) throws Exception
More information about the distro-pkg-dev
mailing list