summaryrefslogtreecommitdiffstats
path: root/src/classes/share/com/sun/j3d/audioengines
diff options
context:
space:
mode:
Diffstat (limited to 'src/classes/share/com/sun/j3d/audioengines')
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/AudioEngine.java11
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java28
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java14
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java1
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java5
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java3
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java5
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java2
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java4
-rw-r--r--src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java27
10 files changed, 100 insertions, 0 deletions
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
index a3ebe03..f81fe4f 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine.java
@@ -104,12 +104,14 @@ public abstract class AudioEngine implements AudioDevice {
* Code to initialize the device
* @return flag: true is initialized sucessfully, false if error
*/
+ @Override
public abstract boolean initialize();
/**
* Code to close the device
* @return flag: true is closed sucessfully, false if error
*/
+ @Override
public abstract boolean close();
/*
@@ -120,6 +122,7 @@ public abstract class AudioEngine implements AudioDevice {
* Valid types are HEADPHONE, MONO_SPEAKER, STEREO_SPEAKERS
* @param type of audio output device
*/
+ @Override
public void setAudioPlaybackType(int type) {
audioPlaybackType = type;
}
@@ -128,6 +131,7 @@ public abstract class AudioEngine implements AudioDevice {
* Get Type of Audio Playback Output Device
* returns audio playback type to which sound is currently output
*/
+ @Override
public int getAudioPlaybackType() {
return audioPlaybackType;
}
@@ -136,6 +140,7 @@ public abstract class AudioEngine implements AudioDevice {
* Set Distance from the Center Ear to a Speaker
* @param distance from the center ear and to the speaker
*/
+ @Override
public void setCenterEarToSpeaker(float distance) {
distanceToSpeaker = distance;
}
@@ -144,6 +149,7 @@ public abstract class AudioEngine implements AudioDevice {
* Get Distance from Ear to Speaker
* returns value set as distance from listener's ear to speaker
*/
+ @Override
public float getCenterEarToSpeaker() {
return distanceToSpeaker;
}
@@ -151,6 +157,7 @@ public abstract class AudioEngine implements AudioDevice {
/**
* Set Angle Offset To Speaker
* @param angle in radian between head coordinate Z axis and vector to speaker */
+ @Override
public void setAngleOffsetToSpeaker(float angle) {
angleOffsetToSpeaker = angle;
}
@@ -159,6 +166,7 @@ public abstract class AudioEngine implements AudioDevice {
* Get Angle Offset To Speaker
* returns value set as angle between vector to speaker and Z head axis
*/
+ @Override
public float getAngleOffsetToSpeaker() {
return angleOffsetToSpeaker;
}
@@ -169,6 +177,7 @@ public abstract class AudioEngine implements AudioDevice {
* returns number of maximum sound channels you can run with this
* library/device-driver.
*/
+ @Override
public int getTotalChannels() {
// this method should be overridden by a device specific implementation
return (totalChannels);
@@ -179,6 +188,7 @@ public abstract class AudioEngine implements AudioDevice {
* returns number of sound channels currently available (number
* not being used by active sounds.
*/
+ @Override
public int getChannelsAvailable() {
return (channelsAvailable);
}
@@ -190,6 +200,7 @@ public abstract class AudioEngine implements AudioDevice {
* returns number of sound channels used by a specific Sound node
* @deprecated This method is now part of the Sound class
*/
+ @Override
public int getChannelsUsedForSound(Sound sound) {
if (sound != null)
return sound.getNumberOfChannelsUsed();
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
index 09ff332..dcf334a 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3D.java
@@ -106,6 +106,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* Save a reference to the current View object.
* @param reference to current view object
*/
+ @Override
public void setView(View reference) {
currentView = reference;
return;
@@ -133,6 +134,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param soundData descrition of sound source data
* @return index into sample vector of Sample object for sound
*/
+ @Override
public int prepareSound(int soundType, MediaContainer soundData) {
// This method must be overridden by device specific implementation
return Sample.NULL_SAMPLE;
@@ -143,6 +145,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* Removes/clears associated sound data with this sound source node
* @param index device specific reference number to device driver sample
*/
+ @Override
public abstract void clearSound(int index);
/**
@@ -150,6 +153,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @param trans is a reference to virtual world composite transform
*/
+ @Override
public void setVworldXfrm(int index, Transform3D trans) {
Sample sample = getSample(index);
if (sample != null)
@@ -161,6 +165,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @return status: < 0 denotes an error
*/
+ @Override
public abstract int startSample(int index);
/**
@@ -168,6 +173,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @return status: < 0 denotes an error
*/
+ @Override
public abstract int stopSample(int index);
/**
@@ -176,30 +182,35 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
*/
// TODO: The update method exists on a TEMPORARY basis.
+ @Override
public abstract void updateSample(int index);
/**
* Mute sample.
* @param index device specific reference number to device driver sample
*/
+ @Override
public abstract void muteSample(int index);
/**
* Unmute sample.
* @param index device specific reference number to device driver sample
*/
+ @Override
public abstract void unmuteSample(int index);
/**
* Pause sample.
* @param index device specific reference number to device driver sample
*/
+ @Override
public abstract void pauseSample(int index);
/**
* Unpause sample.
* @param index device specific reference number to device driver sample
*/
+ @Override
public abstract void unpauseSample(int index);
/*
@@ -213,6 +224,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @param scaleFactor floating point multiplier applied to sample amplitude
*/
+ @Override
public void setSampleGain(int index, float scaleFactor) {
Sample sample = getSample(index);
if (sample != null)
@@ -225,6 +237,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @param count number of times sample is repeated
*/
+ @Override
public void setLoop(int index, int count) {
Sample sample = getSample(index);
if (sample != null)
@@ -237,6 +250,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @param position point location in virtual world coordinate of sample
*/
+ @Override
public void setPosition(int index, Point3d position) {
Sample sample = getSample(index);
if (sample != null)
@@ -253,6 +267,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* thru which ellipses pass
* @param backAttenuationScaleFactor gain scale factors
*/
+ @Override
public void setDistanceGain(int index,
double[] frontDistance, float[] frontAttenuationScaleFactor,
double[] backDistance, float[] backAttenuationScaleFactor) {
@@ -268,6 +283,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @param direction vector in virtual world coordinate.
*/
+ @Override
public void setDirection(int index, Vector3d direction) {
Sample sample = getSample(index);
if (sample != null)
@@ -286,6 +302,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param filterCutoff array containing filter cutoff frequencies.
* The filter values for each tuples can be set to Sound.NO_FILTER.
*/
+ @Override
public void setAngularAttenuation(int index, int filterType,
double[] angle, float[] attenuationScaleFactor, float[] filterCutoff) {
Sample sample = getSample(index);
@@ -299,6 +316,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* Set rolloff value for current aural attribute applied to all samples.
* @param rolloff scale factor applied to standard speed of sound.
*/
+ @Override
public void setRolloff(float rolloff) {
attribs.rolloff = rolloff;
return;
@@ -310,6 +328,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param coefficient applied to amplitude of reverbation added at each
* iteration of reverb processing.
*/
+ @Override
public void setReflectionCoefficient(float coefficient) {
attribs.reflectionCoefficient = coefficient;
return;
@@ -321,6 +340,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param reverbDelay amount of time in millisecond between each
* iteration of reverb processing.
*/
+ @Override
public void setReverbDelay(float reverbDelay) {
attribs.reverbDelay = reverbDelay;
return;
@@ -331,6 +351,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* samples.
* @param reverbOrder number of times reverb process loop is iterated.
*/
+ @Override
public void setReverbOrder(int reverbOrder) {
attribs.reverbOrder = reverbOrder;
return;
@@ -342,6 +363,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* to all sample based on distance between listener and sound.
* @param dist is an attenuation array of distance and low-pass filter values.
*/
+ @Override
public void setDistanceFilter(int filterType,
double[] dist, float[] filterCutoff) {
attribs.setDistanceFilter(filterType, dist, filterCutoff);
@@ -354,6 +376,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param scaleFactor frequency scale factor applied to samples normal
* playback rate.
*/
+ @Override
public void setFrequencyScaleFactor(float scaleFactor) {
attribs.frequencyScaleFactor = scaleFactor;
return;
@@ -365,6 +388,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* listener-to-soundSource velocity.
* playback rate.
*/
+ @Override
public void setVelocityScaleFactor(float scaleFactor) {
attribs.velocityScaleFactor = scaleFactor;
return;
@@ -375,6 +399,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @return number of channels currently being used by this sample.
*/
+ @Override
public int getNumberOfChannelsUsed(int index) {
// This method must be overridden by device specific implementation
Sample sample = getSample(index);
@@ -394,6 +419,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @return number of channels that would be used by this sample if it
* were playing.
*/
+ @Override
public int getNumberOfChannelsUsed(int index, boolean muteFlag) {
// This method must be overridden by device specific implementation
Sample sample = getSample(index);
@@ -408,6 +434,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @return length of sample in milliseconds
*/
+ @Override
public long getSampleDuration(int index) {
Sample sample = getSample(index);
if (sample != null)
@@ -421,6 +448,7 @@ public abstract class AudioEngine3D extends AudioEngine implements AudioDevice3D
* @param index device specific reference number to device driver sample
* @return system clock time sample started
*/
+ @Override
public long getStartTime(int index) {
Sample sample = getSample(index);
if (sample != null)
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
index ad8ef2b..1bffd52 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngine3DL2.java
@@ -87,6 +87,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* Causes all cached sounds to be paused and all streaming sounds to be
* stopped.
*/
+ @Override
public abstract void pause();
/**
@@ -95,6 +96,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* Causes all paused cached sounds to be resumed and all streaming
* sounds restarted.
*/
+ @Override
public abstract void resume();
/**
@@ -102,6 +104,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param scaleFactor scale factor applied to calculated amplitudes for
* all sounds playing on this device
*/
+ @Override
public abstract void setGain(float scaleFactor);
/*
@@ -123,6 +126,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* amplitudes for all sounds playing on this device
* @see Sound#setRateScaleFactor
*/
+ @Override
public void setRateScaleFactor(int index, float scaleFactor) {
Sample sample = getSample(index);
if (sample != null)
@@ -150,6 +154,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param coefficient late reflection attenuation factor
* @see AuralAttributes#setReverbCoefficient
*/
+ @Override
public void setReverbCoefficient(float coefficient) {
attribs.reverbCoefficient = coefficient;
return;
@@ -164,6 +169,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param reflectionDelay time between each order of early reflection
* @see AuralAttributes#setReflectionDelay
*/
+ @Override
public void setReflectionDelay(float reflectionDelay) {
attribs.reflectionDelay = reflectionDelay;
return;
@@ -175,6 +181,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param time decay time in milliseconds
* @see AuralAttributes#setDecayTime
*/
+ @Override
public void setDecayTime(float time) {
attribs.decayTime = time;
return;
@@ -190,6 +197,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* low-pass filter is applied.
* @see AuralAttributes#setDecayFilter
*/
+ @Override
public void setDecayFilter(float frequencyCutoff) {
attribs.decayFrequencyCutoff = frequencyCutoff;
return;
@@ -203,6 +211,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param diffusion percentage expressed within the range of 0.0 and 1.0
* @see AuralAttributes#setDiffusion
*/
+ @Override
public void setDiffusion(float diffusion) {
attribs.diffusion = diffusion;
return;
@@ -218,6 +227,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* within the range of 0.0 and 1.0
* @see AuralAttributes#setDensity
*/
+ @Override
public void setDensity(float density) {
attribs.density = density;
return;
@@ -233,6 +243,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param index device specific reference to device driver sample
* @param scaleFactor non-negative factor applied to direct sound gain
*/
+ @Override
public void setObstructionGain(int index, float scaleFactor) {
Sample sample = getSample(index);
if (sample != null)
@@ -252,6 +263,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* low-pass filter is applied.
*/
+ @Override
public void setObstructionFilter(int index, float frequencyCutoff) {
Sample sample = getSample(index);
if (sample != null)
@@ -268,6 +280,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param index device specific reference to device driver sample
* @param scaleFactor non-negative factor applied to direct sound gain
*/
+ @Override
public void setOcclusionGain(int index, float scaleFactor) {
Sample sample = getSample(index);
if (sample != null)
@@ -286,6 +299,7 @@ public abstract class AudioEngine3DL2 extends AudioEngine3D implements AudioDevi
* @param frequencyCutoff value of frequencies in Hertz above which a
* low-pass filter is applied.
*/
+ @Override
public void setOcclusionFilter(int index, float frequencyCutoff) {
Sample sample = getSample(index);
if (sample != null)
diff --git a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java b/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
index df0b653..be16a6e 100644
--- a/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
+++ b/src/classes/share/com/sun/j3d/audioengines/AudioEngineThread.java
@@ -209,6 +209,7 @@ public class AudioEngineThread extends Thread {
* This thread controls the syncing of all the canvases attached to
* this view.
*/
+ @Override
public void run() {
if (debugFlag)
debugPrint("AudioEngineThread.run");
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
index 4e3ff3d..ba988c0 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSClip.java
@@ -75,6 +75,7 @@ class JSClip extends JSChannel {
* for a stream that is a sourceDataline
* @return true is successful in initiallizing DataLine
*/
+ @Override
DataLine initDataLine(AudioInputStream ais) {
if (debugFlag)
debugPrintln("JSClip: initDataLine(" + ais + ")");
@@ -163,6 +164,7 @@ class JSClip extends JSChannel {
* actual Java Sound start methods called are as immediate (without
* delay between as possible.
*/
+ @Override
boolean startSamples(int loopCount, float leftGain, float rightGain,
int leftDelay, int rightDelay) {
// loop count is ignored for Stream and MIDI
@@ -272,6 +274,7 @@ XXXX audioLeftStream.start(leftVolume, panLeft, reverbLeft);
* Since the sound has no auralAttributes applied to it reverb
* is not applied to the sample.
*/
+ @Override
boolean startSample(int loopCount, float gain, int delay) {
/*
if (debugFlag) {
@@ -297,6 +300,7 @@ XXXX audioLeftStream.start(leftVolume, panLeft, reverbLeft);
return true;
} // end of start (single) Sample
+ @Override
int stopSample() {
// This will tell thread to stop reading and writing
// reload with old URL - reloadSample()???
@@ -309,6 +313,7 @@ XXXX audioLeftStream.start(leftVolume, panLeft, reverbLeft);
return 0;
}
+ @Override
int stopSamples() {
// This will tell thread to stop reading and writing
// TODO: For muting, stop sound but don't clear startTime...
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
index 97e050d..05796c5 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSDirectionalSample.java
@@ -585,6 +585,7 @@ class JSDirectionalSample extends JSPositionalSample
* both front and back attenuation linear distance and gain scale factor
* arrays.
*/
+ @Override
float calculateDistanceAttenuation(float distance) {
float factor = findFactor(distance, this.attenuationDistance,
this.attenuationGain, this.backAttenuationDistance,
@@ -600,6 +601,7 @@ class JSDirectionalSample extends JSPositionalSample
* Simply calls generic (for PointSound) 'findFactor()' with
* a single set of angular attenuation distance and gain scalefactor arrays.
*/
+ @Override
float calculateAngularGain() {
float angle = findAngularOffset();
float factor = findFactor(angle, this.angularDistance, this.angularGain);
@@ -653,6 +655,7 @@ class JSDirectionalSample extends JSPositionalSample
* Calculate Filter
*
* *****************/
+ @Override
/*
* Calculates the low-pass cutoff frequency filter value applied to the
* a sound based on both:
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
index 5992302..70519cc 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSPositionalSample.java
@@ -179,9 +179,11 @@ class JSPositionalSample extends JSSample
/*
* Process request for Filtering fields
*/
+ @Override
boolean getFilterFlag() {
return filterFlag;
}
+ @Override
float getFilterFreq() {
return filterFreq;
}
@@ -191,6 +193,7 @@ class JSPositionalSample extends JSSample
* Clears the fields associated with sample data for this sound, and
* frees any device specific data associated with this sample.
*/
+ @Override
public void clear() {
if (debugFlag)
debugPrint("JSPositionalSample.clear() enter");
@@ -215,6 +218,7 @@ class JSPositionalSample extends JSSample
* Reset time and count based fields associated with sample data
* for this sound
*/
+ @Override
void reset() {
if (debugFlag)
debugPrint("JSPositionalSample.reset() enter");
@@ -645,6 +649,7 @@ class JSPositionalSample extends JSSample
* Calculate the audiodevice parameters necessary to spatially play this
* sound.
*/
+ @Override
public void render(int dirtyFlags, View view, AuralParameters attribs) {
if (debugFlag)
debugPrint("JSPositionalSample.render");
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
index 9a69ca7..c904b8c 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSSample.java
@@ -139,6 +139,7 @@ class JSSample extends com.sun.j3d.audioengines.Sample
* correct values before JavaSoundMixer either start or updates the
* sample thru calls to JSThread.
*/
+ @Override
public void render(int dirtyFlags, View view, AuralParameters attribs) {
if (debugFlag)
debugPrint("JSSample.render ");
@@ -161,6 +162,7 @@ class JSSample extends com.sun.j3d.audioengines.Sample
* this sound,
* and frees any device specific data associated with this sample.
*/
+ @Override
public void clear() {
super.clear();
if (debugFlag)
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
index fc50756..0d5a090 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JSThread.java
@@ -106,6 +106,7 @@ class JSThread extends com.sun.j3d.audioengines.AudioEngineThread {
* increment/decrement changes in rate (and other future parameters)
* until the target value is reached.
*/
+ @Override
synchronized public void doWork() {
if (debugFlag)
debugPrint("JSThread.doWork()");
@@ -817,6 +818,7 @@ leftDelay, rightDelay
* This initializes this thread. Once this method returns, the thread is
* ready to do work.
*/
+ @Override
public void initialize() {
super.initialize();
// this.setPriority(Thread.MAX_PRIORITY);
@@ -835,6 +837,7 @@ leftDelay, rightDelay
return false;
}
+ @Override
public void shutdown() {
}
@@ -842,6 +845,7 @@ leftDelay, rightDelay
// default resource clean up method
+ @Override
public void cleanup() {
super.cleanup();
if (debugFlag)
diff --git a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java b/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
index 438cb7b..1e96fee 100644
--- a/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
+++ b/src/classes/share/com/sun/j3d/audioengines/javasound/JavaSoundMixer.java
@@ -116,6 +116,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Overridden method from AudioEngine.
* @return number of maximum voices play simultaneously on JavaSound Mixer.
*/
+ @Override
public int getTotalChannels() {
if (thread != null)
return thread.getTotalChannels();
@@ -128,6 +129,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* New interface to mixer/engine specific methods
* @return flag: true is initialized sucessfully, false if error
*/
+ @Override
public boolean initialize() {
if (thread == null) {
return false;
@@ -145,6 +147,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* New interface to mixer/engine specific methods
* @return flag: true is closed sucessfully, false if error
*/
+ @Override
public boolean close() {
if (thread == null)
return false;
@@ -177,6 +180,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Store a reference to JSXxxxSample object in samples list.
* @return index to the sample in samples list.
*/
+ @Override
public int prepareSound(int soundType, MediaContainer soundData) {
int index = JSSample.NULL_SAMPLE;
int methodType = ADD_TO_LIST;
@@ -253,6 +257,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Clears the fields associated with sample data for this sound.
* Overriden method from AudioEngine3D.
*/
+ @Override
public void clearSound(int index) {
// TODO: call JSXXXX clear method
JSSample sample = null;
@@ -268,6 +273,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Save a reference to the local to virtual world coordinate space
* Overriden method from AudioEngine3D.
*/
+ @Override
public void setVworldXfrm(int index, Transform3D trans) {
if (debugFlag)
debugPrintln("JavaSoundMixer: setVworldXfrm for index " + index);
@@ -312,6 +318,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void setPosition(int index, Point3d position) {
if (debugFlag)
debugPrintln("JavaSoundMixer: setPosition for index " + index);
@@ -330,6 +337,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void setDirection(int index, Vector3d direction) {
if (debugFlag)
debugPrintln("JavaSoundMixer: setDirection for index " + index);
@@ -347,6 +355,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void setReflectionCoefficient(float coefficient) {
super.setReflectionCoefficient(coefficient);
auralParams.reverbDirty |= JSAuralParameters.REFLECTION_COEFF_CHANGED;
@@ -356,6 +365,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void setReverbDelay(float reverbDelay) {
super.setReverbDelay(reverbDelay);
auralParams.reverbDirty |= JSAuralParameters.REVERB_DELAY_CHANGED;
@@ -365,6 +375,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void setReverbOrder(int reverbOrder) {
super.setReverbOrder(reverbOrder);
auralParams.reverbDirty |= JSAuralParameters.REVERB_ORDER_CHANGED;
@@ -380,6 +391,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
*
* Overriden method from AudioEngine3D.
*/
+ @Override
public int startSample(int index) {
// TODO: Rewrite this function
@@ -450,6 +462,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public int stopSample(int index) {
// TODO: Rewrite this function
@@ -486,6 +499,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void pauseSample(int index) {
if (debugFlag)
debugPrintln("JavaSoundMixer: PAUSESample for index " + index);
@@ -499,6 +513,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void unpauseSample(int index) {
if (debugFlag)
debugPrintln("JavaSoundMixer: UNPAUSESample for index " + index);
@@ -513,6 +528,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Overriden method from AudioEngine3D.
*/
+ @Override
public void updateSample(int index) {
if (debugFlag)
debugPrintln("JavaSoundMixer: UPDATESample for index " + index);
@@ -568,6 +584,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void muteSample(int index) {
JSSample sample = null;
if ((sample = (JSSample)getSample(index)) == null)
@@ -583,6 +600,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public void unmuteSample(int index) {
JSSample sample = null;
if ((sample = (JSSample)getSample(index)) == null)
@@ -607,6 +625,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public long getSampleDuration(int index) {
JSSample sample = null;
if ((sample = (JSSample)getSample(index)) == null)
@@ -625,6 +644,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public int getNumberOfChannelsUsed(int index) {
/*
* Calls same method with different signature containing the
@@ -640,6 +660,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/**
* Overriden method from AudioEngine3D.
*/
+ @Override
public int getNumberOfChannelsUsed(int index, boolean muted) {
/*
* The JavaSoundMixer implementation uses THREE channels to render
@@ -673,6 +694,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
/*
* Overriden method from AudioEngine3D.
*/
+ @Override
public long getStartTime(int index) {
JSSample sample = null;
if ((sample = (JSSample)getSample(index)) == null)
@@ -844,6 +866,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
}
// TEMPORARY: Override of method due to bug in Java Sound
+ @Override
public void setLoop(int index, int count) {
JSSample sample = null;
if ((sample = (JSSample)getSample(index)) == null)
@@ -913,6 +936,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
// Set overall gain for device
// @since Java 3D 1.3
//
+ @Override
public void setGain(float scaleFactor) {
float oldDeviceGain = deviceGain;
float gainFactor = scaleFactor/oldDeviceGain;
@@ -925,6 +949,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Set sample specific sample rate scale factor gain
* @since Java 3D 1.3
*/
+ @Override
public void setRateScaleFactor(int index, float rateScaleFactor) {
JSSample sample = null;
if ((sample = (JSSample)getSample(index)) == null)
@@ -939,6 +964,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Causes all cached sounds to be paused and all streaming sounds to be
* stopped.
*/
+ @Override
public void pause() {
pause = PAUSE_PENDING;
// TODO: pause all sounds
@@ -949,6 +975,7 @@ public class JavaSoundMixer extends AudioEngine3DL2 {
* Causes all paused cached sounds to be resumed and all streaming sounds
* restarted.
*/
+ @Override
public void resume() {
pause = RESUME_PENDING;
// TODO: unpause all sounds