You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/08/28 06:53:34 UTC
svn commit: r437531 - in
/incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled:
UnsupportedAudioFileException.java spi/AudioFileReader.java
spi/AudioFileWriter.java spi/FormatConversionProvider.java
Author: mloenko
Date: Sun Aug 27 21:53:32 2006
New Revision: 437531
URL: http://svn.apache.org/viewvc?rev=437531&view=rev
Log:
fixes for signatures in sound.sampled
Added:
incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/UnsupportedAudioFileException.java
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileReader.java
incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileWriter.java
incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/FormatConversionProvider.java
Added: incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/UnsupportedAudioFileException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/UnsupportedAudioFileException.java?rev=437531&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/UnsupportedAudioFileException.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/UnsupportedAudioFileException.java Sun Aug 27 21:53:32 2006
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.sound.sampled;
+
+public class UnsupportedAudioFileException extends Exception {
+
+ public UnsupportedAudioFileException() {
+ super();
+ }
+
+ public UnsupportedAudioFileException(String message) {
+ super(message);
+ }
+}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileReader.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileReader.java?rev=437531&r1=437530&r2=437531&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileReader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileReader.java Sun Aug 27 21:53:32 2006
@@ -17,23 +17,31 @@
package javax.sound.sampled.spi;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.UnsupportedAudioFileException;
public abstract class AudioFileReader {
- public abstract AudioFileFormat getAudioFileFormat(File file);
+ public abstract AudioFileFormat getAudioFileFormat(File file)
+ throws UnsupportedAudioFileException, IOException;
- public abstract AudioFileFormat getAudioFileFormat(InputStream stream);
+ public abstract AudioFileFormat getAudioFileFormat(InputStream stream)
+ throws UnsupportedAudioFileException, IOException;
- public abstract AudioFileFormat getAudioFileFormat(URL url);
+ public abstract AudioFileFormat getAudioFileFormat(URL url)
+ throws UnsupportedAudioFileException, IOException;
- public abstract AudioInputStream getAudioInputStream(File file);
+ public abstract AudioInputStream getAudioInputStream(File file)
+ throws UnsupportedAudioFileException, IOException;
- public abstract AudioInputStream getAudioInputStream(InputStream stream);
+ public abstract AudioInputStream getAudioInputStream(InputStream stream)
+ throws UnsupportedAudioFileException, IOException;
- public abstract AudioInputStream getAudioInputStream(URL url);
+ public abstract AudioInputStream getAudioInputStream(URL url)
+ throws UnsupportedAudioFileException, IOException;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileWriter.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileWriter.java?rev=437531&r1=437530&r2=437531&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileWriter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/AudioFileWriter.java Sun Aug 27 21:53:32 2006
@@ -17,6 +17,7 @@
package javax.sound.sampled.spi;
import java.io.File;
+import java.io.IOException;
import java.io.OutputStream;
import javax.sound.sampled.AudioInputStream;
@@ -48,7 +49,9 @@
return false;
}
- public abstract int write(AudioInputStream stream, AudioFileFormat.Type fileType, File out);
+ public abstract int write(AudioInputStream stream,
+ AudioFileFormat.Type fileType, File out) throws IOException;
- public abstract int write(AudioInputStream stream, AudioFileFormat.Type fileType, OutputStream out);
+ public abstract int write(AudioInputStream stream,
+ AudioFileFormat.Type fileType, OutputStream out) throws IOException;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/FormatConversionProvider.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/FormatConversionProvider.java?rev=437531&r1=437530&r2=437531&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/FormatConversionProvider.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/src/main/java/javax/sound/sampled/spi/FormatConversionProvider.java Sun Aug 27 21:53:32 2006
@@ -41,12 +41,12 @@
return false;
}
- public abstract AudioFormat[] getTargetEncodings(
+ public abstract AudioFormat[] getTargetFormats(
AudioFormat.Encoding targetFormat, AudioFormat sourceFormat);
public boolean isConversionSupported(AudioFormat targetFormat,
AudioFormat sourceFormat) {
- AudioFormat[] formats = getTargetEncodings(targetFormat.getEncoding(),
+ AudioFormat[] formats = getTargetFormats(targetFormat.getEncoding(),
sourceFormat);
for (int i = 0; i < formats.length; i++) {
if (targetFormat.equals(formats[i])) {