changeset in /hg/pulseaudio: 2008-08-15 Omair Majid <omajid at redh...
Omair Majid
omajid at redhat.com
Fri Aug 15 14:11:06 PDT 2008
changeset dc7a6d1c130e in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=dc7a6d1c130e
description:
2008-08-15 Omair Majid <omajid at redhat.com>
merged files
diffstat:
11 files changed, 234 insertions(+), 399 deletions(-)
ChangeLog | 9
build.xml | 1
src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 170 +++++++
src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 2
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 153 ------
src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 242 ----------
src/java/org/classpath/icedtea/pulseaudio/SimpleAudioRecorder.java | 1
src/java/org/classpath/icedtea/pulseaudio/Stream.java | 6
src/java/org/classpath/icedtea/pulseaudio/StreamEvent.java | 20
src/java/org/classpath/icedtea/pulseaudio/StreamListener.java | 8
src/native/org_classpath_icedtea_pulseaudio_Stream.c | 21
diffs (truncated from 868 to 500 lines):
diff -r d3ed87d80d16 -r dc7a6d1c130e ChangeLog
--- a/ChangeLog Fri Aug 15 17:09:53 2008 -0400
+++ b/ChangeLog Fri Aug 15 17:11:01 2008 -0400
@@ -1,3 +1,12 @@ 2008-08-13 Ioana Ivan <iivan at redhat.com
+2008-08-13 Ioana Ivan <iivan at redhat.com>
+
+ * src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java:
+ superclass for TargetDataLine and SourceDataLine; moved open
+ and close here
+ * src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java:
+ chnaged the methods written so far to use Stream.java
+
+
2008-08-13 Ioana Ivan <iivan at redhat.com>
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java:
diff -r d3ed87d80d16 -r dc7a6d1c130e build.xml
--- a/build.xml Fri Aug 15 17:09:53 2008 -0400
+++ b/build.xml Fri Aug 15 17:11:01 2008 -0400
@@ -40,6 +40,7 @@
<class name="org.classpath.icedtea.pulseaudio.Stream"/>
<class name="org.classpath.icedtea.pulseaudio.PulseAudioTargetDataLine"/>
<class name="org.classpath.icedtea.pulseaudio.PulseAudioStreamVolumeControl"/>
+ <class name="org.classpath.icedtea.pulseaudio.PulseAudioDataLine"/>
</javah>
</target>
diff -r d3ed87d80d16 -r dc7a6d1c130e src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java Fri Aug 15 17:11:01 2008 -0400
@@ -0,0 +1,170 @@
+package org.classpath.icedtea.pulseaudio;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Line;
+import javax.sound.sampled.LineEvent;
+import javax.sound.sampled.LineListener;
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.AudioFormat.Encoding;
+
+public abstract class PulseAudioDataLine implements Line {
+
+ protected static final int DEFAULT_BUFFER_SIZE = 1000;
+ protected static final String PULSEAUDIO_FORMAT_KEY = "PulseAudioFormatKey";
+
+ protected String streamName = "Java Stream";
+
+ protected boolean isOpen = false;
+ private boolean isPaused = false;
+ protected AudioFormat[] supportedFormats = null;
+ protected AudioFormat currentFormat = null;
+ protected AudioFormat defaultFormat = null;
+
+
+ protected List<LineListener> lineListeners = new ArrayList<LineListener>();;
+
+ protected EventLoop eventLoop = null;
+ protected Semaphore semaphore = new Semaphore(0);
+ protected Stream stream;
+
+
+
+ public void open(AudioFormat format, int bufferSize)
+ throws LineUnavailableException {
+ if (isOpen) {
+ throw new IllegalStateException("Line is already open");
+ }
+
+ // ignore suggested buffer size
+
+ for (AudioFormat myFormat : supportedFormats) {
+ if (format.matches(myFormat)) {
+ stream = new Stream(eventLoop.getContextPointer(), streamName,
+ Stream.Format.valueOf((String) myFormat
+ .getProperty(PULSEAUDIO_FORMAT_KEY)),
+ (int) format.getSampleRate(), format.getChannels());
+ currentFormat = format;
+ isOpen = true;
+ }
+ }
+ // no matches found
+ if (!isOpen) {
+ throw new IllegalArgumentException("Invalid format");
+ }
+
+ Stream.StateListener openCloseListener = new Stream.StateListener() {
+
+ @Override
+ public void update() {
+ if (stream.getState() == Stream.State.READY) {
+ fireLineEvent(new LineEvent(PulseAudioDataLine.this,
+ LineEvent.Type.OPEN, AudioSystem.NOT_SPECIFIED));
+ semaphore.release();
+ } else if (stream.getState() == Stream.State.TERMINATED
+ || stream.getState() == Stream.State.FAILED) {
+ fireLineEvent((new LineEvent(PulseAudioDataLine.this,
+ LineEvent.Type.CLOSE, AudioSystem.NOT_SPECIFIED)));
+ semaphore.release();
+ }
+ }
+
+ };
+
+ stream.addStateListener(openCloseListener);
+
+ synchronized (eventLoop.threadLock) {
+
+ connectLine();
+ }
+
+ try {
+ semaphore.acquire();
+ } catch (InterruptedException e) {
+ // throw new LineUnavailableException("unable to prepare
+ // stream");
+ }
+ }
+
+ public void open(AudioFormat format) throws LineUnavailableException {
+ open(format, DEFAULT_BUFFER_SIZE);
+
+ }
+
+ public void open() throws LineUnavailableException {
+ // pick a random format
+ if (defaultFormat == null) {
+ defaultFormat = new AudioFormat(Encoding.PCM_UNSIGNED, 44100, 8, 2,
+ 2, AudioSystem.NOT_SPECIFIED, false);
+ }
+
+ open(defaultFormat, DEFAULT_BUFFER_SIZE);
+ }
+
+
+ public void close() {
+ assert (isOpen);
+
+ synchronized (eventLoop.threadLock) {
+ //drain();
+ stream.disconnect();
+ }
+
+ try {
+ semaphore.acquire();
+ } catch (InterruptedException e) {
+ // throw new LineUnavailableException("unable to prepare
+ // stream");
+ }
+
+ }
+
+ public void start() {
+ if (isPaused) {
+ stream.cork(false);
+ isPaused = false;
+ }
+
+ /*
+ * for(LineListener l :listeners) { l.update(new LineEvent(this,
+ * LineEvent.Type.START, 0)); }
+ */
+
+ }
+
+ public void stop() {
+ synchronized (eventLoop.threadLock) {
+ stream.cork(true);
+ }
+ isPaused = true;
+
+ }
+
+ public void addLineListener(LineListener listener) {
+ this.lineListeners.add(listener);
+ }
+
+ public void removeLineListener(LineListener listener) {
+ this.lineListeners.remove(listener);
+ }
+
+ private void fireLineEvent(LineEvent e) {
+ for (LineListener lineListener : lineListeners) {
+ lineListener.update(e);
+ }
+ }
+
+ abstract void connectLine();
+ abstract void drain();
+
+ public boolean isOpen() {
+ return isOpen;
+ }
+
+
+
+}
diff -r d3ed87d80d16 -r dc7a6d1c130e src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java Fri Aug 15 17:09:53 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java Fri Aug 15 17:11:01 2008 -0400
@@ -304,7 +304,7 @@ public class PulseAudioMixer implements
} else {
formats = getSupportedFormats();
- defaultFormat = new AudioFormat(Encoding.PCM_UNSIGNED, 22050, 8, 2,
+ defaultFormat = new AudioFormat(Encoding.PCM_UNSIGNED, 44100, 8, 2,
2, AudioSystem.NOT_SPECIFIED, false);
}
diff -r d3ed87d80d16 -r dc7a6d1c130e src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Fri Aug 15 17:09:53 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Fri Aug 15 17:11:01 2008 -0400
@@ -38,37 +38,19 @@ package org.classpath.icedtea.pulseaudio
package org.classpath.icedtea.pulseaudio;
import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Semaphore;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Control;
import javax.sound.sampled.DataLine;
-import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
import javax.sound.sampled.AudioFormat.Encoding;
import javax.sound.sampled.Control.Type;
-public class PulseAudioSourceDataLine implements SourceDataLine {
-
- private static final int DEFAULT_BUFFER_SIZE = 1000;
- private static final String PULSEAUDIO_FORMAT_KEY = "PulseAudioFormatKey";
-
- private String streamName = "Java Stream";
-
- private EventLoop eventLoop = null;
-
- private boolean isOpen = false;
- private boolean isPaused = false;
-
- private AudioFormat[] supportedFormats = null;
- private AudioFormat currentFormat = null;
- private AudioFormat defaultFormat = null;
-
- private List<LineListener> lineListeners;
+public class PulseAudioSourceDataLine extends PulseAudioDataLine implements SourceDataLine {
+
private Control[] controls = null;
private PulseAudioStreamMuteControl muteControl;
@@ -76,10 +58,9 @@ public class PulseAudioSourceDataLine im
private boolean muted;
private float volume;
- private Semaphore semaphore = new Semaphore(0);
private long currentFramePosition = 0;
- private Stream stream;
+
public PulseAudioSourceDataLine(EventLoop eventLoop, AudioFormat[] formats,
AudioFormat defaultFormat) {
@@ -112,59 +93,8 @@ public class PulseAudioSourceDataLine im
public void open(AudioFormat format, int bufferSize)
throws LineUnavailableException {
- if (isOpen) {
- throw new IllegalStateException("Line is already open");
- }
-
- // ignore suggested buffer size
-
- for (AudioFormat myFormat : supportedFormats) {
- if (format.matches(myFormat)) {
- stream = new Stream(eventLoop.getContextPointer(), streamName,
- Stream.Format.valueOf((String) myFormat
- .getProperty(PULSEAUDIO_FORMAT_KEY)),
- (int) format.getSampleRate(), format.getChannels());
- currentFormat = format;
- isOpen = true;
- }
- }
- // no matches found
- if (!isOpen) {
- throw new IllegalArgumentException("Invalid format");
- }
-
- Stream.StateListener openCloseListener = new Stream.StateListener() {
-
- @Override
- public void update() {
- if (stream.getState() == Stream.State.READY) {
- fireLineEvent(new LineEvent(PulseAudioSourceDataLine.this,
- LineEvent.Type.OPEN, AudioSystem.NOT_SPECIFIED));
- semaphore.release();
- } else if (stream.getState() == Stream.State.TERMINATED
- || stream.getState() == Stream.State.FAILED) {
- fireLineEvent((new LineEvent(PulseAudioSourceDataLine.this,
- LineEvent.Type.CLOSE, AudioSystem.NOT_SPECIFIED)));
- semaphore.release();
- }
- }
-
- };
-
- stream.addStateListener(openCloseListener);
-
- synchronized (eventLoop.threadLock) {
-
- stream.connectForPlayback(null);
- }
-
- try {
- semaphore.acquire();
- } catch (InterruptedException e) {
- // throw new LineUnavailableException("unable to prepare
- // stream");
- }
-
+
+ super.open(format, bufferSize);
controls = new Control[2];
volumeControl = new PulseAudioStreamVolumeControl(this);
controls[0] = volumeControl;
@@ -172,21 +102,11 @@ public class PulseAudioSourceDataLine im
controls[1] = muteControl;
}
-
- public void open(AudioFormat format) throws LineUnavailableException {
- open(format, DEFAULT_BUFFER_SIZE);
-
- }
-
- public void open() throws LineUnavailableException {
- // pick a random format
- if (defaultFormat == null) {
- defaultFormat = new AudioFormat(Encoding.PCM_UNSIGNED, 22050, 8, 2,
- 2, AudioSystem.NOT_SPECIFIED, false);
- }
-
- open(defaultFormat, DEFAULT_BUFFER_SIZE);
- }
+
+ protected void connectLine() {
+ stream.connectForPlayback(null);
+ }
+
@Override
public int write(byte[] data, int offset, int length) {
@@ -240,38 +160,6 @@ public class PulseAudioSourceDataLine im
return sizeWritten;
}
- public void start() {
- if (isPaused) {
- stream.cork(false);
- isPaused = false;
- }
-
- /*
- * for(LineListener l :listeners) { l.update(new LineEvent(this,
- * LineEvent.Type.START, 0)); }
- */
-
- }
-
- public void stop() {
- synchronized (eventLoop.threadLock) {
- stream.cork(true);
- }
- isPaused = true;
-
- }
-
- public void addLineListener(LineListener listener) {
- this.lineListeners.add(listener);
- }
-
- public void removeLineListener(LineListener listener) {
- this.lineListeners.remove(listener);
- }
-
- public boolean isOpen() {
- return isOpen;
- }
public int available() {
synchronized (eventLoop.threadLock) {
@@ -279,22 +167,6 @@ public class PulseAudioSourceDataLine im
}
};
- public void close() {
- assert (isOpen);
-
- synchronized (eventLoop.threadLock) {
- stream.drain();
- stream.disconnect();
- }
-
- try {
- semaphore.acquire();
- } catch (InterruptedException e) {
- // throw new LineUnavailableException("unable to prepare
- // stream");
- }
-
- }
public int getBufferSize() {
// FIXME!
@@ -418,11 +290,6 @@ public class PulseAudioSourceDataLine im
}
- private void fireLineEvent(LineEvent e) {
- for (LineListener lineListener : lineListeners) {
- lineListener.update(e);
- }
- }
protected EventLoop getEventLoop() {
return this.eventLoop;
diff -r d3ed87d80d16 -r dc7a6d1c130e src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Fri Aug 15 17:09:53 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java Fri Aug 15 17:11:01 2008 -0400
@@ -37,42 +37,19 @@ exception statement from your version.
package org.classpath.icedtea.pulseaudio;
-import java.io.File;
+
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Semaphore;
-
import javax.sound.sampled.*;
-import javax.sound.sampled.AudioFormat.Encoding;
import javax.sound.sampled.Control.Type;
-import javax.sound.sampled.Port.Info;
-
-public class PulseAudioTargetDataLine implements TargetDataLine {
+
+
+public class PulseAudioTargetDataLine extends PulseAudioDataLine implements TargetDataLine {
protected boolean isOpen = false;
protected boolean isPaused = false;
-
- private AudioFormat[] supportedFormats = null;
- private AudioFormat currentFormat = null;
- private AudioFormat defaultFormat = null;
-
- private List<LineListener> lineListeners = new LinkedList<LineListener>();
-
- private List<StreamListener> streamListeners = new ArrayList<StreamListener>();
-
- private String streamName = "Java Stream";
- private static final int DEFAULT_BUFFER_SIZE = 1000;
- private static final String PULSEAUDIO_FORMAT_KEY = "PulseAudioFormatKey";
-
- private EventLoop eventLoop = null;
-
- private Semaphore semaphore = new Semaphore(0);
@SuppressWarnings("unused")
private long streamPointer;
@@ -88,16 +65,9 @@ public class PulseAudioTargetDataLine im
}
}
- private native void native_open(long contextPointer, String streamName,
- String encoding, int sampleRate, int channels, int bufferSize);
-
- private native void native_start();
private native int native_get_readable_size();
- private native void native_close();
-
- private native int native_read(byte[] array, int remaininglength, int position);
public PulseAudioTargetDataLine(EventLoop eventLoop, AudioFormat[] formats, AudioFormat defaultFormat) {
supportedFormats = formats;
@@ -108,79 +78,8 @@ public class PulseAudioTargetDataLine im
More information about the distro-pkg-dev
mailing list