diff options
Diffstat (limited to 'libjava/classpath/javax/sound/sampled')
21 files changed, 142 insertions, 142 deletions
diff --git a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java index 899258c..2eeb78c 100644 --- a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java +++ b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java @@ -143,7 +143,7 @@ public class AudioFileFormat /** * Create a new AudioFileFormat given the type, the format, the - * frame length, and some properties. The new object will have an + * frame length, and some properties. The new object will have an * unspecified byte length. A copy of the properties argument will * be made, so changes to the map passed in will not affect the * new AudioFileFormat. @@ -153,7 +153,7 @@ public class AudioFileFormat * @param properties the properties */ public AudioFileFormat(Type type, AudioFormat fmt, int frameLen, - Map<String, Object> properties) + Map<String, Object> properties) { this.byteLength = AudioSystem.NOT_SPECIFIED; this.format = fmt; @@ -171,7 +171,7 @@ public class AudioFileFormat * @param frameLen the frame length */ protected AudioFileFormat(Type type, int byteLen, AudioFormat fmt, - int frameLen) + int frameLen) { this.byteLength = byteLen; this.format = fmt; @@ -237,6 +237,6 @@ public class AudioFileFormat public String toString() { return ("byteLength=" + byteLength + "; format=" + format - + "; type=" + type + "; frameLength=" + frameLength); + + "; type=" + type + "; frameLength=" + frameLength); } } diff --git a/libjava/classpath/javax/sound/sampled/AudioFormat.java b/libjava/classpath/javax/sound/sampled/AudioFormat.java index 1f31c99..b4fc601 100644 --- a/libjava/classpath/javax/sound/sampled/AudioFormat.java +++ b/libjava/classpath/javax/sound/sampled/AudioFormat.java @@ -140,7 +140,7 @@ public class AudioFormat /** * Create a new audio format, given various attributes of it. * The properties map for this format will be empty. - * + * * @param encoding the encoding for this format * @param sampleRate the sample rate * @param sampleSizeInBits the sample size, in bits @@ -150,8 +150,8 @@ public class AudioFormat * @param bigEndian true if the data is stored big-endian */ public AudioFormat(Encoding encoding, float sampleRate, int sampleSizeInBits, - int channels, int frameSize, float frameRate, - boolean bigEndian) + int channels, int frameSize, float frameRate, + boolean bigEndian) { this.encoding = encoding; this.sampleRate = sampleRate; @@ -178,8 +178,8 @@ public class AudioFormat * @param properties a map describing properties of this format */ public AudioFormat(Encoding encoding, float sampleRate, int sampleSizeInBits, - int channels, int frameSize, float frameRate, - boolean bigEndian, Map<String, Object> properties) + int channels, int frameSize, float frameRate, + boolean bigEndian, Map<String, Object> properties) { this.encoding = encoding; this.sampleRate = sampleRate; @@ -198,7 +198,7 @@ public class AudioFormat * bits and the number of channels, unless one of those is * AudioSystem#NOT_SPECIFIED. The frame rate will be the same as the sample * rate, and the properties map will be empty. - * + * * @param sampleRate the sample rate * @param sampleSizeInBits the sample size, in bits * @param channels the number of channels @@ -206,7 +206,7 @@ public class AudioFormat * @param bigEndian true if the data is stored big-endian */ public AudioFormat(float sampleRate, int sampleSizeInBits, - int channels, boolean signed, boolean bigEndian) + int channels, boolean signed, boolean bigEndian) { this.encoding = signed ? Encoding.PCM_SIGNED : Encoding.PCM_UNSIGNED; this.sampleRate = sampleRate; @@ -257,7 +257,7 @@ public class AudioFormat /** * Given a key, return a property associated with this format; - * or null if this property is not set. + * or null if this property is not set. * @param key the name of the property * @return the value of the property, or null if the property is not set */ @@ -318,7 +318,7 @@ public class AudioFormat } /** - * Return a read-only Map holding the properties associated with + * Return a read-only Map holding the properties associated with * this format. */ public Map<String, Object> properties() @@ -332,24 +332,24 @@ public class AudioFormat public String toString() { CPStringBuilder result = new CPStringBuilder(); - + // usually at least encoding should be somewhat specified result.append(encoding); - + if (sampleRate != AudioSystem.NOT_SPECIFIED) { result.append(" "); result.append(sampleRate); result.append(" Hz"); } - + if (sampleSizeInBits != AudioSystem.NOT_SPECIFIED) { result.append(" "); result.append(sampleSizeInBits); result.append(" bits"); } - + if (channels != AudioSystem.NOT_SPECIFIED) { result.append(" "); @@ -357,10 +357,10 @@ public class AudioFormat result.append(" channel"); if (channels > 1) result.append("s"); } - + if (sampleSizeInBits > 8) result.append(bigEndian ? " big endian" : " little endian"); - + return result.toString(); } } diff --git a/libjava/classpath/javax/sound/sampled/AudioInputStream.java b/libjava/classpath/javax/sound/sampled/AudioInputStream.java index 863578b..526e7e1 100644 --- a/libjava/classpath/javax/sound/sampled/AudioInputStream.java +++ b/libjava/classpath/javax/sound/sampled/AudioInputStream.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ public class AudioInputStream extends InputStream /** The length of the audio stream in frames. */ protected long frameLength; - /** The current frame position, starting from frame zero. */ + /** The current frame position, starting from frame zero. */ protected long framePos; /** The size of a frame in bytes. */ @@ -92,7 +92,7 @@ public class AudioInputStream extends InputStream public AudioInputStream(TargetDataLine line) { this(new TargetInputStream(line), line.getFormat(), - AudioSystem.NOT_SPECIFIED); + AudioSystem.NOT_SPECIFIED); } /** @@ -181,30 +181,30 @@ public class AudioInputStream extends InputStream result = -1; else { - int myFrameSize = (frameSize == AudioSystem.NOT_SPECIFIED - ? 1 : frameSize); - // Ensure length is a multiple of frame size. - length -= length % myFrameSize; - - result = 0; - while (result == 0 || result % myFrameSize != 0) - { - int val = input.read(buf, offset, length); - if (val < 0) - { - // This is a weird situation as we might have read a - // frame already. It isn't clear at all what to do if - // we only found a partial frame. For now we just - // return whatever we did find. - if (result == 0) - return -1; - result -= result % myFrameSize; - break; - } - result += val; - } - // assert result % myFrameSize == 0; - framePos += result / myFrameSize; + int myFrameSize = (frameSize == AudioSystem.NOT_SPECIFIED + ? 1 : frameSize); + // Ensure length is a multiple of frame size. + length -= length % myFrameSize; + + result = 0; + while (result == 0 || result % myFrameSize != 0) + { + int val = input.read(buf, offset, length); + if (val < 0) + { + // This is a weird situation as we might have read a + // frame already. It isn't clear at all what to do if + // we only found a partial frame. For now we just + // return whatever we did find. + if (result == 0) + return -1; + result -= result % myFrameSize; + break; + } + result += val; + } + // assert result % myFrameSize == 0; + framePos += result / myFrameSize; } return result; } @@ -212,7 +212,7 @@ public class AudioInputStream extends InputStream public void reset() throws IOException { input.reset(); - framePos = markedFramePos; + framePos = markedFramePos; } public long skip(long n) throws IOException @@ -243,10 +243,10 @@ public class AudioInputStream extends InputStream public synchronized int read() throws IOException { if (buf == null) - buf = new byte[1]; + buf = new byte[1]; int count = read(buf, 0, 1); if (count < 0) - return -1; + return -1; return buf[0]; } diff --git a/libjava/classpath/javax/sound/sampled/AudioPermission.java b/libjava/classpath/javax/sound/sampled/AudioPermission.java index 6698e35..a5325c9 100644 --- a/libjava/classpath/javax/sound/sampled/AudioPermission.java +++ b/libjava/classpath/javax/sound/sampled/AudioPermission.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/javax/sound/sampled/AudioSystem.java b/libjava/classpath/javax/sound/sampled/AudioSystem.java index e858f17..01133c9 100644 --- a/libjava/classpath/javax/sound/sampled/AudioSystem.java +++ b/libjava/classpath/javax/sound/sampled/AudioSystem.java @@ -57,7 +57,7 @@ import javax.sound.sampled.spi.MixerProvider; * This clas is the primary interface to the audio system. It contains * a number of static methods which can be used to access this package's * functionality. - * + * * @since 1.3 */ public class AudioSystem @@ -77,7 +77,7 @@ public class AudioSystem * Return the file format of a given File. * @param f the file to check * @return the format of the file - * @throws UnsupportedAudioFileException if the file's format is not + * @throws UnsupportedAudioFileException if the file's format is not * recognized * @throws IOException if there is an I/O error reading the file */ @@ -104,7 +104,7 @@ public class AudioSystem * Return the file format of a given input stream. * @param is the input stream to check * @return the format of the stream - * @throws UnsupportedAudioFileException if the stream's format is not + * @throws UnsupportedAudioFileException if the stream's format is not * recognized * @throws IOException if there is an I/O error reading the stream */ @@ -131,7 +131,7 @@ public class AudioSystem * Return the file format of a given URL. * @param url the URL to check * @return the format of the URL - * @throws UnsupportedAudioFileException if the URL's format is not + * @throws UnsupportedAudioFileException if the URL's format is not * recognized * @throws IOException if there is an I/O error reading the URL */ @@ -197,14 +197,14 @@ public class AudioSystem /** * Given an audio input stream, this will try to create a new audio input * stream whose encoding matches the given target encoding. If no provider - * offers this conversion, an exception is thrown. + * offers this conversion, an exception is thrown. * @param targ the target encoding * @param ais the original audio stream * @return a new audio stream * @throws IllegalArgumentException if the conversion cannot be made */ public static AudioInputStream getAudioInputStream(AudioFormat.Encoding targ, - AudioInputStream ais) + AudioInputStream ais) { Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class); while (i.hasNext()) @@ -220,14 +220,14 @@ public class AudioSystem /** * Given an audio input stream, this will try to create a new audio input * stream whose format matches the given target format. If no provider - * offers this conversion, an exception is thrown. + * offers this conversion, an exception is thrown. * @param targ the target format * @param ais the original audio stream * @return a new audio stream * @throws IllegalArgumentException if the conversion cannot be made */ public static AudioInputStream getAudioInputStream(AudioFormat targ, - AudioInputStream ais) + AudioInputStream ais) { Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class); while (i.hasNext()) @@ -457,7 +457,7 @@ public class AudioSystem * @since 1.5 */ public static SourceDataLine getSourceDataLine(AudioFormat fmt, - Mixer.Info mixer) + Mixer.Info mixer) throws LineUnavailableException { DataLine.Info info = new DataLine.Info(SourceDataLine.class, fmt); @@ -489,7 +489,7 @@ public class AudioSystem /** * Find and return a target data line matching the given audio format. * @param fmt the format to match - * @throws LineUnavailableException if no matching line was found + * @throws LineUnavailableException if no matching line was found * @since 1.5 */ public static TargetDataLine getTargetDataLine(AudioFormat fmt) @@ -517,7 +517,7 @@ public class AudioSystem * @since 1.5 */ public static TargetDataLine getTargetDataLine(AudioFormat fmt, - Mixer.Info mixer) + Mixer.Info mixer) throws LineUnavailableException { DataLine.Info info = new DataLine.Info(TargetDataLine.class, fmt); @@ -571,12 +571,12 @@ public class AudioSystem /** * Given a target encoding and a source audio format, return an array of all - * matching audio formats to which data in this source format can be converted. + * matching audio formats to which data in this source format can be converted. * @param encoding the target encoding * @param sourceFmt the source format */ public static AudioFormat[] getTargetFormats(AudioFormat.Encoding encoding, - AudioFormat sourceFmt) + AudioFormat sourceFmt) { HashSet<AudioFormat> result = new HashSet<AudioFormat>(); Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class); @@ -616,9 +616,9 @@ public class AudioSystem * @param source the source format */ public static boolean isConversionSupported(AudioFormat.Encoding targ, - AudioFormat source) + AudioFormat source) { - Iterator i + Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class); while (i.hasNext()) { @@ -636,9 +636,9 @@ public class AudioSystem * @param source the source format */ public static boolean isConversionSupported(AudioFormat targ, - AudioFormat source) + AudioFormat source) { - Iterator i + Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class); while (i.hasNext()) { @@ -672,20 +672,20 @@ public class AudioSystem /** * Return true if the given audio file format is supported for the - * given audio input stream by one of the providers installed on the + * given audio input stream by one of the providers installed on the * system. * @param type the audio file format type * @param ais the audio input stream */ public static boolean isFileTypeSupported(AudioFileFormat.Type type, - AudioInputStream ais) + AudioInputStream ais) { return isFileTypeSupported(getAudioFileTypes(ais), type); } /** * Return true if some provider on the system supplies a line - * matching the argument. + * matching the argument. * @param info the line to match */ public static boolean isLineSupported(Line.Info info) @@ -711,7 +711,7 @@ public class AudioSystem * @throws IllegalArgumentException if the file type is not supported */ public static int write(AudioInputStream ais, AudioFileFormat.Type type, - File out) + File out) throws IOException { Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class); @@ -736,7 +736,7 @@ public class AudioSystem * @throws IllegalArgumentException if the file type is not supported */ public static int write(AudioInputStream ais, AudioFileFormat.Type type, - OutputStream os) + OutputStream os) throws IOException { Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class); diff --git a/libjava/classpath/javax/sound/sampled/BooleanControl.java b/libjava/classpath/javax/sound/sampled/BooleanControl.java index 0a78e49..37e372e 100644 --- a/libjava/classpath/javax/sound/sampled/BooleanControl.java +++ b/libjava/classpath/javax/sound/sampled/BooleanControl.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,7 +99,7 @@ public abstract class BooleanControl extends Control * @param falseLabel the label for the false state */ protected BooleanControl(Type type, boolean init, String trueLabel, - String falseLabel) + String falseLabel) { super(type); this.value = init; diff --git a/libjava/classpath/javax/sound/sampled/Clip.java b/libjava/classpath/javax/sound/sampled/Clip.java index 1fa7694..28b4979 100644 --- a/libjava/classpath/javax/sound/sampled/Clip.java +++ b/libjava/classpath/javax/sound/sampled/Clip.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/javax/sound/sampled/CompoundControl.java b/libjava/classpath/javax/sound/sampled/CompoundControl.java index 556c805..2b8941c 100644 --- a/libjava/classpath/javax/sound/sampled/CompoundControl.java +++ b/libjava/classpath/javax/sound/sampled/CompoundControl.java @@ -95,9 +95,9 @@ public abstract class CompoundControl extends Control result.append(": "); for (int i = 0; i < memberControls.length; ++i) { - if (i > 0) - result.append(", "); - result.append(memberControls[i].toString()); + if (i > 0) + result.append(", "); + result.append(memberControls[i].toString()); } return result.toString(); } diff --git a/libjava/classpath/javax/sound/sampled/DataLine.java b/libjava/classpath/javax/sound/sampled/DataLine.java index 4482c98..5d88c6a 100644 --- a/libjava/classpath/javax/sound/sampled/DataLine.java +++ b/libjava/classpath/javax/sound/sampled/DataLine.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005-2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,7 +43,7 @@ import gnu.java.lang.CPStringBuilder; * The DataLine interface adds data-related functionality to the Line * interface. For example, it adds methods to start and stop the data * on the line. - * @since 1.3 + * @since 1.3 */ public interface DataLine extends Line { @@ -158,7 +158,7 @@ public interface DataLine extends Line if (minBufferSize < other.minBufferSize || maxBufferSize > other.maxBufferSize) return false; - + for (int i = 0; i < formats.length; ++i) { boolean ok = false; @@ -173,7 +173,7 @@ public interface DataLine extends Line if (! ok) return false; } - + return true; } @@ -190,14 +190,14 @@ public interface DataLine extends Line result.append(", "); result.append(formats[i].toString()); } - + result.append("]; minBufferSize: "); result.append(minBufferSize); result.append("; maxBufferSize: "); result.append(maxBufferSize); return result.toString(); } - + } // end class: Info /** @@ -237,7 +237,7 @@ public interface DataLine extends Line float getLevel(); /** - * Return the current frame position. + * Return the current frame position. * @since 1.5 */ long getLongFramePosition(); diff --git a/libjava/classpath/javax/sound/sampled/EnumControl.java b/libjava/classpath/javax/sound/sampled/EnumControl.java index 1ddc8a9..7a03242 100644 --- a/libjava/classpath/javax/sound/sampled/EnumControl.java +++ b/libjava/classpath/javax/sound/sampled/EnumControl.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,7 +40,7 @@ package javax.sound.sampled; /** * An EnumControl is a Control which can take one of a specified set of - * values. + * values. * @since 1.3 */ public abstract class EnumControl extends Control @@ -110,8 +110,8 @@ public abstract class EnumControl extends Control { for (int i = 0; i < values.length; ++i) { - if (! values[i].equals(value)) - throw new IllegalArgumentException("value not supported"); + if (! values[i].equals(value)) + throw new IllegalArgumentException("value not supported"); } this.value = value; } diff --git a/libjava/classpath/javax/sound/sampled/FloatControl.java b/libjava/classpath/javax/sound/sampled/FloatControl.java index bbdb24b..6ae9178 100644 --- a/libjava/classpath/javax/sound/sampled/FloatControl.java +++ b/libjava/classpath/javax/sound/sampled/FloatControl.java @@ -97,7 +97,7 @@ public abstract class FloatControl extends Control /** * Create a new FloatControl given its type and various parameters. * The minimum, maximum, and midpoint labels will all be the empty string. - * + * * @param type the type * @param min the minimum valuee * @param max the maximum value @@ -107,7 +107,7 @@ public abstract class FloatControl extends Control * @param units the description of the units */ protected FloatControl(Type type, float min, float max, float prec, - int update, float init, String units) + int update, float init, String units) { super(type); this.minimum = min; @@ -123,7 +123,7 @@ public abstract class FloatControl extends Control /** * Create a new FloatControl given its type and various parameters. - * + * * @param type the type * @param min the minimum valuee * @param max the maximum value @@ -136,8 +136,8 @@ public abstract class FloatControl extends Control * @param maxLabel the label for the maximum value */ protected FloatControl(Type type, float min, float max, float prec, - int update, float init, String units, - String minLabel, String midLabel, String maxLabel) + int update, float init, String units, + String minLabel, String midLabel, String maxLabel) { super(type); this.minimum = min; @@ -242,7 +242,7 @@ public abstract class FloatControl extends Control * over the given time interval, specified in microseconds. * The default implementation does not do this, but instead * simply sets the value to the final value immediately. - * + * * @param from the starting value * @param to the final value * @param ms the number of microseconds diff --git a/libjava/classpath/javax/sound/sampled/Line.java b/libjava/classpath/javax/sound/sampled/Line.java index 536752a..62d284b 100644 --- a/libjava/classpath/javax/sound/sampled/Line.java +++ b/libjava/classpath/javax/sound/sampled/Line.java @@ -94,7 +94,7 @@ public interface Line * @param listener the listener to notify */ void addLineListener(LineListener listener); - + /** * Close this line. */ diff --git a/libjava/classpath/javax/sound/sampled/LineEvent.java b/libjava/classpath/javax/sound/sampled/LineEvent.java index dd4a9ae..43a184c 100644 --- a/libjava/classpath/javax/sound/sampled/LineEvent.java +++ b/libjava/classpath/javax/sound/sampled/LineEvent.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -153,15 +153,15 @@ public class LineEvent extends EventObject public String toString() { return ("type=" + type + "; framePosition=" + framePosition - + "line=" + line); + + "line=" + line); } - + private void readObject(ObjectInputStream ois) throws IOException { throw new NotSerializableException("LineEvent is not serializable"); } - + private void writeObject(ObjectOutputStream oos) throws IOException { diff --git a/libjava/classpath/javax/sound/sampled/LineUnavailableException.java b/libjava/classpath/javax/sound/sampled/LineUnavailableException.java index b203d7b..a4655ff 100644 --- a/libjava/classpath/javax/sound/sampled/LineUnavailableException.java +++ b/libjava/classpath/javax/sound/sampled/LineUnavailableException.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/javax/sound/sampled/Mixer.java b/libjava/classpath/javax/sound/sampled/Mixer.java index ff657cf..dd400f9 100644 --- a/libjava/classpath/javax/sound/sampled/Mixer.java +++ b/libjava/classpath/javax/sound/sampled/Mixer.java @@ -115,7 +115,7 @@ public interface Mixer extends Line public final String toString() { return ("name=" + name + "; description=" + description - + "; vendor=" + vendor + "; version=" + version); + + "; vendor=" + vendor + "; version=" + version); } } @@ -148,7 +148,7 @@ public interface Mixer extends Line /** * Return an array of Info objects describing all the source lines * available in this Mixer, which match the provided decsription. - * @param info the description of the source lines to find + * @param info the description of the source lines to find */ Line.Info[] getSourceLineInfo(Line.Info info); @@ -166,7 +166,7 @@ public interface Mixer extends Line /** * Return an array of Info objects describing all the target lines * available in this Mixer, which match the provided decsription. - * @param info the description of the target lines to find + * @param info the description of the target lines to find */ Line.Info[] getTargetLineInfo(Line.Info info); diff --git a/libjava/classpath/javax/sound/sampled/Port.java b/libjava/classpath/javax/sound/sampled/Port.java index fc0bf71..292e1f1 100644 --- a/libjava/classpath/javax/sound/sampled/Port.java +++ b/libjava/classpath/javax/sound/sampled/Port.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,7 +41,7 @@ package javax.sound.sampled; /** * A Port is a Line which represents an audio device, for instance * a microphone. - * + * * @since 1.3 */ public interface Port extends Line @@ -56,28 +56,28 @@ public interface Port extends Line /** A CD player. */ public static final Info COMPACT_DISC = new Info(Port.class, - "Compact Disc", - true); + "Compact Disc", + true); /** Headphones. */ public static final Info HEADPHONE = new Info(Port.class, "Headphone", - false); + false); /** Generic input line. */ public static final Info LINE_IN = new Info(Port.class, "Line in", - true); + true); /** Generic output line. */ public static final Info LINE_OUT = new Info(Port.class, "Line out", - false); + false); /** A microphone. */ public static final Info MICROPHONE = new Info(Port.class, "Microphone", - true); + true); /** A speaker. */ public static final Info SPEAKER = new Info(Port.class, "Speaker", - false); + false); private String name; private boolean isSource; diff --git a/libjava/classpath/javax/sound/sampled/ReverbType.java b/libjava/classpath/javax/sound/sampled/ReverbType.java index c7cced8..79a4b49 100644 --- a/libjava/classpath/javax/sound/sampled/ReverbType.java +++ b/libjava/classpath/javax/sound/sampled/ReverbType.java @@ -1,4 +1,4 @@ -/* Reverb attributes +/* Reverb attributes Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -61,7 +61,7 @@ public class ReverbType * @param decay the decay time in microseconds */ protected ReverbType(String name, int earlyDelay, float earlyInten, - int lateDelay, float lateInten, int decay) + int lateDelay, float lateInten, int decay) { this.name = name; this.earlyReflectionDelay = earlyDelay; @@ -136,9 +136,9 @@ public class ReverbType public final String toString() { return ("name=" + name + "; earlyReflectionDelay=" + earlyReflectionDelay - + "; earlyReflectionIntensity=" + earlyReflectionIntensity - + "; lateReflectionDelay=" + lateReflectionDelay - + "; lateReflectionIntensity=" + lateReflectionIntensity - + "; decayTime=" + decayTime); + + "; earlyReflectionIntensity=" + earlyReflectionIntensity + + "; lateReflectionDelay=" + lateReflectionDelay + + "; lateReflectionIntensity=" + lateReflectionIntensity + + "; decayTime=" + decayTime); } } diff --git a/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java b/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java index bced9c1..1399b61 100644 --- a/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java +++ b/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java b/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java index 6df4cc2..098190f 100644 --- a/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java +++ b/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java @@ -51,7 +51,7 @@ import javax.sound.sampled.UnsupportedAudioFileException; * This abstract class defines the interface to audio file readers. * A concrete provider subclass will implement the methods declared * here. These methods can be used to determine the format of - * files, and to retrieve an AudioInputStream for a file. + * files, and to retrieve an AudioInputStream for a file. * @since 1.3 */ public abstract class AudioFileReader @@ -110,36 +110,36 @@ public abstract class AudioFileReader /** * Return an AudioInputStream for the given file. The file is assumed - * to hold valid audio data. + * to hold valid audio data. * @param file the file to read * @return an AudioInputStream for the file * @throws UnsupportedAudioFileException if the file's type is not * recognized - * @throws IOException if there is an error while reading the file + * @throws IOException if there is an error while reading the file */ public abstract AudioInputStream getAudioInputStream(File file) throws UnsupportedAudioFileException, IOException; /** * Return an AudioInputStream wrapping the given input stream. The stream - * is assumed to hold valid audio data. + * is assumed to hold valid audio data. * @param is the input stream to wrap * @return an AudioInputStream for the stream * @throws UnsupportedAudioFileException if the stream's type is not * recognized - * @throws IOException if there is an error while reading the stream + * @throws IOException if there is an error while reading the stream */ public abstract AudioInputStream getAudioInputStream(InputStream is) throws UnsupportedAudioFileException, IOException; /** * Return an AudioInputStream for the given URL. The URL is assumed - * to hold valid audio data. + * to hold valid audio data. * @param url the URL to read * @return an AudioInputStream for the URL * @throws UnsupportedAudioFileException if the URL's type is not * recognized - * @throws IOException if there is an error while reading the URL + * @throws IOException if there is an error while reading the URL */ public abstract AudioInputStream getAudioInputStream(URL url) throws UnsupportedAudioFileException, IOException; diff --git a/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java b/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java index 955bb05..82f9b31 100644 --- a/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java +++ b/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java @@ -94,7 +94,7 @@ public abstract class AudioFileWriter * @param ais the audio input stream to write */ public boolean isFileTypeSupported(AudioFileFormat.Type type, - AudioInputStream ais) + AudioInputStream ais) { AudioFileFormat.Type[] types = getAudioFileTypes(ais); for (int i = 0; i < types.length; ++i) @@ -114,7 +114,7 @@ public abstract class AudioFileWriter * @throws IOException if an I/O error occurs when writing */ public abstract int write(AudioInputStream ais, AudioFileFormat.Type type, - File out) + File out) throws IOException; /** @@ -126,6 +126,6 @@ public abstract class AudioFileWriter * @throws IOException if an I/O error occurs when writing */ public abstract int write(AudioInputStream ais, AudioFileFormat.Type type, - OutputStream os) + OutputStream os) throws IOException; } diff --git a/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java b/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java index e96cc04..b9d3e9d 100644 --- a/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java +++ b/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java @@ -42,7 +42,7 @@ import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; /** - * A format conversion provider supplies methods for converting between + * A format conversion provider supplies methods for converting between * different audio formats. This abstract class defines the interface * to this functionality; concrete subclasses will implement the methods * declared here. @@ -67,7 +67,7 @@ public abstract class FormatConversionProvider * @throws IllegalArgumentException if the conversion is not supported */ public abstract AudioInputStream getAudioInputStream(AudioFormat.Encoding encoding, - AudioInputStream source); + AudioInputStream source); /** * Return an audio input stream given the desired target format and @@ -79,7 +79,7 @@ public abstract class FormatConversionProvider * @throws IllegalArgumentException if the conversion is not supported */ public abstract AudioInputStream getAudioInputStream(AudioFormat format, - AudioInputStream source); + AudioInputStream source); /** * Return an array of all the source encodings supported by this conversion @@ -109,7 +109,7 @@ public abstract class FormatConversionProvider * @return an array of supported target formats */ public abstract AudioFormat[] getTargetFormats(AudioFormat.Encoding targ, - AudioFormat src); + AudioFormat src); /** * Return true if this provider supports conversion from the given @@ -119,13 +119,13 @@ public abstract class FormatConversionProvider * @return true if the conversion is supported */ public boolean isConversionSupported(AudioFormat.Encoding targ, - AudioFormat src) + AudioFormat src) { AudioFormat.Encoding[] encodings = getTargetEncodings(src); for (int i = 0; i < encodings.length; ++i) { - if (targ.equals(encodings[i])) - return true; + if (targ.equals(encodings[i])) + return true; } return false; } @@ -154,14 +154,14 @@ public abstract class FormatConversionProvider AudioFormat.Encoding[] srcs = getSourceEncodings(); for (int i = 0; i < srcs.length; ++i) { - if (src.equals(srcs[i])) - return true; + if (src.equals(srcs[i])) + return true; } return false; } /** - * Return true if an encoding matching the argument is supported as a + * Return true if an encoding matching the argument is supported as a * target encoding by this provider. * @param targ the target encoding * @return true if it is supported @@ -171,8 +171,8 @@ public abstract class FormatConversionProvider AudioFormat.Encoding[] encodings = getTargetEncodings(); for (int i = 0; i < encodings.length; ++i) { - if (targ.equals(encodings[i])) - return true; + if (targ.equals(encodings[i])) + return true; } return false; } |