changeset in /hg/icedtea: Merge to tip of IcedTea6 tree.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 16:26:25 PDT 2008
changeset 6c09e539511d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6c09e539511d
description:
Merge to tip of IcedTea6 tree.
diffstat:
239 files changed, 18698 insertions(+), 32 deletions(-)
.hgtags | 3
AUTHORS | 1
ChangeLog | 44
Makefile.am | 8
Makefile.in | 9
NEWS | 20
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 42
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 4
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java | 542 ++++++++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 525 +++++++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java | 262 ++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 488 +++++++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 69 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 523 +++++++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 5
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/GetFormat.java | 41
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatConverter/ToFloatArray.java | 143 ++
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Available.java | 81 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Close.java | 72 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFormat.java | 74 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/GetFrameLength.java | 74 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/MarkSupported.java | 74 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Read.java | 83 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArray.java | 81 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/ReadFloatArrayIntInt.java | 83 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Reset.java | 87 +
overlays/openjdk/jdk/test/com/sun/media/sound/AudioFloatInputStream/Skip.java | 83 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetInputStream.java | 91 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/GetRoot.java | 82 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Load.java | 89 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/LoadAll.java | 93 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArray.java | 84 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java | 86 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFile.java | 88 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/NewModelByteBufferFileLongLong.java | 88 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLong.java | 92 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLong.java | 92 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/SubbufferLongLongBoolean.java | 98 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/Unload.java | 83 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/WriteTo.java | 92 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetAttenuation.java | 97 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetChannels.java | 97 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopLength.java | 96 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetLoopStart.java | 96 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/GetPitchCorrection.java | 97 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java | 94 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java | 94 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java | 94 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java | 96 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Open.java | 92 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/Set8BitExtensionBuffer.java | 119 ++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBufferWavetable/SetLoopType.java | 96 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestination.java | 46
overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/NewModelDestinationModelIdentifier.java | 46
overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetIdentifier.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelDestination/SetTransform.java | 46
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/EqualsObject.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierString.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringInt.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringString.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/NewModelIdentifierStringStringInt.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetInstance.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetObject.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelIdentifier/SetVariable.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/GetOscillators.java | 44
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetConnectionBlocks.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetDefaultConnectionsEnabled.java | 49
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetExclusiveClass.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyFrom.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetKeyTo.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetName.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetSelfNonExclusive.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelFrom.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelPerformer/SetVelTo.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSource.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifier.java | 46
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBoolean.java | 49
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java | 51
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java | 56 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/NewModelSourceModelIdentifierModelTransform.java | 47
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetIdentifier.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelSource/SetTransform.java | 46
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransform.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBoolean.java | 48
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java | 50
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java | 51
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetDirection.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetPolarity.java | 45
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/SetTransform.java | 74 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformAbsolute.java | 73 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConcave.java | 98 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformConvex.java | 98 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformLinear.java | 90 +
overlays/openjdk/jdk/test/com/sun/media/sound/ModelStandardTransform/TransformSwitch.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Available.java | 78 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Close.java | 72 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetFilePointer.java | 78 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/GetSize.java | 77 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/HasNextChunk.java | 85 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Read.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByte.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadByteArrayIntInt.java | 81 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadInt.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadLong.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadShort.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadString.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedByte.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedInt.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/ReadUnsignedShort.java | 79 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/Skip.java | 78 +
overlays/openjdk/jdk/test/com/sun/media/sound/RiffReaderWriter/WriteOutputStream.java | 81 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrument.java | 86 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntInt.java | 91 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntInt.java | 97 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java | 97 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformer.java | 83 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArray.java | 83 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntInt.java | 89 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java | 95 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java | 95 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntInt.java | 89 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntInt.java | 95 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java | 95 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/Clear.java | 73 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetName.java | 72 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleInstrument/SetPatch.java | 75 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddInstrument.java | 51
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/AddResource.java | 52
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/GetInstrument.java | 50
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/RemoveInstrument.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetDescription.java | 47
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetName.java | 47
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVendor.java | 47
overlays/openjdk/jdk/test/com/sun/media/sound/SimpleSoundbank/SetVersion.java | 47
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Array.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Clear.java | 56 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/Get.java | 68 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioBuffer/NewSoftAudioBuffer.java | 55 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetFormat.java | 61 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/GetPropertyInfo.java | 53
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/Open.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/OpenStream.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllNotesOff.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/AllSoundOff.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ChannelPressure.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Controller.java | 62 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/LocalControl.java | 60 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mono.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Mute.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOff2.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/NoteOn.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Omni.java | 61 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PitchBend.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/PolyPressure.java | 61 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ProgramChange.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/ResetAllControllers.java | 132 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/SoftTestUtils.java | 111 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftChannel/Solo.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftCubicResampler/Interpolate.java | 113 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLanczosResampler/Interpolate.java | 113 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java | 97 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java | 84 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java | 85 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java | 96 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java | 96 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java | 84 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java | 96 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java | 84 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler/Interpolate.java | 113 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLinearResampler2/Interpolate.java | 113 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftPointResampler/Interpolate.java | 113 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftProvider/GetDevice.java | 70 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Close.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ActiveSense.java | 82 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllNotesOff.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_AllSoundOff.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ChannelPressure.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Controller.java | 66 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Mono.java | 75 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOff.java | 65 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn.java | 65 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_AllChannels.java | 71 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Delayed.java | 67 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_NoteOn_Multiple.java | 76 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_Omni.java | 74 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PitchBend.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_PolyPressure.java | 65 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ProgramChange.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/Send_ResetAllControllers.java | 136 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftReceiver/SoftTestUtils.java | 111 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSincResampler/Interpolate.java | 113 ++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Close.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetAvailableInstruments.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetChannels.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDefaultSoundbank.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetDeviceInfo.java | 56 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLatency.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetLoadedInstruments.java | 65 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxPolyphony.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxReceivers.java | 56 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMaxTransmitters.java | 56 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetMicrosecondPosition.java | 64 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceiver2.java | 62 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetReceivers.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitter.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetTransmitters.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/GetVoiceStatus.java | 61 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/ImplicitOpenClose.java | 99 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsOpen.java | 59 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/IsSoundbankSupported.java | 95 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadAllInstruments.java | 73 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstrument.java | 73 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/LoadInstruments.java | 73 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/Open.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/OpenStream.java | 58 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/RemapInstrument.java | 76 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java | 210 +++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadAllInstruments.java | 69 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstrument.java | 75 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/UnloadInstruments.java | 75 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetName.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuning.java | 56 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/GetTuningInt.java | 53
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load1.java | 101 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load2.java | 71 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load4.java | 104 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load5.java | 87 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load6.java | 91 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load7.java | 72 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load8.java | 65 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/Load9.java | 69 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuning.java | 56 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningByteArray.java | 63 +
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatch.java | 54
overlays/openjdk/jdk/test/com/sun/media/sound/SoftTuning/NewSoftTuningPatchByteArray.java | 65 +
patches/icedtea-certbundle.patch | 20
patches/icedtea-override-redirect-metacity.patch | 19
diffs (truncated from 19831 to 500 lines):
diff -r d76a48233b57 -r 6c09e539511d .hgtags
--- a/.hgtags Thu May 29 20:53:59 2008 +0100
+++ b/.hgtags Thu May 29 23:43:22 2008 +0100
@@ -5,3 +5,6 @@ cb78e0fccf14ed4a80b0ada2c98e4621479acbf5
cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4
5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5
bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6
+38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0
+a5c32475a2e87f0f3bd7af28e632e6bd4f724b04 icedtea6-1.1
+871b70407a139c6bd42c200762ee1d302b31168f icedtea6-1.2
diff -r d76a48233b57 -r 6c09e539511d AUTHORS
--- a/AUTHORS Thu May 29 20:53:59 2008 +0100
+++ b/AUTHORS Thu May 29 23:43:22 2008 +0100
@@ -8,6 +8,7 @@ Matthew Flaschen <matthew.flaschen at gatec
Matthew Flaschen <matthew.flaschen at gatech.edu>
Kyle Galloway <kgallowa at redhat.com>
Andrew Haley <aph at redhat.com>
+Andrew John Hughes <gnu_andrew at member.fsf.org>
Matthias Klose <doko at ubuntu.com>
Francis Kung <fkung at redhat.com>
Casey Marshall <csm at gnu.org>
diff -r d76a48233b57 -r 6c09e539511d ChangeLog
--- a/ChangeLog Thu May 29 20:53:59 2008 +0100
+++ b/ChangeLog Thu May 29 23:43:22 2008 +0100
@@ -3,6 +3,14 @@ 2008-05-29 Andrew John Hughes <gnu_and
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
(allocatable_physical_memory): Removed as now implemented
in main tree.
+
+2008-05-28 Lillian Angel <langel at redhat.com>
+
+ * AUTHORS: Updated.
+
+2008-05-28 Lillian Angel <langel at redhat.com>
+
+ * NEWS: Updated for release.
2008-05-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
@@ -69,6 +77,12 @@ 2008-05-27 Andrew John Hughes <gnu_and
New separate file for @Override patch so it
can be applied early enough for some versions
of ecj.
+
+2008-05-27 Thomas Fitzsimmons <fitzsim at redhat.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Remove icedtea-certbundle.patch.
+ * Makefile.in: Regenerate.
+ * patches/icedtea-certbundle.patch: Remove.
2008-05-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
@@ -165,6 +179,23 @@ 2008-05-26 Andrew John Hughes <gnu_and
this no longer exists.
* Makefile.in: Regenerated.
+2008-05-26 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Updated jtreg to use correct java.
+ * Makefile.in: Regenerated.
+
+2008-05-26 Lillian Angel <langel at redhat.com>
+
+ * patches/icedtea-certbundle.patch: Added trustStore and
+ trustStoreType to props.
+
+2008-05-26 Mark Wielaard <mwielaard at redhat.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Add
+ patches/icedtea-override-redirect-metacity.patch.
+ * Makefile.in: Regenerate.
+ * patches/icedtea-override-redirect-metacity.patch: New patch.
+
2008-05-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
@@ -185,6 +216,19 @@ 2008-05-25 Andrew John Hughes <gnu_and
* configure: Regenerated.
* configure.ac: Run SET_OS.
+2008-05-25 Mark Wielaard <mark at klomp.org>
+
+ * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+ Import Gervill fixes from CVS. See CHANGES.txt.
+ Added: Software Mixing Mixer.
+ Fix: AudioFloatFormatConverter.getTargetFormats()
+ * overlays/openjdk/jdk/test/com/sun/media/sound: Imported all tests.
+
+2008-05-25 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am: Use -source 1.5 whenever possible.
+ * Makefile.in: Regenerated.
+ * javac.in: Use -1.5.
2008-05-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am: Revert OpenJDK patches
diff -r d76a48233b57 -r 6c09e539511d Makefile.am
--- a/Makefile.am Thu May 29 20:53:59 2008 +0100
+++ b/Makefile.am Thu May 29 23:43:22 2008 +0100
@@ -305,7 +305,6 @@ ICEDTEA_PATCHES = \
$(NETX_PATCH) \
patches/icedtea-rmi_amd64.patch \
patches/icedtea-tools.patch \
- patches/icedtea-certbundle.patch \
patches/icedtea-demos.patch \
patches/icedtea-use-system-tzdata.patch \
patches/icedtea-headers.patch \
@@ -340,6 +339,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-directaudio-close-trick.patch \
patches/icedtea-hat-spl-gpl.patch \
patches/icedtea-sparc.patch \
+ patches/icedtea-override-redirect-metacity.patch \
$(ZERO_PATCHES_COND) \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) \
@@ -994,21 +994,21 @@ clean-jtreg:
check-hotspot: jtreg
mkdir -p test/hotspot/JTwork test/hotspot/JTreport
- bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
`pwd`/openjdk/hotspot/test
check-langtools: jtreg
mkdir -p test/langtools/JTwork test/langtools/JTreport
- bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/langtools/JTwork -r:test/langtools/JTreport \
-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
`pwd`/openjdk/langtools/test
check-jdk: jtreg
mkdir -p test/jdk/JTwork test/jdk/JTreport
- bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/jdk/JTwork -r:test/jdk/JTreport \
-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
`pwd`/openjdk/jdk/test
diff -r d76a48233b57 -r 6c09e539511d Makefile.in
--- a/Makefile.in Thu May 29 20:53:59 2008 +0100
+++ b/Makefile.in Thu May 29 23:43:22 2008 +0100
@@ -393,7 +393,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-license-headers.patch \
patches/icedtea-webservices.patch $(NETX_PATCH) \
patches/icedtea-rmi_amd64.patch patches/icedtea-tools.patch \
- patches/icedtea-certbundle.patch patches/icedtea-demos.patch \
+ patches/icedtea-demos.patch \
patches/icedtea-use-system-tzdata.patch \
patches/icedtea-headers.patch patches/icedtea-ant.patch \
patches/icedtea-gcc-suffix.patch \
@@ -420,6 +420,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
+ patches/icedtea-override-redirect-metacity.patch \
$(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
patches/icedtea-xslfix.patch patches/icedtea-override.patch \
$(am__append_7)
@@ -1434,21 +1435,21 @@ clean-jtreg:
check-hotspot: jtreg
mkdir -p test/hotspot/JTwork test/hotspot/JTreport
- bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
`pwd`/openjdk/hotspot/test
check-langtools: jtreg
mkdir -p test/langtools/JTwork test/langtools/JTreport
- bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/langtools/JTwork -r:test/langtools/JTreport \
-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
`pwd`/openjdk/langtools/test
check-jdk: jtreg
mkdir -p test/jdk/JTwork test/jdk/JTreport
- bootstrap/icedtea/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
+ $(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
-w:test/jdk/JTwork -r:test/jdk/JTreport \
-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
`pwd`/openjdk/jdk/test
diff -r d76a48233b57 -r 6c09e539511d NEWS
--- a/NEWS Thu May 29 20:53:59 2008 +0100
+++ b/NEWS Thu May 29 23:43:22 2008 +0100
@@ -1,3 +1,23 @@ New in release 1.1 (2008-04-04)
+New in release 1.2 (2008-05-28)
+
+- Updated to b09 build.
+- Added the the lcms library with PYCC and LINEAR_RGB ICC
+ profiles.
+- Integrated Gervill to provide midi support.
+- JTreg integrated.
+- javaws/NetX fixes:
+ -improved security, namely catching Socket permissions during
+ runtime
+ -implemented the remaining JNLP services api (PrintService,
+ JNLPRandomAccessFile)
+ -applet focusing bug fixed
+- sparc/sparc64 port
+- Desktop file integration.
+- Various zero fixes.
+- Sound fixes.
+- Font fixes.
+- Several other bug fixes.
+
New in release 1.1 (2008-04-04)
- Zero builds on any architecture.
diff -r d76a48233b57 -r 6c09e539511d overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java Thu May 29 20:53:59 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java Thu May 29 23:43:22 2008 +0100
@@ -489,21 +489,37 @@ public class AudioFloatFormatConverter e
}
public AudioFormat[] getTargetFormats(Encoding targetEncoding, AudioFormat sourceFormat) {
- if(!isConversionSupported(targetEncoding, sourceFormat)) return new AudioFormat[0];
+ if(AudioFloatConverter.getConverter(sourceFormat) == null) return new AudioFormat[0];
int channels = sourceFormat.getChannels();
+
ArrayList<AudioFormat> formats = new ArrayList<AudioFormat>();
- formats.add(new AudioFormat(Encoding.PCM_SIGNED, AudioSystem.NOT_SPECIFIED, 8, channels, channels, AudioSystem.NOT_SPECIFIED, false));
- formats.add(new AudioFormat(Encoding.PCM_UNSIGNED, AudioSystem.NOT_SPECIFIED, 8, channels, channels, AudioSystem.NOT_SPECIFIED, false));
- for (int bits = 16; bits < 32; bits+=8) {
- formats.add(new AudioFormat(Encoding.PCM_SIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, false));
- formats.add(new AudioFormat(Encoding.PCM_UNSIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, false));
- formats.add(new AudioFormat(Encoding.PCM_SIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, true));
- formats.add(new AudioFormat(Encoding.PCM_UNSIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, true));
- }
- formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 32, channels, channels*4, AudioSystem.NOT_SPECIFIED, false));
- formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 32, channels, channels*4, AudioSystem.NOT_SPECIFIED, true));
- formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 64, channels, channels*8, AudioSystem.NOT_SPECIFIED, false));
- formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 64, channels, channels*8, AudioSystem.NOT_SPECIFIED, true));
+
+ if(targetEncoding.equals(Encoding.PCM_SIGNED))
+ formats.add(new AudioFormat(Encoding.PCM_SIGNED, AudioSystem.NOT_SPECIFIED, 8, channels, channels, AudioSystem.NOT_SPECIFIED, false));
+ if(targetEncoding.equals(Encoding.PCM_UNSIGNED))
+ formats.add(new AudioFormat(Encoding.PCM_UNSIGNED, AudioSystem.NOT_SPECIFIED, 8, channels, channels, AudioSystem.NOT_SPECIFIED, false));
+
+ for (int bits = 16; bits < 32; bits+=8) {
+ if(targetEncoding.equals(Encoding.PCM_SIGNED))
+ {
+ formats.add(new AudioFormat(Encoding.PCM_SIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, false));
+ formats.add(new AudioFormat(Encoding.PCM_SIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, true));
+ }
+ if(targetEncoding.equals(Encoding.PCM_UNSIGNED))
+ {
+ formats.add(new AudioFormat(Encoding.PCM_UNSIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, true));
+ formats.add(new AudioFormat(Encoding.PCM_UNSIGNED, AudioSystem.NOT_SPECIFIED, bits, channels, channels*bits/8, AudioSystem.NOT_SPECIFIED, false));
+ }
+ }
+
+ if(targetEncoding.equals(AudioFloatConverter.PCM_FLOAT))
+ {
+ formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 32, channels, channels*4, AudioSystem.NOT_SPECIFIED, false));
+ formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 32, channels, channels*4, AudioSystem.NOT_SPECIFIED, true));
+ formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 64, channels, channels*8, AudioSystem.NOT_SPECIFIED, false));
+ formats.add(new AudioFormat(AudioFloatConverter.PCM_FLOAT, AudioSystem.NOT_SPECIFIED, 64, channels, channels*8, AudioSystem.NOT_SPECIFIED, true));
+ }
+
return formats.toArray(new AudioFormat[formats.size()]);
}
diff -r d76a48233b57 -r 6c09e539511d overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Thu May 29 20:53:59 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Thu May 29 23:43:22 2008 +0100
@@ -1,11 +1,15 @@
+ - Added: Software Mixing Mixer
- Removed: PATSoundBankReader removed because no format license is available.
It is also undocumented format.
- Added: AudioFloatFormatConverter, used to convert
between PCM_SIGNED, PCM_UNSIGNED, PCM_FLOAT in 8/16/24/32 bit (big/little endian),
and resample using (linear/cubic/sinc...) if needed.
+ - Fix: AudioFloatFormatConverter.getTargetFormats(Encoding, AudioFormat)
+ returned audio formats in encoding not asked for.
- Added: WaveExtensibleReader, used to read WAV files using WAVE_FORMAT_EXTENSIBLE format.
- Added: WaveFloatFileWriter, used to writing WAV files with PCM_FLOAT encoding.
- Change: Make SoftAudioProcessor (limiter, reverb, chorus, agc) more general.
+ - Fix: Don't restrict reading dls/sf2 soundbank to only files with .dls and .sf2 endings.
- Fix: AudioFloatConverter tests incorrectly AudioFormat frameSize against SampleSizeInBits
Support for 64-byte float added, and support for 32+ bit PCM samples.
SampleSizeInBits not dividable by 8 are now handled correctly.
diff -r d76a48233b57 -r 6c09e539511d overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java Thu May 29 23:43:22 2008 +0100
@@ -0,0 +1,542 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.media.sound;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.DataLine;
+import javax.sound.sampled.LineEvent;
+import javax.sound.sampled.LineUnavailableException;
+
+/**
+ * Clip implemention for the SoftMixingMixer.
+ *
+ * @version %I%, %E%
+ * @author Karl Helgason
+ */
+
+public class SoftMixingClip extends SoftMixingDataLine implements Clip {
+
+ private AudioFormat format;
+
+ private int framesize;
+
+ private byte[] data;
+
+ private InputStream datastream = new InputStream() {
+
+ public int read() throws IOException {
+ byte[] b = new byte[1];
+ int ret = read(b);
+ if (ret < 0)
+ return ret;
+ return b[0] & 0xFF;
+ }
+
+ public int read(byte[] b, int off, int len) throws IOException {
+
+ if (_loopcount != 0) {
+ int bloopend = _loopend * framesize;
+ int bloopstart = _loopstart * framesize;
+ int pos = _frameposition * framesize;
+
+ if (pos + len >= bloopend)
+ if (pos < bloopend) {
+ int offend = off + len;
+ int o = off;
+ while (off != offend) {
+ if (pos == bloopend) {
+ if (_loopcount == 0)
+ break;
+ pos = bloopstart;
+ if (_loopcount != LOOP_CONTINUOUSLY)
+ _loopcount--;
+ }
+ len = offend - off;
+ int left = bloopend - pos;
+ if (len > left)
+ len = left;
+ System.arraycopy(data, pos, b, off, len);
+ off += len;
+ }
+ if (_loopcount == 0) {
+ len = offend - off;
+ int left = bloopend - pos;
+ if (len > left)
+ len = left;
+ System.arraycopy(data, pos, b, off, len);
+ off += len;
+ }
+ _frameposition = pos / framesize;
+ return o - off;
+ }
+ }
+
+ int pos = _frameposition * framesize;
+ int left = bufferSize - pos;
+ if (left == 0)
+ return -1;
+ if (len > left)
+ len = left;
+ System.arraycopy(data, pos, b, off, len);
+ _frameposition += len / framesize;
+ return len;
+ }
+
+ };
+
+ private int offset;
+
+ private int bufferSize;
+
+ private float[] readbuffer;
+
+ private boolean open = false;
+
+ private AudioFormat outputformat;
+
+ private int out_nrofchannels;
+
+ private int in_nrofchannels;
+
+ private int frameposition = 0;
+
+ private boolean frameposition_sg = false;
+
+ private boolean active_sg = false;
+
+ private int loopstart = 0;
+
+ private int loopend = -1;
+
+ private boolean active = false;
+
+ private int loopcount = 0;
+
+ private boolean _active = false;
+
+ private int _frameposition = 0;
+
+ private boolean loop_sg = false;
+
+ private int _loopcount = 0;
+
+ private int _loopstart = 0;
+
+ private int _loopend = -1;
+
+ private float _rightgain;
+
+ private float _leftgain;
+
+ private float _eff1gain;
+
+ private float _eff2gain;
+
+ private AudioFloatInputStream afis;
+
+ protected SoftMixingClip(SoftMixingMixer mixer, DataLine.Info info) {
+ super(mixer, info);
+ }
+
+ protected void processControlLogic() {
+
+ _rightgain = rightgain;
+ _leftgain = leftgain;
+ _eff1gain = eff1gain;
+ _eff2gain = eff2gain;
+
+ if (active_sg) {
+ _active = active;
+ active_sg = false;
+ } else {
+ active = _active;
+ }
+
+ if (frameposition_sg) {
+ _frameposition = frameposition;
+ frameposition_sg = false;
+ afis = null;
+ } else {
+ frameposition = _frameposition;
+ }
+ if (loop_sg) {
+ _loopcount = loopcount;
+ _loopstart = loopstart;
+ _loopend = loopend;
+ }
+
+ if (afis == null) {
+ afis = AudioFloatInputStream.getInputStream(new AudioInputStream(
+ datastream, format, AudioSystem.NOT_SPECIFIED));
+
+ if (Math.abs(format.getSampleRate() - outputformat.getSampleRate()) > 0.000001)
+ afis = new AudioFloatInputStreamResampler(afis, outputformat);
+ }
+
+ }
+
+ protected void processAudioLogic(SoftAudioBuffer[] buffers) {
+ if (_active) {
+ float[] left = buffers[SoftMixingMainMixer.CHANNEL_LEFT].array();
More information about the distro-pkg-dev
mailing list