/hg/icedtea: 13 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 2 17:04:07 UTC 2016
changeset fa76bb3356e5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fa76bb3356e5
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 10 17:42:18 2011 -0400
PR1741: Fix whitespace.
changeset 7f9a42012be7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7f9a42012be7
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 28 13:27:42 2012 -0400
PR1050: Stream objects not garbage collected
2012-06-28 Omair Majid <omajid at redhat.com>
* NEWS: Update with fix.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java:
Add new member variable contextPointer.
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
Save j_context as contextPointer.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1unref):
Delete the global ref and dellocate the java context.
(cork_callback): Don't check userdata. It is NULL.
(Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1cork):
Dont allocate and pass a java_context to pa_stream_cork. It is not needed.
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
(testOpenCloseLotsOfTimes): New method.
changeset 1364a03b0f2b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1364a03b0f2b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 02 05:23:53 2016 +0000
PR1741: Replace pulse audio enums with static longs.
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.
changeset ae07c41dc3c2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ae07c41dc3c2
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 28 20:14:46 2012 -0400
PR902: PulseAudioClip getMicrosecondsLength() returns length in milliseconds, not microseconds
Define a (correct) constant for converting from seconds to microsecond and use
it everywhere.
2012-06-28 Omair Majid <omajid at redhat.com>
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
(getMicrosecondLength, getMicrosecondPosition)
(setMicrosecondPosition): Use correct factor to convert seconds to
microseconds.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
(getMicrosecondPosition): Likewise.
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java:
Define SECONDS_TO_MICROSECONDS.
changeset cc35d8ed9124 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cc35d8ed9124
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 17 16:16:47 2011 -0400
PR1741: Start PulseAudioTargetDataLines in the corked state.
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.
changeset 26295314f6d6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=26295314f6d6
author: Denis Lila <dlila at redhat.com>
date: Thu Jun 16 11:11:35 2011 -0400
PR1741: Fix a few concurrency problems in pulse audio.
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().
changeset b746d080787e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b746d080787e
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 20 11:23:24 2011 -0400
PR734: Fix pulse-java latency problem.
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.
changeset 9b0027357967 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9b0027357967
author: Xerxes Ranby <xerxes at zafena.se>
date: Thu Sep 29 16:59:04 2011 +0200
LP862286, PR1741: 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 9ef423f94e8c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9ef423f94e8c
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 28 20:04:54 2012 -0400
PR1741: Synchronize access to shared variable
The variable writeInterrupted is accessed everywhere while holding a lock on
'this' object, except in one location. Fix that.
2012-06-28 Omair Majid <omajid at redhat.com>
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
(write): Synchronize access to writeInterrupted flag.
changeset aa2257220561 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=aa2257220561
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Oct 03 13:07:54 2011 +0200
LP862286, PR1741: 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 e94cd8db46cd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e94cd8db46cd
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 20 14:14:56 2011 -0400
PR1741: Fix pulse audio regression.
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.
changeset 8f185d6f0164 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8f185d6f0164
author: Xerxes Ranby <xerxes at zafena.se>
date: Mon Oct 03 16:35:35 2011 +0200
PR1741: Make PulseAudio code compliant to the JNI specification.
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_1get_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/functions.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.
changeset e5d122ba61c0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e5d122ba61c0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Mar 02 17:03:51 2016 +0000
PR1741: Break PulseAudio provider out into IcedTea-Sound
2014-06-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1741: Break PulseAudio provider out into IcedTea-Sound
* patches/pulse-soundproperties.patch,
* pulseaudio/COPYING,
* pulseaudio/README,
* pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java,
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java,
* pulseaudio/src/native/jni-common.c,
* pulseaudio/src/native/jni-common.h,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c,
* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c,
* pulseaudio/testsounds/README,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioEventLoopOverhead.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerProviderTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java,
* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java:
Moved to IcedTea-Sound.
* INSTALL: Remove PulseAudio references.
* Makefile.am:
(PULSE_JAVA_DIR): Removed.
(PULSE_JAVA_NATIVE_SRCDIR): Likewise.
(PULSE_JAVA_NATIVE_SRCS): Likewise.
(PULSE_JAVA_BUILDDIR): Likewise.
(PULSE_JAVA_NATIVE_BUILDDIR): Likewise.
(PULSE_JAVA_NATIVE_OBJECTS): Likewise.
(PULSE_JAVA_JAVA_SRCDIR): Likewise.
(PULSE_JAVA_CLASS_DIR): Likewise.
(PULSE_JAVA_TARGET): Removed.
(ICEDTEA_PATCHES): Drop PulseAudio patch.
(PULSEAUDIO_SRCS): Removed.
(EXTRA_DIST): Removed PULSEAUDIO_SRCS.
(clean-local): Remove clean-pulse-java.
(icedtea-configure): Remove PULSE_JAVA_TARGET.
(icedtea): Remove PulseAudio provider installation.
(icedtea-debug-configure): Remove PULSE_JAVA_TARGET.
(icedtea-debug): Remove PulseAudio provider installation.
(pulse-java): Removed.
(pulse-java-class): Likewise.
(pulse-java-jar): Likewise.
(pulse-java-headers): Likewise.
($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Likewise.
($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): Likewise.
(clean-pulse-java): Likewise.
* NEWS: Updated.
* configure.ac:
Remove --enable-pulse-java option and PulseAudio library
checks.
diffstat:
ChangeLog | 281 +
INSTALL | 9 -
Makefile.am | 126 +-
NEWS | 1 +
configure.ac | 22 -
patches/pulse-soundproperties.patch | 16 -
pulseaudio/COPYING | 340 --
pulseaudio/README | 28 -
pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider | 3 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java | 68 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java | 50 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java | 114 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java | 282 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java | 162 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java | 574 ----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java | 504 ---
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java | 124 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java | 793 -----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java | 62 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java | 63 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java | 85 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java | 161 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java | 342 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java | 95 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java | 395 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java | 88 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java | 101 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java | 31 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java | 795 -----
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java | 84 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java | 70 -
pulseaudio/src/native/jni-common.c | 236 -
pulseaudio/src/native/jni-common.h | 90 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c | 297 --
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c | 83 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c | 102 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c | 107 -
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c | 1060 -------
pulseaudio/testsounds/README | 4 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java | 114 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java | 624 ----
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioEventLoopOverhead.java | 100 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerProviderTest.java | 118 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java | 120 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java | 434 ---
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java | 299 --
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java | 1406 ----------
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java | 117 -
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java | 648 ----
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java | 117 -
50 files changed, 287 insertions(+), 11658 deletions(-)
diffs (truncated from 12271 to 500 lines):
diff -r 134b14628088 -r e5d122ba61c0 ChangeLog
--- a/ChangeLog Mon Feb 22 06:17:58 2016 +0000
+++ b/ChangeLog Wed Mar 02 17:03:51 2016 +0000
@@ -1,3 +1,284 @@
+2014-06-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1741: Break PulseAudio provider out into IcedTea-Sound
+ * patches/pulse-soundproperties.patch,
+ * pulseaudio/COPYING,
+ * pulseaudio/README,
+ * pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextEvent.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/ContextListener.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerInfo.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioVolumeControl.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamBufferAttributes.java,
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/StreamSampleSpecification.java,
+ * pulseaudio/src/native/jni-common.c,
+ * pulseaudio/src/native/jni-common.h,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_ContextEvent.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c,
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c,
+ * pulseaudio/testsounds/README,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioEventLoopOverhead.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerProviderTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java,
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java:
+ Moved to IcedTea-Sound.
+ * INSTALL: Remove PulseAudio references.
+ * Makefile.am:
+ (PULSE_JAVA_DIR): Removed.
+ (PULSE_JAVA_NATIVE_SRCDIR): Likewise.
+ (PULSE_JAVA_NATIVE_SRCS): Likewise.
+ (PULSE_JAVA_BUILDDIR): Likewise.
+ (PULSE_JAVA_NATIVE_BUILDDIR): Likewise.
+ (PULSE_JAVA_NATIVE_OBJECTS): Likewise.
+ (PULSE_JAVA_JAVA_SRCDIR): Likewise.
+ (PULSE_JAVA_CLASS_DIR): Likewise.
+ (PULSE_JAVA_TARGET): Removed.
+ (ICEDTEA_PATCHES): Drop PulseAudio patch.
+ (PULSEAUDIO_SRCS): Removed.
+ (EXTRA_DIST): Removed PULSEAUDIO_SRCS.
+ (clean-local): Remove clean-pulse-java.
+ (icedtea-configure): Remove PULSE_JAVA_TARGET.
+ (icedtea): Remove PulseAudio provider installation.
+ (icedtea-debug-configure): Remove PULSE_JAVA_TARGET.
+ (icedtea-debug): Remove PulseAudio provider installation.
+ (pulse-java): Removed.
+ (pulse-java-class): Likewise.
+ (pulse-java-jar): Likewise.
+ (pulse-java-headers): Likewise.
+ ($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Likewise.
+ ($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): Likewise.
+ (clean-pulse-java): Likewise.
+ * NEWS: Updated.
+ * configure.ac:
+ Remove --enable-pulse-java option and PulseAudio library
+ checks.
+
+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-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-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.
+
+2012-06-28 Omair Majid <omajid at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+ (write): Synchronize access to writeInterrupted flag.
+
+2011-09-29 Xerxes RÃ¥nby <xerxes at zafena.se>
+ David Henningsson <david.henningsson at canonical.com>
+
+ LP862286
+ * 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/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-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-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.
+
+2012-06-28 Omair Majid <omajid at redhat.com>
+
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
+ (getMicrosecondLength, getMicrosecondPosition)
+ (setMicrosecondPosition): Use correct factor to convert seconds to
+ microseconds.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+ (getMicrosecondPosition): Likewise.
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPlaybackLine.java:
+ Define SECONDS_TO_MICROSECONDS.
+
+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.
+
+2012-06-28 Omair Majid <omajid at redhat.com>
+
+ PR1050: Stream objects not garbage collected
+ * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java:
+ Add new member variable contextPointer.
+ * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1new):
+ Save j_context as contextPointer.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1unref):
+ Delete the global ref and dellocate the java context.
+ (cork_callback): Don't check userdata. It is NULL.
+ (Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1cork):
+ Dont allocate and pass a java_context to pa_stream_cork. It is not needed.
+ * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java
+ (testOpenCloseLotsOfTimes): New method.
+
+2011-06-10 Denis Lila <dlila at redhat.com>
+
+ * pulseaudio/*: Fix whitespace.
+
2016-02-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
Bump to icedtea-3.0.0pre09.
diff -r 134b14628088 -r e5d122ba61c0 INSTALL
--- a/INSTALL Mon Feb 22 06:17:58 2016 +0000
+++ b/INSTALL Wed Mar 02 17:03:51 2016 +0000
@@ -27,7 +27,6 @@
libjpeg-devel >= 6b
zlib-devel
libffi (for --enable-zero or on archs other than x86/x86_64/sparc)
-pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java)
LLVM 2.5 or later (for --enable-shark)
systemtap-sdl-devel >= 0.9.5 (Java method tracing requires systemtap >= 0.9.9)
@@ -148,7 +147,6 @@
* --disable-hotspot-tests: Disable the running of the HotSpot JTReg suite.
* --disable-langtools-tests: Disable the running of the langtools JTReg suite.
* --disable-jdk-tests: Disable the running of the jdk JTreg suite.
-* --enable-pulse-java: Build the PulseAudio sound provider.
* --disable-xrender: Don't include the XRender pipeline.
* --enable-systemtap: Include support for tracing using systemtap.
* --enable-nss: Enable the NSS security provider.
@@ -175,13 +173,6 @@
as a way of avoiding running the extensive JDK test suite which
takes several hours.
-The PulseAudio provider
-=======================
-
-IcedTea7 includes an implementation of the javax.sound.* APIs using
-PulseAudio which can be enabled using --enable-pulse-java. The resulting
-provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider.
-
Xrender Support
===============
diff -r 134b14628088 -r e5d122ba61c0 Makefile.am
--- a/Makefile.am Mon Feb 22 06:17:58 2016 +0000
+++ b/Makefile.am Wed Mar 02 17:03:51 2016 +0000
@@ -79,16 +79,6 @@
CORBA = openjdk-boot/corba/src/share/classes
JAXWS = openjdk-boot/jaxws/src/share/jaxws_classes
-PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
-PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
-PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
-PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio.build
-PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
-PULSE_JAVA_NATIVE_OBJECTS = \
- $(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
-PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
-PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-
OPENJDK_SOURCEPATH_DIRS = \
$(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
@@ -145,10 +135,6 @@
REV_ARG = -r $(HGREV)
endif
-if ENABLE_PULSE_JAVA
-PULSE_JAVA_TARGET = stamps/pulse-java.stamp
-endif
-
# This should not depend on bootstrapping
# but on whether MEMORY_LIMIT is accepted
# as an argument to javac
@@ -255,11 +241,6 @@
patches/cacao/ignore-tests.patch
endif
-if ENABLE_PULSE_JAVA
-ICEDTEA_PATCHES += \
- patches/pulse-soundproperties.patch
-endif
-
if BUILD_JAMVM
ICEDTEA_PATCHES += \
patches/jamvm/find_class_from_caller.patch
@@ -585,27 +566,14 @@
$(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \
$(top_srcdir)/test/jtreg/excludelist.langtools.jtx
-PULSEAUDIO_SRCS = $(top_srcdir)/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/*.java \
- $(top_srcdir)/pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider \
- $(top_srcdir)/pulseaudio/src/native/*.h \
- $(top_srcdir)/pulseaudio/src/native/*.c \
- $(top_srcdir)/pulseaudio/TODO \
- $(top_srcdir)/pulseaudio/README \
- $(top_srcdir)/pulseaudio/testsounds/README \
- $(top_srcdir)/pulseaudio/testsounds/startup.wav \
- $(top_srcdir)/pulseaudio/testsounds/logout.wav \
- $(top_srcdir)/pulseaudio/testsounds/error.wav \
- $(top_srcdir)/pulseaudio/unittests/org/classpath/icedtea/pulseaudio/*.java \
- $(top_srcdir)/pulseaudio/COPYING
-
DESKTOP_FILES = jconsole.desktop policytool.desktop
EXTRA_DIST = $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
$(top_srcdir)/patches/jamvm/*.patch \
tools-copy contrib overlays \
- $(JTREG_SRCS) $(DESKTOP_FILES) HACKING \
- $(PULSEAUDIO_SRCS) autogen.sh \
+ $(JTREG_SRCS) $(DESKTOP_FILES) \
+ HACKING autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
@@ -630,7 +598,7 @@
fi \
fi
-clean-local: clean-tests clean-pulse-java \
+clean-local: clean-tests \
clean-icedtea clean-icedtea-debug clean-icedtea-boot clean-clone clean-clone-boot \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
@@ -1576,7 +1544,7 @@
# you change it in the icedtea-debug target as well.
stamps/icedtea-configure.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/jamvm.stamp
+ stamps/cacao.stamp stamps/jamvm.stamp
mkdir -p $(BUILD_OUTPUT_DIR)
cd $(BUILD_OUTPUT_DIR) && \
$(SHELL) $(abs_top_builddir)/openjdk/configure $(ICEDTEA_CONFIGURE)
@@ -1593,16 +1561,6 @@
mkdir -p $(BUILD_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_SDK_DIR)/jre/lib/ext
mkdir -p $(BUILD_JRE_DIR)/lib/ext
-if ENABLE_PULSE_JAVA
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf pulse-java.jar $(BUILD_SDK_DIR)/jre/lib/ext
- cp -pPRf pulse-java.jar $(BUILD_JRE_DIR)/lib/ext
- (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(BUILD_SDK_DIR)/src.zip org )
-endif
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1647,7 +1605,7 @@
stamps/icedtea-debug-configure.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/jamvm.stamp
+ stamps/cacao.stamp stamps/jamvm.stamp
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)
cd $(DEBUG_BUILD_OUTPUT_DIR) && \
$(SHELL) $(abs_top_builddir)/openjdk/configure $(ICEDTEA_CONFIGURE) \
@@ -1665,18 +1623,6 @@
mkdir -p $(BUILD_DEBUG_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_DEBUG_SDK_DIR)/jre/lib/ext
mkdir -p $(BUILD_DEBUG_JRE_DIR)/lib/ext
-if ENABLE_PULSE_JAVA
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
- $(BUILD_DEBUG_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf pulse-java.jar \
- $(BUILD_DEBUG_SDK_DIR)/jre/lib/ext
- cp -pPRf pulse-java.jar \
- $(BUILD_DEBUG_JRE_DIR)/lib/ext
- (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(BUILD_DEBUG_SDK_DIR)/src.zip org )
-endif
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
@@ -1901,66 +1847,6 @@
clean-icedtea-stage1: clean-check-crypto-boot clean-add-archive-boot
rm -f stamps/icedtea-stage1.stamp
-# PulseAudio based mixer
-# (pulse-java)
-if ENABLE_PULSE_JAVA
-
-stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
- mkdir -p stamps
- touch $@
-
-stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
- mkdir -p $(PULSE_JAVA_CLASS_DIR)
- (cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
- -bootclasspath $(RUNTIME) org/classpath/icedtea/pulseaudio/*.java \
- )
- cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
- chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
- mkdir -p stamps
- touch $@
-
-stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
- $(BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
- mkdir -p stamps
- touch $@
-
-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 ;
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(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
- $(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(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
- mkdir -p stamps
- touch $@
-
More information about the distro-pkg-dev
mailing list