# HG changeset patch # User Ioana Ivan # Date 1223656320 14400 # Node ID 095b46980d97c0213ca76bb981a2307857da0b1c # Parent 63fe202983263da0f0ad26ae1d47d8974142f09d 2008-10-10 Ioana Ivan * src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java (getLineInfo): removed method, moved to each subclass * src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java (getLineInfo): new method * src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java (getLineInfo): new method * src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java getLineInfo): new method diff -r 63fe20298326 -r 095b46980d97 .classpath --- a/.classpath Fri Oct 10 11:10:27 2008 -0400 +++ b/.classpath Fri Oct 10 12:32:00 2008 -0400 @@ -3,6 +3,7 @@ + diff -r 63fe20298326 -r 095b46980d97 ChangeLog --- a/ChangeLog Fri Oct 10 11:10:27 2008 -0400 +++ b/ChangeLog Fri Oct 10 12:32:00 2008 -0400 @@ -1,3 +1,14 @@ +2008-10-10 Ioana Ivan + * src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java + (getLineInfo): removed method, moved to each subclass + * src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java + (getLineInfo): new method + * src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java + (getLineInfo): new method + * src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java + getLineInfo): new method + + 2008-10-08 Ioana Ivan * src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java (addStreamListener): startedListener always fires a START event diff -r 63fe20298326 -r 095b46980d97 src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java --- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Fri Oct 10 11:10:27 2008 -0400 +++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java Fri Oct 10 12:32:00 2008 -0400 @@ -44,6 +44,7 @@ import javax.sound.sampled.AudioPermission; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.Clip; +import javax.sound.sampled.DataLine; import javax.sound.sampled.LineUnavailableException; import org.classpath.icedtea.pulseaudio.Stream.WriteListener; @@ -557,5 +558,11 @@ super.stop(); } + + public javax.sound.sampled.Line.Info getLineInfo() { + return new DataLine.Info(Clip.class, supportedFormats, + StreamBufferAttributes.MIN_VALUE, + StreamBufferAttributes.MAX_VALUE); + } } diff -r 63fe20298326 -r 095b46980d97 src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java --- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Fri Oct 10 11:10:27 2008 -0400 +++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Fri Oct 10 12:32:00 2008 -0400 @@ -426,12 +426,6 @@ return bufferSize; } - public javax.sound.sampled.Line.Info getLineInfo() { - return new DataLine.Info(this.getClass(), supportedFormats, - StreamBufferAttributes.MIN_VALUE, - StreamBufferAttributes.MAX_VALUE); - } - @Override public AudioFormat getFormat() { if (!isOpen) { diff -r 63fe20298326 -r 095b46980d97 src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java --- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Fri Oct 10 11:10:27 2008 -0400 +++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Fri Oct 10 12:32:00 2008 -0400 @@ -40,6 +40,7 @@ import java.util.ArrayList; import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.DataLine; import javax.sound.sampled.AudioPermission; import javax.sound.sampled.LineListener; import javax.sound.sampled.LineUnavailableException; @@ -329,5 +330,11 @@ super.close(); } + + public javax.sound.sampled.Line.Info getLineInfo() { + return new DataLine.Info(SourceDataLine.class, supportedFormats, + StreamBufferAttributes.MIN_VALUE, + StreamBufferAttributes.MAX_VALUE); + } } diff -r 63fe20298326 -r 095b46980d97 src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java --- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Fri Oct 10 11:10:27 2008 -0400 +++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Fri Oct 10 12:32:00 2008 -0400 @@ -38,6 +38,7 @@ package org.classpath.icedtea.pulseaudio; import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.DataLine; import javax.sound.sampled.AudioPermission; import javax.sound.sampled.LineEvent; import javax.sound.sampled.LineUnavailableException; @@ -362,5 +363,11 @@ fireLineEvent(new LineEvent(this, LineEvent.Type.STOP, framesSinceOpen)); } + + public javax.sound.sampled.Line.Info getLineInfo() { + return new DataLine.Info(TargetDataLine.class, supportedFormats, + StreamBufferAttributes.MIN_VALUE, + StreamBufferAttributes.MAX_VALUE); + } }