changeset in /hg/pulseaudio: 2008-08-12 Omair Majid <omajid at redh...
Omair Majid
omajid at redhat.com
Tue Aug 12 13:55:34 PDT 2008
changeset 9a72b909f18a in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=9a72b909f18a
description:
2008-08-12 Omair Majid <omajid at redhat.com>
* src/java/org/classpath/icedtea/pulseaudio/Operation.java: added a
function isNull to check if the pa_operation pointer is NULL
* src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java:
added support for LineListeners to be notified on a CLOSE event
* src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.c:
removed debugging output
* unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java:
added description to be println()ed for testPlay() test
diffstat:
4 files changed, 51 insertions(+), 17 deletions(-)
src/java/org/classpath/icedtea/pulseaudio/Operation.java | 7 +
src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 47 ++++++++--
src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.c | 12 --
unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java | 2
diffs (186 lines):
diff -r 856e11044f24 -r 9a72b909f18a src/java/org/classpath/icedtea/pulseaudio/Operation.java
--- a/src/java/org/classpath/icedtea/pulseaudio/Operation.java Tue Aug 12 15:17:14 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/Operation.java Tue Aug 12 16:55:28 2008 -0400
@@ -94,6 +94,13 @@ public class Operation {
}
}
+ public boolean isNull() {
+ if (operationPointer == 0) {
+ return true;
+ }
+ return false;
+ }
+
public State getState() {
assert (operationPointer != 0);
int state;
diff -r 856e11044f24 -r 9a72b909f18a src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Tue Aug 12 15:17:14 2008 -0400
+++ b/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java Tue Aug 12 16:55:28 2008 -0400
@@ -364,7 +364,7 @@ public class PulseAudioSourceDataLine im
}
};
-
+
addStreamListener(openCloseListener);
final Semaphore semaphore = new Semaphore(0);
@@ -374,15 +374,12 @@ public class PulseAudioSourceDataLine im
this.addStreamListener(new StreamListener() {
@Override
public void update(StreamEvent e) {
- System.out.println(this.getClass().getName()
- + " waiting to stream to become ready");
if (e.getType() == StreamEvent.Type.READY) {
semaphore.release();
}
}
});
- System.out.println("about to open stream");
native_start();
}
@@ -392,8 +389,6 @@ public class PulseAudioSourceDataLine im
// throw new LineUnavailableException("unable to prepare
// stream");
}
-
- System.out.println(this.getClass().getName() + "stream is ready");
controls = new Control[2];
volumeControl = new PulseAudioStreamVolumeControl(this);
@@ -500,7 +495,15 @@ public class PulseAudioSourceDataLine im
}
private void addStreamListener(StreamListener listener) {
- this.streamListeners.add(listener);
+ synchronized (streamListeners) {
+ this.streamListeners.add(listener);
+ }
+ }
+
+ private void removeStreamListener(StreamListener listener) {
+ synchronized (streamListeners) {
+ this.streamListeners.remove(listener);
+ }
}
public boolean isOpen() {
@@ -516,8 +519,31 @@ public class PulseAudioSourceDataLine im
public void close() {
assert (isOpen);
+ final Semaphore semaphore = new Semaphore(0);
+
+ StreamListener closeListener = new StreamListener() {
+ @Override
+ public void update(StreamEvent e) {
+ if (e.getType() == StreamEvent.Type.TERMINATED
+ || e.getType() == StreamEvent.Type.FAILED) {
+ semaphore.release();
+ }
+ }
+ };
+
+ addStreamListener(closeListener);
+
synchronized (eventLoop.threadLock) {
native_close();
+ }
+
+ try {
+ semaphore.acquire();
+ System.out.println("stream closed");
+ removeStreamListener(closeListener);
+ } catch (InterruptedException e) {
+ // throw new LineUnavailableException("unable to prepare
+ // stream");
}
}
@@ -660,6 +686,7 @@ public class PulseAudioSourceDataLine im
fireStreamEvent(new StreamEvent(StreamEvent.Type.FAILED));
break;
case 4:
+ fireStreamEvent(new StreamEvent(StreamEvent.Type.TERMINATED));
break;
default:
assert ("not supposed to happen".indexOf("false") >= 0);
@@ -674,8 +701,10 @@ public class PulseAudioSourceDataLine im
}
private void fireStreamEvent(StreamEvent e) {
- for (StreamListener streamListener : streamListeners) {
- streamListener.update(e);
+ synchronized (streamListeners) {
+ for (StreamListener streamListener : streamListeners) {
+ streamListener.update(e);
+ }
}
}
diff -r 856e11044f24 -r 9a72b909f18a src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.c
--- a/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.c Tue Aug 12 15:17:14 2008 -0400
+++ b/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine.c Tue Aug 12 16:55:28 2008 -0400
@@ -75,7 +75,7 @@ static void stream_state_change_callback
jobject obj = java_context->obj;
- printf("----> Stream state changed to %d\n", pa_stream_get_state(stream));
+ // printf("stream state changed to %d\n", pa_stream_get_state(stream));
/* Call the 'update' method in java
* to handle all java-side events
@@ -91,10 +91,10 @@ static void stream_state_change_callback
return;
}
- // printf("calling update on java\n");
+ //printf("calling update on java\n");
(*env)->CallVoidMethod(env, obj, mid, pa_stream_get_state(stream));
- // printf("returning form stream_state_change_callback\n");
+ //printf("returning form stream_state_change_callback\n");
return;
}
@@ -144,15 +144,12 @@ JNIEXPORT void JNICALL Java_org_classpat
return;
}
-
sample_spec.rate = sampleRate;
sample_spec.channels = channels;
printf("sample_spec.rate = %d\n", sample_spec.rate);
printf("sample_spec.channels = %d\n", sample_spec.channels);
-
-
-
+
if ( !pa_sample_spec_valid(&sample_spec)) {
printf("error: invalid format\n");
throwByName(env, "java/lang/IllegalArgumentException", "Invalid format");
@@ -228,7 +225,6 @@ JNIEXPORT jlong JNICALL Java_org_classpa
}
-
/*
* Class: org_classpath_icedtea_pulseaudio_PulseAudioSourceDataLine
* Method: native_start
diff -r 856e11044f24 -r 9a72b909f18a unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java
--- a/unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java Tue Aug 12 15:17:14 2008 -0400
+++ b/unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java Tue Aug 12 16:55:28 2008 -0400
@@ -81,6 +81,8 @@ public class PulseSourceDataLineTest {
@Test
public void testPlay() throws LineUnavailableException,
UnsupportedAudioFileException, IOException {
+ System.out.println("This test plays a file");
+
File soundFile = new File("testsounds/startup.wav");
AudioInputStream audioInputStream = AudioSystem
.getAudioInputStream(soundFile);
More information about the distro-pkg-dev
mailing list