[kaffe] CVS kaffe (robilad): moved over tritonus into its own directory

Kaffe CVS cvs-commits at kaffe.org
Sun Jul 16 16:10:50 PDT 2006


PatchSet 7358 
Date: 2006/07/16 22:54:46
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
moved over tritonus into its own directory

2006-07-16  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: Output libraries/javalib/tritonus-sound/Makefile.

        * include/Makefile.am: Add kaffe-tritonus.jar to KAFFE_JNI_CLASSPATH.

        * libraries/javalib/Makefile.am.in: (COND_NATIVE_SOUND) Build
        tritonus when native sound is enabled.

        * libraries/javalib/tritonus-sound/Makefile.am: New file.

Members: 
	ChangeLog:1.4862->1.4863 
	configure:1.559->1.560 
	configure.ac:1.237->1.238 
	include/Makefile.am:1.128->1.129 
	include/Makefile.in:1.285->1.286 
	libraries/javalib/Makefile.am:1.444->1.445 
	libraries/javalib/Makefile.am.in:1.62->1.63 
	libraries/javalib/Makefile.in:1.558->1.559 
	libraries/javalib/tritonus-sound/Makefile.am:INITIAL->1.1 
	libraries/javalib/tritonus-sound/Makefile.in:INITIAL->1.1 
	libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.AudioFileReader:INITIAL->1.1 
	libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.AudioFileWriter:INITIAL->1.1 
	libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider:INITIAL->1.1 
	libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.MixerProvider:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/Alsa.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaCtl.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaCtlCardInfo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaMixer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaMixerElement.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcm.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeq.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqClientInfo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqEvent.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqPortInfo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqPortSubscribe.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueInfo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueStatus.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueTempo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueTimer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqRemoveEvents.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqSystemInfo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/Esd.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/EsdRecordingStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/EsdSample.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/EsdStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiChannel.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiDevice.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiDeviceProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiIn.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiOut.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaQueueHolder.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaReceiver.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSequencer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSequencerProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSequencerReceiver.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSynthesizer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/file/MidiConstants.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/file/StandardMidiFileReader.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/file/StandardMidiFileWriter.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/midi/file/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/AlawFormatConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/PCM2PCMConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/SampleRateConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/SmartFormatConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/UlawFormatConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffAudioFileReader.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffAudioFileWriter.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffAudioOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffTool.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuAudioFileReader.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuAudioFileWriter.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuAudioOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuTool.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveAudioFileReader.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveAudioFileWriter.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveAudioOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveTool.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixerProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaPortMixerProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaUtils.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdClip.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdMixer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdMixerProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdUtils.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/ArraySet.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/GlobalInfo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/StringHashedSet.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/TCircularBuffer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/TDebug.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/TNotifier.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/TSettings.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/midi/MidiUtils.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/midi/TMidiDevice.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/midi/TMidiFileFormat.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/midi/TSequencer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/midi/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioFileTypes.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioFormatSet.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioFormats.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioSystemShadow.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioUtils.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/Encodings.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/FloatSampleBuffer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/TConversionTool.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/TVolumeUtils.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TAsynchronousFilteredAudioInputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TAudioInputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TEncodingFormatConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TFormatConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TSimpleFormatConversionProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TSynchronousFilteredAudioInputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/AudioOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/HeaderlessAudioOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioFileFormat.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioFileReader.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioFileWriter.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TDataOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/THeaderlessAudioFileWriter.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TNonSeekableDataOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TSeekableDataOutputStream.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/package.html:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TBaseDataLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TBooleanControl.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TClip.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TCompoundControl.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TCompoundControlType.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TControlController.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TControllable.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TDataLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TEnumControl.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TFloatControl.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TLine.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TMixer.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TMixerInfo.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TMixerProvider.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TPort.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TSoftClip.java:INITIAL->1.1 
	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/package.html:INITIAL->1.1 
	libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileReader:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.MixerProvider:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/core/Service.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/core/TAudioConfig.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/core/TInit.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/core/TMidiConfig.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/core/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/Alsa.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaCtl.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaCtlCardInfo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaMixer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaMixerElement.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcm.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeq.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqClientInfo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqEvent.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortInfo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortSubscribe.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueInfo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueStatus.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTempo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTimer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqRemoveEvents.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqSystemInfo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/Esd.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/EsdRecordingStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/EsdSample.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/EsdStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiChannel.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiDevice.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiDeviceProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiIn.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiOut.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaQueueHolder.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaReceiver.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSequencer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSequencerProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSequencerReceiver.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSynthesizer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/file/MidiConstants.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/file/StandardMidiFileReader.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/file/StandardMidiFileWriter.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/midi/file/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/convert/AlawFormatConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/convert/PCM2PCMConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/convert/SampleRateConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/convert/SmartFormatConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/convert/UlawFormatConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/convert/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffAudioFileReader.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffAudioFileWriter.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffAudioOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffTool.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuAudioFileReader.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuAudioFileWriter.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuAudioOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuTool.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveAudioFileReader.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveAudioFileWriter.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveAudioOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveTool.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/file/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixerProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaPortMixerProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java:1.2->1.3(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaUtils.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdClip.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdMixer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdMixerProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdUtils.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/ArraySet.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/GlobalInfo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/StringHashedSet.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/TCircularBuffer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/TDebug.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/TNotifier.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/TSettings.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/midi/MidiUtils.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/midi/TMidiDevice.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/midi/TMidiFileFormat.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/midi/TSequencer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/midi/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioFileTypes.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioFormatSet.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioFormats.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioSystemShadow.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioUtils.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/Encodings.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/FloatSampleBuffer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/TConversionTool.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/TVolumeUtils.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TAsynchronousFilteredAudioInputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TAudioInputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TEncodingFormatConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TFormatConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TSimpleFormatConversionProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TSynchronousFilteredAudioInputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/AudioOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/HeaderlessAudioOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioFileFormat.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioFileReader.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioFileWriter.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TDataOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/THeaderlessAudioFileWriter.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TNonSeekableDataOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TSeekableDataOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/package.html:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TBaseDataLine.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TBooleanControl.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TClip.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TCompoundControl.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TCompoundControlType.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TControlController.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TControllable.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TDataLine.java:1.2->1.3(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TEnumControl.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TFloatControl.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TLine.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TMixer.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TMixerInfo.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TMixerProvider.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TPort.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TSoftClip.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/package.html:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4862 kaffe/ChangeLog:1.4863
--- kaffe/ChangeLog:1.4862	Sun Jul 16 17:25:57 2006
+++ kaffe/ChangeLog	Sun Jul 16 22:54:46 2006
@@ -1,5 +1,305 @@
 2006-07-16  Dalibor Topic  <robilad at kaffe.org>
 
+	* configure.ac: Output libraries/javalib/tritonus-sound/Makefile.
+
+	* include/Makefile.am: Add kaffe-tritonus.jar to KAFFE_JNI_CLASSPATH.
+
+	* libraries/javalib/Makefile.am.in: (COND_NATIVE_SOUND) Build 
+	tritonus when native sound is enabled.
+
+	* libraries/javalib/tritonus-sound/Makefile.am: New file.
+
+	* libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.AudioFileReader
+	libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.AudioFileWriter
+	libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider
+	libraries/javalib/tritonus-sound/META-INF/services/javax.sound.sampled.spi.MixerProvider
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/Alsa.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaCtl.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaCtlCardInfo.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaMixer.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaMixerElement.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcm.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeq.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqClientInfo.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqEvent.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqPortInfo.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqPortSubscribe.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueInfo.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueStatus.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueTempo.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqQueueTimer.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqRemoveEvents.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/AlsaSeqSystemInfo.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/alsa/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/Esd.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/EsdRecordingStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/EsdSample.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/EsdStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/lowlevel/esd/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiChannel.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiDevice.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiDeviceProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiIn.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaMidiOut.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaQueueHolder.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaReceiver.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSequencer.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSequencerProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSequencerReceiver.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/AlsaSynthesizer.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/device/alsa/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/midi/file/MidiConstants.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/file/StandardMidiFileReader.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/file/StandardMidiFileWriter.java
+	libraries/javalib/tritonus-sound/org/tritonus/midi/file/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/AlawFormatConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/PCM2PCMConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/SampleRateConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/SmartFormatConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/UlawFormatConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/convert/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffAudioFileReader.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffAudioFileWriter.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffAudioOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AiffTool.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuAudioFileReader.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuAudioFileWriter.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuAudioOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/AuTool.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveAudioFileReader.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveAudioFileWriter.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveAudioOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/WaveTool.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/file/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixerProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaPortMixerProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/AlsaUtils.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/alsa/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdClip.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdMixer.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdMixerProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/EsdUtils.java
+	libraries/javalib/tritonus-sound/org/tritonus/sampled/mixer/esd/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/share/ArraySet.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/GlobalInfo.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/StringHashedSet.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/TCircularBuffer.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/TDebug.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/TNotifier.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/TSettings.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/share/midi/MidiUtils.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/midi/TMidiDevice.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/midi/TMidiFileFormat.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/midi/TSequencer.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/midi/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioFileTypes.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioFormatSet.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioFormats.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioSystemShadow.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/AudioUtils.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/Encodings.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/FloatSampleBuffer.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/TConversionTool.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/TVolumeUtils.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TAsynchronousFilteredAudioInputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TAudioInputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TEncodingFormatConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TFormatConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TSimpleFormatConversionProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/TSynchronousFilteredAudioInputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/convert/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/AudioOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/HeaderlessAudioOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioFileFormat.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioFileReader.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioFileWriter.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TAudioOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TDataOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/THeaderlessAudioFileWriter.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TNonSeekableDataOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/TSeekableDataOutputStream.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/file/package.html
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TBaseDataLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TBooleanControl.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TClip.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TCompoundControl.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TCompoundControlType.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TControlController.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TControllable.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TDataLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TEnumControl.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TFloatControl.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TLine.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TMixer.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TMixerInfo.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TMixerProvider.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TPort.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/TSoftClip.java
+	libraries/javalib/tritonus-sound/org/tritonus/share/sampled/mixer/package.html:
+	Moved over here from ...
+
+	* libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileReader
+	libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter
+	libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider
+	libraries/javalib/vmspecific/META-INF/services/javax.sound.sampled.spi.MixerProvider
+	libraries/javalib/vmspecific/org/tritonus/core/Service.java
+	libraries/javalib/vmspecific/org/tritonus/core/TAudioConfig.java
+	libraries/javalib/vmspecific/org/tritonus/core/TInit.java
+	libraries/javalib/vmspecific/org/tritonus/core/TMidiConfig.java
+	libraries/javalib/vmspecific/org/tritonus/core/package.html
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/Alsa.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaCtl.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaCtlCardInfo.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaMixer.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaMixerElement.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcm.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeq.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqClientInfo.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqEvent.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortInfo.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortSubscribe.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueInfo.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueStatus.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTempo.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTimer.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqRemoveEvents.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqSystemInfo.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/alsa/package.html
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/Esd.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/EsdRecordingStream.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/EsdSample.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/EsdStream.java
+	libraries/javalib/vmspecific/org/tritonus/lowlevel/esd/package.html
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiChannel.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiDevice.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiDeviceProvider.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiIn.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaMidiOut.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaQueueHolder.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaReceiver.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSequencer.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSequencerProvider.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSequencerReceiver.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/AlsaSynthesizer.java
+	libraries/javalib/vmspecific/org/tritonus/midi/device/alsa/package.html
+	libraries/javalib/vmspecific/org/tritonus/midi/file/MidiConstants.java
+	libraries/javalib/vmspecific/org/tritonus/midi/file/StandardMidiFileReader.java
+	libraries/javalib/vmspecific/org/tritonus/midi/file/StandardMidiFileWriter.java
+	libraries/javalib/vmspecific/org/tritonus/midi/file/package.html
+	libraries/javalib/vmspecific/org/tritonus/sampled/convert/AlawFormatConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/convert/PCM2PCMConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/convert/SampleRateConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/convert/SmartFormatConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/convert/UlawFormatConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/convert/package.html
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffAudioFileReader.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffAudioFileWriter.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffAudioOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AiffTool.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuAudioFileReader.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuAudioFileWriter.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuAudioOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/AuTool.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveAudioFileReader.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveAudioFileWriter.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveAudioOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/WaveTool.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/file/package.html
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixerProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaPortMixerProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/AlsaUtils.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/alsa/package.html
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdClip.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdMixer.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdMixerProvider.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/EsdUtils.java
+	libraries/javalib/vmspecific/org/tritonus/sampled/mixer/esd/package.html
+	libraries/javalib/vmspecific/org/tritonus/share/ArraySet.java
+	libraries/javalib/vmspecific/org/tritonus/share/GlobalInfo.java
+	libraries/javalib/vmspecific/org/tritonus/share/StringHashedSet.java
+	libraries/javalib/vmspecific/org/tritonus/share/TCircularBuffer.java
+	libraries/javalib/vmspecific/org/tritonus/share/TDebug.java
+	libraries/javalib/vmspecific/org/tritonus/share/TNotifier.java
+	libraries/javalib/vmspecific/org/tritonus/share/TSettings.java
+	libraries/javalib/vmspecific/org/tritonus/share/package.html
+	libraries/javalib/vmspecific/org/tritonus/share/midi/MidiUtils.java
+	libraries/javalib/vmspecific/org/tritonus/share/midi/TMidiDevice.java
+	libraries/javalib/vmspecific/org/tritonus/share/midi/TMidiFileFormat.java
+	libraries/javalib/vmspecific/org/tritonus/share/midi/TSequencer.java
+	libraries/javalib/vmspecific/org/tritonus/share/midi/package.html
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioFileTypes.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioFormatSet.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioFormats.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioSystemShadow.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/AudioUtils.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/Encodings.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/FloatSampleBuffer.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/TConversionTool.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/TVolumeUtils.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/package.html
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TAsynchronousFilteredAudioInputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TAudioInputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TEncodingFormatConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TFormatConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TSimpleFormatConversionProvider.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/TSynchronousFilteredAudioInputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/convert/package.html
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/AudioOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/HeaderlessAudioOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioFileFormat.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioFileReader.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioFileWriter.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TAudioOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TDataOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/THeaderlessAudioFileWriter.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TNonSeekableDataOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/TSeekableDataOutputStream.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/file/package.html
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TBaseDataLine.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TBooleanControl.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TClip.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TCompoundControl.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TCompoundControlType.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TControlController.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TControllable.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TDataLine.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TEnumControl.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TFloatControl.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TLine.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TMixer.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TMixerInfo.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TMixerProvider.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TPort.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/TSoftClip.java
+	libraries/javalib/vmspecific/org/tritonus/share/sampled/mixer/package.html:
+	Removed.
+
+2006-07-16  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/vmspecific/org/kaffe/util/Base64.java,
 	libraries/javalib/vmspecific/org/kaffe/util/DateParser.java,
 	libraries/javalib/vmspecific/org/kaffe/util/DateScanner.java,
Index: kaffe/configure
diff -u kaffe/configure:1.559 kaffe/configure:1.560
--- kaffe/configure:1.559	Sun Jul 16 15:04:10 2006
+++ kaffe/configure	Sun Jul 16 22:54:50 2006
@@ -51045,6 +51045,8 @@
 
           ac_config_files="$ac_config_files libraries/javalib/gmp-math/Makefile"
 
+          ac_config_files="$ac_config_files libraries/javalib/tritonus-sound/Makefile"
+
           ac_config_files="$ac_config_files libraries/clib/Makefile"
 
           ac_config_files="$ac_config_files libraries/clib/target/Makefile"
@@ -52053,6 +52055,7 @@
   "libraries/javalib/awt-implementations/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/awt-implementations/Makefile" ;;
   "libraries/javalib/awt-implementations/kaffe/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/awt-implementations/kaffe/Makefile" ;;
   "libraries/javalib/gmp-math/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/gmp-math/Makefile" ;;
+  "libraries/javalib/tritonus-sound/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/javalib/tritonus-sound/Makefile" ;;
   "libraries/clib/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/Makefile" ;;
   "libraries/clib/target/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/target/Makefile" ;;
   "libraries/clib/target/generic/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/target/generic/Makefile" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.237 kaffe/configure.ac:1.238
--- kaffe/configure.ac:1.237	Sun Jul 16 15:04:16 2006
+++ kaffe/configure.ac	Sun Jul 16 22:54:56 2006
@@ -2511,6 +2511,7 @@
 AC_CONFIG_FILES([libraries/javalib/awt-implementations/Makefile])
 AC_CONFIG_FILES([libraries/javalib/awt-implementations/kaffe/Makefile])
 AC_CONFIG_FILES([libraries/javalib/gmp-math/Makefile])
+AC_CONFIG_FILES([libraries/javalib/tritonus-sound/Makefile])
 AC_CONFIG_FILES([libraries/clib/Makefile])
 AC_CONFIG_FILES([libraries/clib/target/Makefile])
 AC_CONFIG_FILES([libraries/clib/target/generic/Makefile])
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.128 kaffe/include/Makefile.am:1.129
--- kaffe/include/Makefile.am:1.128	Sun Jul 16 16:17:45 2006
+++ kaffe/include/Makefile.am	Sun Jul 16 22:54:56 2006
@@ -11,7 +11,7 @@
 # of this file. 
 
 KLASSES_JAR = $(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
-
+KAFFEH_JNI_CLASSPATH = $(top_builddir)/libraries/javalib/tritonus-sound/lib:$(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR)
 
 EXTRA_DIST = distclean-hack \
 		stamp-h2.in
@@ -235,8 +235,8 @@
 ## but if it does not change, do not touch it
 	@set -e; for f in $(JNI_DERIVED_HDRS); do \
 	  class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
-	  echo "$(KAFFEH) -jni -classpath $(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip -o $$f $$class"; \
-	  $(KAFFEH) -jni -classpath $(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip -o stamp-h1$$f $$class; \
+	  echo "$(KAFFEH) -jni -classpath $(KAFFEH_JNI_CLASSPATH) -o $$f $$class"; \
+	  $(KAFFEH) -jni -classpath $(KAFFEH_JNI_CLASSPATH) -o stamp-h1$$f $$class; \
 	  if test -f $$f && cmp $$f stamp-h1$$f >/dev/null; then \
 	    echo "$$f is already up-to-date"; \
 	    rm -f stamp-h1$$f; \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.285 kaffe/include/Makefile.in:1.286
--- kaffe/include/Makefile.in:1.285	Sun Jul 16 16:17:45 2006
+++ kaffe/include/Makefile.in	Sun Jul 16 22:54:57 2006
@@ -365,6 +365,7 @@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
 KLASSES_JAR = $(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip
+KAFFEH_JNI_CLASSPATH = $(top_builddir)/libraries/javalib/tritonus-sound/lib:$(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR)
 EXTRA_DIST = distclean-hack \
 		stamp-h2.in
 
@@ -848,8 +849,8 @@
 stamp-h1all: stamp-kaffeh $(KLASSES_JAR)
 	@set -e; for f in $(JNI_DERIVED_HDRS); do \
 	  class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
-	  echo "$(KAFFEH) -jni -classpath $(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip -o $$f $$class"; \
-	  $(KAFFEH) -jni -classpath $(top_builddir)/libraries/javalib/gmp-math/lib:$(KLASSES_JAR):$(top_builddir)/libraries/javalib/lib:$(top_builddir)/libraries/javalib/external/classpath/lib/glibj.zip -o stamp-h1$$f $$class; \
+	  echo "$(KAFFEH) -jni -classpath $(KAFFEH_JNI_CLASSPATH) -o $$f $$class"; \
+	  $(KAFFEH) -jni -classpath $(KAFFEH_JNI_CLASSPATH) -o stamp-h1$$f $$class; \
 	  if test -f $$f && cmp $$f stamp-h1$$f >/dev/null; then \
 	    echo "$$f is already up-to-date"; \
 	    rm -f stamp-h1$$f; \
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.444 kaffe/libraries/javalib/Makefile.am:1.445
--- kaffe/libraries/javalib/Makefile.am:1.444	Sun Jul 16 17:26:02 2006
+++ kaffe/libraries/javalib/Makefile.am	Sun Jul 16 22:54:57 2006
@@ -19,6 +19,10 @@
 MAYBE_GMP_JAVA_MATH=gmp-math
 endif
 
+if COND_NATIVE_SOUND
+  MAYBE_TRITONUS_SOUND=tritonus-sound
+endif
+
 if USE_PRECOMPILED_RT_JAR
 stamp-glibj:
 	@echo Importing glibj.zip from $(PATH_TO_RT_JAR)
@@ -37,7 +41,12 @@
 clean-local:
 	rm -rf stamp-glibj glibj.zip
 
-SUBDIRS= . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
+SUBDIRS= \
+	. \
+	external/classpath \
+	$(MAYBE_PEERLESS_KAFFE_AWT) \
+	$(MAYBE_GMP_JAVA_MATH) \
+	$(MAYBE_TRITONUS_SOUND)
 
 jrelib_DATA= \
 	     logging.properties \
@@ -59,10 +68,6 @@
 	    Makefile.am.in \
 	    logging.properties \
 	vmspecific/META-INF/MANIFEST.MF \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.MixerProvider \
 	vmspecific/gnu/bytecodecvssnap/Access.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayType.java \
@@ -308,147 +313,6 @@
 	vmspecific/org/objectweb/asm153/Item.java \
 	vmspecific/org/objectweb/asm153/Label.java \
 	vmspecific/org/objectweb/asm153/Type.java \
-	vmspecific/org/tritonus/core/Service.java \
-	vmspecific/org/tritonus/core/TAudioConfig.java \
-	vmspecific/org/tritonus/core/TInit.java \
-	vmspecific/org/tritonus/core/TMidiConfig.java \
-	vmspecific/org/tritonus/core/package.html \
-	vmspecific/org/tritonus/lowlevel/alsa/Alsa.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaCtl.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaCtlCardInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaMixer.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaMixerElement.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcm.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeq.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqClientInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqEvent.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortSubscribe.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueStatus.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTempo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTimer.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqRemoveEvents.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqSystemInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/package.html \
-	vmspecific/org/tritonus/lowlevel/esd/Esd.java \
-	vmspecific/org/tritonus/lowlevel/esd/EsdRecordingStream.java \
-	vmspecific/org/tritonus/lowlevel/esd/EsdSample.java \
-	vmspecific/org/tritonus/lowlevel/esd/EsdStream.java \
-	vmspecific/org/tritonus/lowlevel/esd/package.html \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaMidiChannel.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaMidiDevice.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaMidiDeviceProvider.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaMidiIn.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaMidiOut.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaQueueHolder.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaReceiver.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaSequencer.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaSequencerProvider.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaSequencerReceiver.java \
-	vmspecific/org/tritonus/midi/device/alsa/AlsaSynthesizer.java \
-	vmspecific/org/tritonus/midi/device/alsa/package.html \
-	vmspecific/org/tritonus/midi/file/MidiConstants.java \
-	vmspecific/org/tritonus/midi/file/StandardMidiFileReader.java \
-	vmspecific/org/tritonus/midi/file/StandardMidiFileWriter.java \
-	vmspecific/org/tritonus/midi/file/package.html \
-	vmspecific/org/tritonus/sampled/convert/AlawFormatConversionProvider.java \
-	vmspecific/org/tritonus/sampled/convert/PCM2PCMConversionProvider.java \
-	vmspecific/org/tritonus/sampled/convert/SampleRateConversionProvider.java \
-	vmspecific/org/tritonus/sampled/convert/SmartFormatConversionProvider.java \
-	vmspecific/org/tritonus/sampled/convert/UlawFormatConversionProvider.java \
-	vmspecific/org/tritonus/sampled/convert/package.html \
-	vmspecific/org/tritonus/sampled/file/AiffAudioFileReader.java \
-	vmspecific/org/tritonus/sampled/file/AiffAudioFileWriter.java \
-	vmspecific/org/tritonus/sampled/file/AiffAudioOutputStream.java \
-	vmspecific/org/tritonus/sampled/file/AiffTool.java \
-	vmspecific/org/tritonus/sampled/file/AuAudioFileReader.java \
-	vmspecific/org/tritonus/sampled/file/AuAudioFileWriter.java \
-	vmspecific/org/tritonus/sampled/file/AuAudioOutputStream.java \
-	vmspecific/org/tritonus/sampled/file/AuTool.java \
-	vmspecific/org/tritonus/sampled/file/WaveAudioFileReader.java \
-	vmspecific/org/tritonus/sampled/file/WaveAudioFileWriter.java \
-	vmspecific/org/tritonus/sampled/file/WaveAudioOutputStream.java \
-	vmspecific/org/tritonus/sampled/file/WaveTool.java \
-	vmspecific/org/tritonus/sampled/file/package.html \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixerProvider.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaPortMixerProvider.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/AlsaUtils.java \
-	vmspecific/org/tritonus/sampled/mixer/alsa/package.html \
-	vmspecific/org/tritonus/sampled/mixer/esd/EsdClip.java \
-	vmspecific/org/tritonus/sampled/mixer/esd/EsdMixer.java \
-	vmspecific/org/tritonus/sampled/mixer/esd/EsdMixerProvider.java \
-	vmspecific/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java \
-	vmspecific/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java \
-	vmspecific/org/tritonus/sampled/mixer/esd/EsdUtils.java \
-	vmspecific/org/tritonus/sampled/mixer/esd/package.html \
-	vmspecific/org/tritonus/share/ArraySet.java \
-	vmspecific/org/tritonus/share/GlobalInfo.java \
-	vmspecific/org/tritonus/share/StringHashedSet.java \
-	vmspecific/org/tritonus/share/TCircularBuffer.java \
-	vmspecific/org/tritonus/share/TDebug.java \
-	vmspecific/org/tritonus/share/TNotifier.java \
-	vmspecific/org/tritonus/share/TSettings.java \
-	vmspecific/org/tritonus/share/midi/MidiUtils.java \
-	vmspecific/org/tritonus/share/midi/TMidiDevice.java \
-	vmspecific/org/tritonus/share/midi/TMidiFileFormat.java \
-	vmspecific/org/tritonus/share/midi/TSequencer.java \
-	vmspecific/org/tritonus/share/midi/package.html \
-	vmspecific/org/tritonus/share/package.html \
-	vmspecific/org/tritonus/share/sampled/AudioFileTypes.java \
-	vmspecific/org/tritonus/share/sampled/AudioFormatSet.java \
-	vmspecific/org/tritonus/share/sampled/AudioFormats.java \
-	vmspecific/org/tritonus/share/sampled/AudioSystemShadow.java \
-	vmspecific/org/tritonus/share/sampled/AudioUtils.java \
-	vmspecific/org/tritonus/share/sampled/Encodings.java \
-	vmspecific/org/tritonus/share/sampled/FloatSampleBuffer.java \
-	vmspecific/org/tritonus/share/sampled/TConversionTool.java \
-	vmspecific/org/tritonus/share/sampled/TVolumeUtils.java \
-	vmspecific/org/tritonus/share/sampled/convert/TAsynchronousFilteredAudioInputStream.java \
-	vmspecific/org/tritonus/share/sampled/convert/TAudioInputStream.java \
-	vmspecific/org/tritonus/share/sampled/convert/TEncodingFormatConversionProvider.java \
-	vmspecific/org/tritonus/share/sampled/convert/TFormatConversionProvider.java \
-	vmspecific/org/tritonus/share/sampled/convert/TMatrixFormatConversionProvider.java \
-	vmspecific/org/tritonus/share/sampled/convert/TSimpleFormatConversionProvider.java \
-	vmspecific/org/tritonus/share/sampled/convert/TSynchronousFilteredAudioInputStream.java \
-	vmspecific/org/tritonus/share/sampled/convert/package.html \
-	vmspecific/org/tritonus/share/sampled/file/AudioOutputStream.java \
-	vmspecific/org/tritonus/share/sampled/file/HeaderlessAudioOutputStream.java \
-	vmspecific/org/tritonus/share/sampled/file/TAudioFileFormat.java \
-	vmspecific/org/tritonus/share/sampled/file/TAudioFileReader.java \
-	vmspecific/org/tritonus/share/sampled/file/TAudioFileWriter.java \
-	vmspecific/org/tritonus/share/sampled/file/TAudioOutputStream.java \
-	vmspecific/org/tritonus/share/sampled/file/TDataOutputStream.java \
-	vmspecific/org/tritonus/share/sampled/file/THeaderlessAudioFileWriter.java \
-	vmspecific/org/tritonus/share/sampled/file/TNonSeekableDataOutputStream.java \
-	vmspecific/org/tritonus/share/sampled/file/TSeekableDataOutputStream.java \
-	vmspecific/org/tritonus/share/sampled/file/package.html \
-	vmspecific/org/tritonus/share/sampled/mixer/TBaseDataLine.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TBooleanControl.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TClip.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TCompoundControl.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TCompoundControlType.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TControlController.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TControllable.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TDataLine.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TEnumControl.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TFloatControl.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TLine.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TMixer.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TMixerInfo.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TMixerProvider.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TPort.java \
-	vmspecific/org/tritonus/share/sampled/mixer/TSoftClip.java \
-	vmspecific/org/tritonus/share/sampled/mixer/package.html \
-	vmspecific/org/tritonus/share/sampled/package.html \
 	vmspecific/org/xbill/DNS/A6Record.java \
 	vmspecific/org/xbill/DNS/AAAARecord.java \
 	vmspecific/org/xbill/DNS/AFSDBRecord.java \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.62 kaffe/libraries/javalib/Makefile.am.in:1.63
--- kaffe/libraries/javalib/Makefile.am.in:1.62	Thu Mar 23 01:33:27 2006
+++ kaffe/libraries/javalib/Makefile.am.in	Sun Jul 16 22:54:59 2006
@@ -19,6 +19,10 @@
 MAYBE_GMP_JAVA_MATH=gmp-math
 endif
 
+if COND_NATIVE_SOUND
+  MAYBE_TRITONUS_SOUND=tritonus-sound
+endif
+
 if USE_PRECOMPILED_RT_JAR
 stamp-glibj:
 	@echo Importing glibj.zip from $(PATH_TO_RT_JAR)
@@ -37,7 +41,12 @@
 clean-local:
 	rm -rf stamp-glibj glibj.zip
 
-SUBDIRS= . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
+SUBDIRS= \
+	. \
+	external/classpath \
+	$(MAYBE_PEERLESS_KAFFE_AWT) \
+	$(MAYBE_GMP_JAVA_MATH) \
+	$(MAYBE_TRITONUS_SOUND)
 
 jrelib_DATA= \
 	     logging.properties \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.558 kaffe/libraries/javalib/Makefile.in:1.559
--- kaffe/libraries/javalib/Makefile.in:1.558	Sun Jul 16 17:26:02 2006
+++ kaffe/libraries/javalib/Makefile.in	Sun Jul 16 22:54:59 2006
@@ -84,7 +84,8 @@
 DATA = $(jrelib_DATA)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = . external/classpath awt-implementations gmp-math
+DIST_SUBDIRS = . external/classpath awt-implementations gmp-math \
+	tritonus-sound
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -363,8 +364,15 @@
 # Only build gmp java.math libraries if kaffe is configured
 # to build the native libraries as well.
 @COND_PURE_JAVA_MATH_FALSE at MAYBE_GMP_JAVA_MATH = gmp-math
+ at COND_NATIVE_SOUND_TRUE@MAYBE_TRITONUS_SOUND = tritonus-sound
 @USE_PRECOMPILED_RT_JAR_TRUE at MAYBE_GLIBJ_ZIP = glibj.zip
-SUBDIRS = . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT) $(MAYBE_GMP_JAVA_MATH)
+SUBDIRS = \
+	. \
+	external/classpath \
+	$(MAYBE_PEERLESS_KAFFE_AWT) \
+	$(MAYBE_GMP_JAVA_MATH) \
+	$(MAYBE_TRITONUS_SOUND)
+
 jrelib_DATA = \
 	     logging.properties \
 	     $(MAYBE_GLIBJ_ZIP)
@@ -373,10 +381,6 @@
 	    Makefile.am.in \
 	    logging.properties \
 	vmspecific/META-INF/MANIFEST.MF \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \
-	vmspecific/META-INF/services/javax.sound.sampled.spi.MixerProvider \
 	vmspecific/gnu/bytecodecvssnap/Access.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayType.java \
@@ -622,147 +626,6 @@
 	vmspecific/org/objectweb/asm153/Item.java \
 	vmspecific/org/objectweb/asm153/Label.java \
 	vmspecific/org/objectweb/asm153/Type.java \
-	vmspecific/org/tritonus/core/Service.java \
-	vmspecific/org/tritonus/core/TAudioConfig.java \
-	vmspecific/org/tritonus/core/TInit.java \
-	vmspecific/org/tritonus/core/TMidiConfig.java \
-	vmspecific/org/tritonus/core/package.html \
-	vmspecific/org/tritonus/lowlevel/alsa/Alsa.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaCtl.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaCtlCardInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaMixer.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaMixerElement.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcm.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeq.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqClientInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqEvent.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqPortSubscribe.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueStatus.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTempo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqQueueTimer.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqRemoveEvents.java \
-	vmspecific/org/tritonus/lowlevel/alsa/AlsaSeqSystemInfo.java \
-	vmspecific/org/tritonus/lowlevel/alsa/package.html \
-	vmspecific/org/tritonus/lowlevel/esd/Esd.java \
-	vmspecific/org/tritonus/lowlevel/esd/EsdRecordingStream.java \
-	vmspecific/org/tritonus/lowlevel/esd/EsdSample.java \
-	vmspecific/org/tritonus/lowlevel/esd/EsdStream.java \
-	vmspecific/org/tritonus/lowlevel/esd/package.html \

*** Patch too long, truncated ***




More information about the kaffe mailing list