/hg/icedtea7: 11 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Wed Feb 22 07:36:35 PST 2012
changeset 0b6840181a0e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=0b6840181a0e
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 10 16:21:38 2011 -0400
Fix pulse audio header generation problem.
changeset 7dfe4a768671 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7dfe4a768671
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 10 17:42:18 2011 -0400
Fix whitespace.
changeset 70d900c5409a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=70d900c5409a
author: Denis Lila <dlila at redhat.com>
date: Wed Jun 15 10:35:39 2011 -0400
Fix build regression.
changeset 473dffbd7b2e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=473dffbd7b2e
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 16 10:58:30 2011 -0400
Replace pulse audio enums with static longs.
changeset 2b986620b907 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2b986620b907
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 16 11:11:35 2011 -0400
Fix a few concurrency problems in pulse audio.
changeset 4ffbd8c06389 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=4ffbd8c06389
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 17 16:16:47 2011 -0400
Start PulseAudioTargetDataLines in the corked state.
changeset 4d1216f65423 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=4d1216f65423
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 20 11:23:24 2011 -0400
PR734. Fix pulse-java latency problem.
changeset ad47e9ec886f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ad47e9ec886f
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 20 14:14:56 2011 -0400
Fix pulse audio regression.
changeset 5a4cfe5798e3 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5a4cfe5798e3
author: Xerxes Ranby <xerxes at zafena.se>
date: Thu Sep 29 16:59:04 2011 +0200
LP862286: Fix exception on trying to start PulseAudio playback.
2011-09-29 Xerxes Ranby <xerxes at zafena.se> David
Henningsson <david.henningsson at canonical.com>
LP862286
* NEWS: Updated.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/
PulseAudioDataLine.java (addStreamListeners): Fix
exception on trying to start PulseAudio playback.
changeset fdc7cb8dc1a1 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fdc7cb8dc1a1
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Oct 03 13:07:54 2011 +0200
LP862286: Fix exception on trying to start PulseAudio playback on
ARM.
2011-10-03 Xerxes Ranby <xerxes at zafena.se> David
Henningsson <david.henningsson at canonical.com> Matthias
Klose <doko at ubuntu.com>
LP862286
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
(context_change_callback): Fix exception on trying to
start PulseAudio playback on ARM.
changeset 2320b8653252 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2320b8653252
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Oct 03 16:35:35 2011 +0200
2011-10-03 Xerxes Ranby <xerxes at zafena.se> Robert
Lougher <rob at jamvm.org.uk>
*
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1ge
t_1buffer_1attr): Make code compliant to the JNI
specification. Enable pulseaudio to work in combination
with JVM that strictly implement JNI spec.
The code is not compliant to the JNI specification. FindClass takes
a fully-qualified classname :
http://download.oracle.com/javase/6/docs/technotes/guides/jni/spec/f
unctions.html
name: a fully-qualified class name (that is, a package name,
delimited by ?/?, followed by the class name). If the name begins
with ?[? (the array signature character), it returns an array class.
The string is encoded in modified UTF-8.
The code above is giving a type signature (qualified name inside 'L'
and ';'). HotSpot is obviously allowing this. But this not correct
according to the specification.
Rob.
diffstat:
ChangeLog | 183 +
Makefile.am | 12 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java | 68 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java | 2 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java | 102 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 332 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java | 184 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 826 +++---
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 724 ++--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 120 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 1147 ++++----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java | 32 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 72 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 180 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 455 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 68 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 582 ++--
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 60 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 86 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java | 28 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 1289 +++++----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java | 66 +-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java | 44 +-
pulseaudio/src/native/jni-common.c | 232 +-
pulseaudio/src/native/jni-common.h | 22 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c | 63 +
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 298 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c | 41 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 136 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 140 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 1188 ++++----
32 files changed, 4611 insertions(+), 4199 deletions(-)
diffs (truncated from 10524 to 500 lines):
diff -r 47858baedb86 -r 2320b8653252 ChangeLog
--- a/ChangeLog Thu Feb 16 14:52:54 2012 +0100
+++ b/ChangeLog Mon Oct 03 16:35:35 2011 +0200
@@ -1,3 +1,186 @@
+2011-10-03 Xerxes RÃ¥nby <xerxes at zafena.se>
+ Robert Lougher <rob at jamvm.org.uk>
+
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1get_1buffer_1attr):
+ Make code compliant to the JNI specification.
+ Enable pulseaudio to work in combination with JVM that strictly
+ implement JNI spec.
+
+2011-10-03 Xerxes RÃ¥nby <xerxes at zafena.se>
+ David Henningsson <david.henningsson at canonical.com>
+ Matthias Klose <doko at ubuntu.com>
+
+ LP862286
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
+ (context_change_callback):
+ Fix exception on trying to start PulseAudio playback on ARM.
+
+2011-09-29 Xerxes RÃ¥nby <xerxes at zafena.se>
+ David Henningsson <david.henningsson at canonical.com>
+
+ LP862286
+ * NEWS: Updated.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/
+ PulseAudioDataLine.java (addStreamListeners):
+ Fix exception on trying to start PulseAudio playback.
+
+2011-06-20 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (SET_STREAM_ENUM): Add an underscore after java_prefix so that
+ the produced string matches the names in Stream.java.
+
+2011-06-20 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+ (bufferSize): Remove.
+ (getBufferSize): Return stream.getBufferSize().
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+ (connectLine): Improve formatting.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
+ (connectLine): Set up flags to adjust the latency, if needed.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
+ (bufAttr, bufAttrMutex): New members.
+ (setBufAttr, bufferAttrCallback): New methods. They both set bufAttr.
+ (getBufferSize): Return the current buffer size.
+ (connectForRecording): Add a flags argument to allow callers to chose the
+ flags.
+ (stateCallback): When the stream is ready, set the buffer attributes to
+ the actual ones used by the server.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (buf_attr_changed_callback): New function.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
+ Set the buffer attribute callback.
+
+2011-06-17 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
+ (FLAG_NOFLAGS, FLAG_START_CORKED, FLAG_INTERPOLATE_TIMING,
+ FLAG_NOT_MONOTONIC, FLAG_AUTO_TIMING_UPDATE, FLAG_NO_REMAP_CHANNELS,
+ FLAG_NO_REMIX_CHANNELS, FLAG_FIX_FORMAT, FLAG_FIX_RATE,
+ FLAG_FIX_CHANNELS, FLAG_DONT_MOVE, FLAG_VARIABLE_RATE, FLAG_PEAK_DETECT,
+ FLAG_START_MUTED, FLAG_ADJUST_LATENCY, FLAG_EARLY_REQUESTS,
+ FLAG_DONT_INHIBIT_AUTO_SUSPEND, FLAG_START_UNMUTED, FLAG_FAIL_ON_SUSPEND):
+ New static long variables mirroring pa_stream_flag_t values.
+ (STATE_UNCONNECTED, STATE_CREATING, STATE_READY, STATE_FAILED,
+ STATE_TERMINATED): Add the STATE_ prefix to distinguish them from
+ the flag variables.
+ (native_pa_stream_connect_playback, native_pa_stream_connect_record):
+ Change flags parameter to long.
+ (connectForPlayback, connectForRecording): Start the stream corked.
+ Change formatting to make it more readable.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (SET_STREAM_ENUM): Renamed from SET_STREAM_STATE_ENUM, since the
+ macro could have been used for any PA_STREAM constants, not just
+ stream states (and indeed, we now use it for flag constants too).
+ (Java_org_classpath_icedtea_pulseaudio_Stream_init_1constants):
+ Initialize flag constants in addition to the stream states.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1connect_1playback):
+ Change flags parameter to jlong (from jint), remove commented out
+ dead code, remove obsolete comment, and start the stream with whatever
+ flags were passed in the flags parameter, instead of ignoring that
+ parameter and using PA_STREAM_START_CORKED.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1connect_1record):
+ Change flags parameter to jlong (from jint), remove commented out
+ dead code.
+
+2011-06-16 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+ (addStreamListeners): Remove this.notifyAll() from
+ openCloseListener.update; change this.notifyAll() to
+ PulseAudioDataLine.this.notifyAll() in startedListener.update.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
+ (read): Put fragmentBuffer null check in the synchronized block.
+ (flush): Make it synchronized to avoid race condition with read().
+
+2011-06-16 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add ContextEvent to the list of pulse audio classes that
+ need javah run on them.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
+ (Type): Remove and replace with...
+ (UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME, READY, FAILED,
+ TERMINATED): New static long variables replacing enum Type.
+ (init_constants): New native method to initialize the above variables.
+ (checkNativeEnumReturn): Make sure that the input is one of the longs
+ representing the type of ContextEvent.
+ (type): Change type from Type to long.
+ (ContextEvent): Take a long argument, instead of a Type.
+ (getType): Return a long, not a Type.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
+ (status): Change from int to long.
+ (native_set_sink_volume): Remove. It was unimplemented in the JNI side.
+ (getStatus): Return long instead of int.
+ (update): Replace int argument with long argument. Remove the switch
+ statement.
+ (setVolume): Remove. Unused.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java
+ (State): Remove and replace with...
+ (Running, Done, Cancelled): Static longs, enumerating the possible
+ operation states.
+ (init_constants): New native method to initialize the above variables.
+ (checkNativeOperationState): Make sure that the input is one of the longs
+ representing the operation state.
+ (native_get_state): Change return type from int to long.
+ (getState): Change return type to long; remove switch.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
+ Remove the names of enums from the names of constants since most of them
+ were changed to static longs.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
+ Same changes as in PulseAudioDataLine.java.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
+ (State): Remove and replace with...
+ (UNCONNECTED, CREATING, READY, FAILED, TERMINATED): New static long variables
+ replacing enum Type.
+ (init_constants): New native method to initialize the above variables.
+ (checkNativeStreamState): Make sure that the input is one of the longs
+ representing the kind of StreamState.
+ (native_pa_stream_get_state): Change the return from int to long.
+ (getState): Remove the switch.
+ * pulseaudio/src/native/jni-common.h
+ (SET_JAVA_STATIC_LONG_FIELD_TO_PA_ENUM): Macro that sets one of the java
+ static longs to the corresponding pa_constant.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c
+ New file.
+ (SET_CONTEXT_ENUM): Macro that sets the ContextEvent types.
+ (Java_org_classpath_icedtea_pulseaudio_ContextEvent_init_1constants):
+ Implementation of ContextEvent.init_constants.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
+ (context_change_callback): Change the fourth argument of GetMethodID
+ to "(J)V" to reflect the change in the signature of EventLoop.update.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c
+ (SET_OP_ENUM): Macro that sets the operation types.
+ (Java_org_classpath_icedtea_pulseaudio_Operation_init_1constants):
+ Implementation of Operation.init_constants.
+ (Java_org_classpath_icedtea_pulseaudio_Operation_native_1get_1state):
+ Change return type to jlong.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (SET_STREAM_ENUM): Macro that sets the stream states.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_init_1constants):
+ Implementation of Stream.init_constants.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1get_1state):
+ Change return type to jlong.
+
+2011-06-15 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add back the -classpath option to javah in
+ building the pulse audio header files. The bootstrap javah
+ doesn't recognize -J-Xbootclasspath/p: so it couldn't find
+ the classfiles.
+
+2011-06-10 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/*: Fix whitespace.
+
+2011-06-10 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am
+ (stamps/pulse-java-headers.stamp): Prepend the java build directory
+ to the boot class path to avoid generating headers for the system
+ pulse-java classes.
+
2012-02-16 Xerxes RÃ¥nby <xerxes at zafena.se>
(HOTSPOT_CHANGESET): Add latest Zero HS22 fixes.
diff -r 47858baedb86 -r 2320b8653252 Makefile.am
--- a/Makefile.am Thu Feb 16 14:52:54 2012 +0100
+++ b/Makefile.am Mon Oct 03 16:35:35 2011 +0200
@@ -1839,15 +1839,17 @@
stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.EventLoop ;
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.Stream
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.Operation
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.PulseAudioSourcePort
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.PulseAudioTargetPort
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+ $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent
mkdir -p stamps
touch $@
diff -r 47858baedb86 -r 2320b8653252 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java Thu Feb 16 14:52:54 2012 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java Mon Oct 03 16:35:35 2011 +0200
@@ -37,32 +37,68 @@
package org.classpath.icedtea.pulseaudio;
+import java.util.Arrays;
+
/**
* This class encapsulates a change in the PulseAudio's connection context.
*
* When this event is fired, something has happened to the connection of this
* program to the PulseAudio server.
- *
*/
+class ContextEvent {
+ // There are certain enumerations from pulse audio that we need to use in
+ // the java side. For all of these, we declare static longs in the proper
+ // java classes and we use static native methods to initialize them to
+ // the values used by pulse audio. This makes us immune to changes in
+ // the integer values of the enum symbols in pulse audio.
+ /**
+ * Basically, what is the new state of the context
+ * These will be initialized to the proper values in the JNI.
+ */
+ static long UNCONNECTED = -1,
+ CONNECTING = -1,
+ AUTHORIZING = -1,
+ SETTING_NAME = -1,
+ READY = -1,
+ FAILED = -1,
+ TERMINATED = -1;
-class ContextEvent {
+ private static native void init_constants();
- /**
- * Basically, what is the new state of the context
- *
- */
- public static enum Type {
- UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME, READY, FAILED, TERMINATED
- }
+ static {
+ SecurityWrapper.loadNativeLibrary();
+ init_constants();
+ }
- private Type type;
+ /**
+ * Throws an IllegalStateException if value is not one of the above
+ * context events. We do this for all pulse audio enumerations that
+ * we need to use in the java side. If pulse audio decides to add
+ * new events/states, we need to add them to the classes. The exception
+ * will let us know.
+ * return the input if there is no error
+ *
+ * @param value is the context event to be checked against one of the known
+ * events.
+ * @return value if it is a known event. Otherwise throw an exception.
+ */
+ public static long checkNativeEnumReturn(long value) {
+ if (!Arrays.asList(
+ UNCONNECTED, CONNECTING, AUTHORIZING, SETTING_NAME,
+ READY, FAILED, TERMINATED
+ ).contains(value)) {
+ throw new IllegalStateException("Illegal constant for ContextEvent: " + value);
+ }
+ return value;
+ }
- public ContextEvent(Type type) {
- this.type = type;
- }
+ private long type;
- public Type getType() {
- return type;
- }
+ public ContextEvent(long type) {
+ this.type = checkNativeEnumReturn(type);
+ }
+ public long getType() {
+ return type;
+ }
}
diff -r 47858baedb86 -r 2320b8653252 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java Thu Feb 16 14:52:54 2012 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java Mon Oct 03 16:35:35 2011 +0200
@@ -45,6 +45,6 @@
interface ContextListener {
- void update(ContextEvent e);
+ void update(ContextEvent e);
}
diff -r 47858baedb86 -r 2320b8653252 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java Thu Feb 16 14:52:54 2012 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java Mon Oct 03 16:35:35 2011 +0200
@@ -49,66 +49,66 @@
class Debug {
- enum DebugLevel {
- Verbose, Debug, Info, Warning, Error, None
- }
+ enum DebugLevel {
+ Verbose, Debug, Info, Warning, Error, None
+ }
- private static DebugLevel currentDebugLevel = DebugLevel.None;
+ private static DebugLevel currentDebugLevel = DebugLevel.None;
- static {
- // System.out.println("PulseAudio: initializing Debug");
+ static {
+ // System.out.println("PulseAudio: initializing Debug");
- String systemSetting;
- try {
- systemSetting = System.getProperty("pulseaudio.debugLevel");
- } catch (SecurityException e) {
- // sigh, we cant read that property
- systemSetting = null;
- }
+ String systemSetting;
+ try {
+ systemSetting = System.getProperty("pulseaudio.debugLevel");
+ } catch (SecurityException e) {
+ // sigh, we cant read that property
+ systemSetting = null;
+ }
- DebugLevel wantedLevel;
- try {
- wantedLevel = DebugLevel.valueOf(systemSetting);
+ DebugLevel wantedLevel;
+ try {
+ wantedLevel = DebugLevel.valueOf(systemSetting);
- } catch (IllegalArgumentException e) {
- wantedLevel = DebugLevel.Info;
- } catch (NullPointerException e) {
- wantedLevel = DebugLevel.None;
- }
+ } catch (IllegalArgumentException e) {
+ wantedLevel = DebugLevel.Info;
+ } catch (NullPointerException e) {
+ wantedLevel = DebugLevel.None;
+ }
- currentDebugLevel = wantedLevel;
- println(DebugLevel.Info, "Using debug level: " + currentDebugLevel);
- }
+ currentDebugLevel = wantedLevel;
+ println(DebugLevel.Info, "Using debug level: " + currentDebugLevel);
+ }
- static void println(String string) {
- println(DebugLevel.Info, string);
- }
+ static void println(String string) {
+ println(DebugLevel.Info, string);
+ }
- static void print(DebugLevel level, String string) {
- int result = level.compareTo(currentDebugLevel);
- if (result >= 0) {
- if (level.compareTo(DebugLevel.Error) >= 0) {
- System.err.print(string);
- } else {
- System.out.print(string);
- }
- } else {
- // do nothing
- }
- }
+ static void print(DebugLevel level, String string) {
+ int result = level.compareTo(currentDebugLevel);
+ if (result >= 0) {
+ if (level.compareTo(DebugLevel.Error) >= 0) {
+ System.err.print(string);
+ } else {
+ System.out.print(string);
+ }
+ } else {
+ // do nothing
+ }
+ }
- static void println(DebugLevel level, String string) {
+ static void println(DebugLevel level, String string) {
- int result = level.compareTo(currentDebugLevel);
- if (result >= 0) {
- if (level.compareTo(DebugLevel.Error) >= 0) {
- System.err.println("DEBUG: pulse-java: " + string);
- } else {
- System.out.println("DEBUG: pulse-java: " + string);
- }
- } else {
- // do nothing
- }
- }
+ int result = level.compareTo(currentDebugLevel);
+ if (result >= 0) {
+ if (level.compareTo(DebugLevel.Error) >= 0) {
+ System.err.println("DEBUG: pulse-java: " + string);
+ } else {
+ System.out.println("DEBUG: pulse-java: " + string);
+ }
+ } else {
+ // do nothing
+ }
+ }
}
diff -r 47858baedb86 -r 2320b8653252 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Thu Feb 16 14:52:54 2012 +0100
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java Mon Oct 03 16:35:35 2011 +0200
@@ -40,243 +40,207 @@
import java.util.ArrayList;
import java.util.List;
-import org.classpath.icedtea.pulseaudio.ContextEvent.Type;
+import org.classpath.icedtea.pulseaudio.ContextEvent;
import org.classpath.icedtea.pulseaudio.Debug.DebugLevel;
/**
* This class wraps pulseaudio's event loop. It also holds the lock used in the
* rest of pulse-java
- *
- *
*/
final class EventLoop implements Runnable {
- /*
- * any methods that can obstruct the behaviour of pa_mainloop should run
- * synchronized
- */
+ /*
+ * any methods that can obstruct the behaviour of pa_mainloop should run
+ * synchronized
+ */
- /*
- * the threadLock object is the object used for synchronizing the
- * non-thread-safe operations of pulseaudio's c api
- */
- final Object threadLock = new Object();
+ /*
+ * the threadLock object is the object used for synchronizing the
+ * non-thread-safe operations of pulseaudio's c api
+ */
+ final Object threadLock = new Object();
- private static EventLoop instance = null;
+ private static EventLoop instance = null;
- private List<ContextListener> contextListeners;
- // private List<SourceDataLine> lines;
- private String appName;
- private String serverString;
+ private List<ContextListener> contextListeners;
+ // private List<SourceDataLine> lines;
+ private String appName;
+ private String serverString;
- private int status;
- // private boolean eventLoopIsRunning = false;
+ private long status;
+ // private boolean eventLoopIsRunning = false;
- private List<String> targetPortNameList = new ArrayList<String>();
- private List<String> sourcePortNameList = new ArrayList<String>();
+ private List<String> targetPortNameList = new ArrayList<String>();
+ private List<String> sourcePortNameList = new ArrayList<String>();
- /*
- * JNI stuff
More information about the distro-pkg-dev
mailing list