tritonus-commits Mailing List for Tritonus (Page 6)

Update of /cvsroot/tritonus/tritonus
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv543/tritonus

Removed Files:
	VERSION 
Log Message:
remove uppercase version of the same file in lowercase (Windows compatibility)


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/VERSION

--- VERSION DELETED ---

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18124/tritonus/src/classes/org/tritonus/share/sampled

Added Files:
	FloatInputStream.java 
Log Message:
initial check in


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatInputStream.java

--- NEW FILE: FloatInputStream.java ---

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17294/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	FloatSampleBuffer.java 
Log Message:
fixed initialization bug 


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java

Index: FloatSampleBuffer.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** FloatSampleBuffer.java	22 Nov 2006 16:00:14 -0000	1.6
--- FloatSampleBuffer.java	29 Nov 2006 12:34:18 -0000	1.7
***************
*** 257,260 ****
--- 257,269 ----
  		}
  	}
+ 	
+ 	/**
+ 	 * Verify that the specified AudioFormat can be converted to and from.
+ 	 * If the format is not supported, an IllegalArgumentException is thrown.
+ 	 * @throws IllegalArgumentException if the format is not supported
+ 	 */
+ 	public static void checkFormatSupported(AudioFormat format) {
+ 		FloatSampleTools.getFormatType(format);
+ 	}
  
  	/**
***************
*** 278,288 ****
  	private final void createChannels(int newChannelCount, int newSampleCount,
  			boolean lazy) {
- 		setSampleCountImpl(newSampleCount);
  		// shortcut
  		if (lazy && newChannelCount <= channelCount
  				&& newSampleCount <= this.sampleCount) {
  			setChannelCountImpl(newChannelCount);
  			return;
  		}
  		// grow the array, if necessary. Intentionally lazy here!
  		grow(newChannelCount, true);
--- 287,298 ----
  	private final void createChannels(int newChannelCount, int newSampleCount,
  			boolean lazy) {
  		// shortcut
  		if (lazy && newChannelCount <= channelCount
  				&& newSampleCount <= this.sampleCount) {
+ 			setSampleCountImpl(newSampleCount);
  			setChannelCountImpl(newChannelCount);
  			return;
  		}
+ 		setSampleCountImpl(newSampleCount);
  		// grow the array, if necessary. Intentionally lazy here!
  		grow(newChannelCount, true);
***************
*** 381,385 ****
  	public int getByteArrayBufferSize(AudioFormat format, int lenInSamples) {
  		// make sure this format is supported
! 		FloatSampleTools.getFormatType(format);
  		return format.getFrameSize() * lenInSamples;
  	}
--- 391,395 ----
  	public int getByteArrayBufferSize(AudioFormat format, int lenInSamples) {
  		// make sure this format is supported
! 		checkFormatSupported(format);
  		return format.getFrameSize() * lenInSamples;
  	}

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5831/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	FloatSampleBuffer.java FloatSampleTools.java 
Log Message:
formatted


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleTools.java

Index: FloatSampleBuffer.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** FloatSampleBuffer.java	22 Nov 2006 15:50:47 -0000	1.5
--- FloatSampleBuffer.java	22 Nov 2006 16:00:14 -0000	1.6
***************
*** 24,29 ****
  
  /*
! |<---            this code is formatted to fit into 80 columns             --->|
! */
  
  package org.tritonus.share.sampled;
--- 24,29 ----
  
  /*
!  |<---            this code is formatted to fit into 80 columns             --->|
[...1479 lines suppressed...]
  			break;
  		}
! 		return doDither?ditherBits:0.0f;
  	}
  }
--- 971,984 ----
  		switch (ditherMode) {
  		case DITHER_MODE_AUTOMATIC:
! 			doDither = (originalFormatType & FloatSampleTools.F_SAMPLE_WIDTH_MASK) > (newFormatType & FloatSampleTools.F_SAMPLE_WIDTH_MASK);
  			break;
  		case DITHER_MODE_ON:
! 			doDither = true;
  			break;
  		case DITHER_MODE_OFF:
! 			doDither = false;
  			break;
  		}
! 		return doDither ? ditherBits : 0.0f;
  	}
  }

Index: FloatSampleTools.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleTools.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** FloatSampleTools.java	22 Nov 2006 15:48:08 -0000	1.4
--- FloatSampleTools.java	22 Nov 2006 16:00:14 -0000	1.5
***************
*** 24,29 ****
  
  /*
! |<---            this code is formatted to fit into 80 columns             --->|
! */
  
  package org.tritonus.share.sampled;
--- 24,29 ----
  
  /*
!  |<---            this code is formatted to fit into 80 columns             --->|
[...1259 lines suppressed...]
  				break;
  			case CT_32SB:
! 				iSample = quantize32(input[inIndex] * twoPower31, ditherBits);
! 				output[outIndex] = (byte) (iSample >> 24);
! 				output[outIndex + 1] = (byte) ((iSample >>> 16) & 0xFF);
! 				output[outIndex + 2] = (byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex + 3] = (byte) (iSample & 0xFF);
  				break;
  			case CT_32SL:
! 				iSample = quantize32(input[inIndex] * twoPower31, ditherBits);
! 				output[outIndex + 3] = (byte) (iSample >> 24);
! 				output[outIndex + 2] = (byte) ((iSample >>> 16) & 0xFF);
! 				output[outIndex + 1] = (byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex] = (byte) (iSample & 0xFF);
  				break;
  			default:
! 				throw new IllegalArgumentException("unsupported format="
! 						+ formatType2Str(formatType));
  			}
  		}

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5436/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	FloatSampleInput.java 
Log Message:
change to BSD style license


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleInput.java

Index: FloatSampleInput.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleInput.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FloatSampleInput.java	22 Nov 2006 15:51:03 -0000	1.1
--- FloatSampleInput.java	22 Nov 2006 15:59:41 -0000	1.2
***************
*** 7,24 ****
  /*
   *  Copyright (c) 2006 by Florian Bomers <http://www.bomers.de>
   *
!  *   This program is free software; you can redistribute it and/or modify
!  *   it under the terms of the GNU Library General Public License as published
!  *   by the Free Software Foundation; either version 2 of the License, or
!  *   (at your option) any later version.
   *
!  *   This program 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 Library General Public License for more details.
   *
!  *   You should have received a copy of the GNU Library General Public
!  *   License along with this program; if not, write to the Free Software
!  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
--- 7,34 ----
  /*
   *  Copyright (c) 2006 by Florian Bomers <http://www.bomers.de>
+  *  All rights reserved.
   *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
   *
!  * - Redistributions of source code must retain the above copyright notice,
!  *   this list of conditions and the following disclaimer.
!  * - Redistributions in binary form must reproduce the above copyright
!  *   notice, this list of conditions and the following disclaimer in the
!  *   documentation and/or other materials provided with the distribution.
   *
!  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
!  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
!  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
!  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
!  * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
!  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
!  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
!  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
!  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
!  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
!  * OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1448/tritonus/src/classes/org/tritonus/share/sampled

Added Files:
	FloatSampleInput.java 
Log Message:
initial version


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleInput.java

--- NEW FILE: FloatSampleInput.java ---

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv570/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	FloatSampleBuffer.java 
Log Message:
optimization (use array, cache conversion format), add mix/copy functions, clean-up



Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java

Index: FloatSampleBuffer.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** FloatSampleBuffer.java	13 Feb 2006 13:40:43 -0000	1.4
--- FloatSampleBuffer.java	22 Nov 2006 15:50:47 -0000	1.5
***************
*** 1,756 ****
! /*
!  * FloatSampleBuffer.java
!  *
!  *	This file is part of Tritonus: http://www.tritonus.org/
!  */
! 
! /*
!  *  Copyright (c) 2000,2004 by Florian Bomers <http://www.bomers.de>
!  *
!  *   This program is free software; you can redistribute it and/or modify
[...1712 lines suppressed...]
! 	 * @return the ditherBits parameter for the float2byte functions
! 	 */
! 	protected float getConvertDitherBits(int newFormatType) {
! 		// let's see whether dithering is necessary
! 		boolean doDither = false;
! 		switch (ditherMode) {
! 		case DITHER_MODE_AUTOMATIC:
! 			doDither=(originalFormatType & FloatSampleTools.F_SAMPLE_WIDTH_MASK)>
! 			         (newFormatType & FloatSampleTools.F_SAMPLE_WIDTH_MASK);
! 			break;
! 		case DITHER_MODE_ON:
! 			doDither=true;
! 			break;
! 		case DITHER_MODE_OFF:
! 			doDither=false;
! 			break;
! 		}
! 		return doDither?ditherBits:0.0f;
! 	}
! }

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32597/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	FloatSampleTools.java 
Log Message:
add unpacked 24-bit sample support, some more convenience functions


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleTools.java

Index: FloatSampleTools.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleTools.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** FloatSampleTools.java	13 Feb 2006 12:21:50 -0000	1.3
--- FloatSampleTools.java	22 Nov 2006 15:48:08 -0000	1.4
***************
*** 6,10 ****
  
  /*
!  *  Copyright (c) 2000,2004 by Florian Bomers <http://www.bomers.de>
   *
   *   This program is free software; you can redistribute it and/or modify
--- 6,10 ----
  
  /*
!  *  Copyright (c) 2000-2006 by Florian Bomers <http://www.bomers.de>
   *
   *   This program is free software; you can redistribute it and/or modify
***************
*** 59,67 ****
  
  	// sample width (must be in order !)
! 	static final int F_8=1;
! 	static final int F_16=2;
! 	static final int F_24=3;
! 	static final int F_32=4;
! 	static final int F_SAMPLE_WIDTH_MASK=F_8 | F_16 | F_24 | F_32;
  
  	// format bit-flags
--- 59,68 ----
  
  	// sample width (must be in order !)
! 	static final int F_8    = 1;
! 	static final int F_16   = 2;
! 	static final int F_24_3 = 3;
! 	static final int F_24_4 = 4;
! 	static final int F_32   = 5;
! 	static final int F_SAMPLE_WIDTH_MASK = F_8 | F_16 | F_24_3 | F_24_4 | F_32;
  
  	// format bit-flags
***************
*** 70,81 ****
  
  	// supported formats
! 	static final int CT_8S=F_8 | F_SIGNED;
! 	static final int CT_8U=F_8;
! 	static final int CT_16SB=F_16 | F_SIGNED | F_BIGENDIAN;
! 	static final int CT_16SL=F_16 | F_SIGNED;
! 	static final int CT_24SB=F_24 | F_SIGNED | F_BIGENDIAN;
! 	static final int CT_24SL=F_24 | F_SIGNED;
! 	static final int CT_32SB=F_32 | F_SIGNED | F_BIGENDIAN;
! 	static final int CT_32SL=F_32 | F_SIGNED;
  
  	// ////////////////////////////// initialization /////////////////////////////// //
--- 71,84 ----
  
  	// supported formats
! 	static final int CT_8S = F_8 | F_SIGNED;
! 	static final int CT_8U = F_8;
! 	static final int CT_16SB = F_16 | F_SIGNED | F_BIGENDIAN;
! 	static final int CT_16SL = F_16 | F_SIGNED;
! 	static final int CT_24_3SB = F_24_3 | F_SIGNED | F_BIGENDIAN;
! 	static final int CT_24_3SL = F_24_3 | F_SIGNED;
! 	static final int CT_24_4SB = F_24_4 | F_SIGNED | F_BIGENDIAN;
! 	static final int CT_24_4SL = F_24_4 | F_SIGNED;
! 	static final int CT_32SB = F_32 | F_SIGNED | F_BIGENDIAN;
! 	static final int CT_32SL = F_32 | F_SIGNED;
  
  	// ////////////////////////////// initialization /////////////////////////////// //
***************
*** 89,99 ****
  
  	/**
! 	 * only allow "packed" samples -- currently no support for 18, 20, 24_32 bits.
  	 * @throws IllegalArgumentException
  	 */
  	static void checkSupportedSampleSize(int ssib, int channels, int frameSize) {
! 		if ((ssib*channels) != frameSize * 8) {
! 			throw new IllegalArgumentException("unsupported sample size: "+ssib
! 			                                   +" stored in "+(frameSize/channels)+" bytes.");
  		}
  	}
--- 92,108 ----
  
  	/**
! 	 * only allow "packed" samples -- currently no support for 18, 20
! 	 * bits -- except 24 bits stored in 4 bytes.
! 	 *
  	 * @throws IllegalArgumentException
  	 */
  	static void checkSupportedSampleSize(int ssib, int channels, int frameSize) {
! 		if (ssib == 24 && frameSize == 4 * channels) {
! 			// 24 bits stored in 4 bytes is OK (24_4)
! 			return;
! 		}
! 		if ((ssib * channels) != frameSize * 8) {
! 			throw new IllegalArgumentException("unsupported sample size: "
! 					+ ssib + " bits stored in " + (frameSize / channels) + " bytes.");
  		}
  	}
***************
*** 105,124 ****
  	 */
  	static int getFormatType(AudioFormat format) {
! 		boolean signed = format.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED);
! 		if (!signed &&
! 		    !format.getEncoding().equals(AudioFormat.Encoding.PCM_UNSIGNED)) {
! 			throw new IllegalArgumentException
! 			("unsupported encoding: only PCM encoding supported.");
  		}
  		if (!signed && format.getSampleSizeInBits() != 8) {
! 			throw new IllegalArgumentException
! 			("unsupported encoding: only 8-bit can be unsigned");
  		}
  		checkSupportedSampleSize(format.getSampleSizeInBits(),
! 		                         format.getChannels(),
! 		                         format.getFrameSize());
  
! 		int formatType = getFormatType(format.getSampleSizeInBits(),
! 		                               signed, format.isBigEndian());
  		return formatType;
  	}
--- 114,136 ----
  	 */
  	static int getFormatType(AudioFormat format) {
! 		boolean signed =
! 				format.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED);
! 		if (!signed
! 				&& !format.getEncoding().equals(
! 						AudioFormat.Encoding.PCM_UNSIGNED)) {
! 			throw new IllegalArgumentException(
! 					"unsupported encoding: only PCM encoding supported.");
  		}
  		if (!signed && format.getSampleSizeInBits() != 8) {
! 			throw new IllegalArgumentException(
! 					"unsupported encoding: only 8-bit can be unsigned");
  		}
  		checkSupportedSampleSize(format.getSampleSizeInBits(),
! 				format.getChannels(), format.getFrameSize());
  
! 		int formatType =
! 				getFormatType(format.getSampleSizeInBits(),
! 						format.getFrameSize() / format.getChannels(), signed,
! 						format.isBigEndian());
  		return formatType;
  	}
***************
*** 127,166 ****
  	 * @throws IllegalArgumentException
  	 */
! 	static int getFormatType(int ssib, boolean signed, boolean bigEndian) {
! 		int bytesPerSample=ssib/8;
! 		int res=0;
! 		if (ssib==8) {
! 			res=F_8;
! 		} else if (ssib==16) {
! 			res=F_16;
! 		} else if (ssib==24) {
! 			res=F_24;
! 		} else if (ssib==32) {
! 			res=F_32;
! 		}
! 		if (res==0) {
! 			throw new IllegalArgumentException
! 			("FloatSampleBuffer: unsupported sample size of "
! 			 +ssib+" bits per sample.");
! 		}
! 		if (!signed && bytesPerSample>1) {
! 			throw new IllegalArgumentException
! 			("FloatSampleBuffer: unsigned samples larger than "
! 			 +"8 bit are not supported");
  		}
  		if (signed) {
! 			res|=F_SIGNED;
  		}
! 		if (bigEndian && (ssib!=8)) {
! 			res|=F_BIGENDIAN;
  		}
  		return res;
  	}
  
  	static int getSampleSize(int formatType) {
  		switch (formatType &  F_SAMPLE_WIDTH_MASK) {
  		case F_8: return 1;
  		case F_16: return 2;
! 		case F_24: return 3;
  		case F_32: return 4;
  		}
--- 139,186 ----
  	 * @throws IllegalArgumentException
  	 */
! 	static int getFormatType(int ssib, int bytesPerSample, boolean signed,
! 			boolean bigEndian) {
! 		int res = 0;
! 		if (ssib == 24 || (bytesPerSample == ssib / 8)) {
! 			if (ssib == 8) {
! 				res = F_8;
! 			} else if (ssib == 16) {
! 				res = F_16;
! 			} else if (ssib == 24) {
! 				if (bytesPerSample == 3) {
! 					res = F_24_3;
! 				} else if (bytesPerSample == 4) {
! 					res = F_24_4;
! 				}
! 			} else if (ssib == 32) {
! 				res = F_32;
! 			}
! 		}
! 		if (res == 0) {
! 			throw new IllegalArgumentException(
! 					"ConversionTool: unsupported sample size of " + ssib
! 							+ " bits per sample in "+bytesPerSample+" bytes.");
! 		}
! 		if (!signed && bytesPerSample > 1) {
! 			throw new IllegalArgumentException(
! 					"ConversionTool: unsigned samples larger than "
! 							+ "8 bit are not supported");
  		}
  		if (signed) {
! 			res |= F_SIGNED;
  		}
! 		if (bigEndian && (ssib != 8)) {
! 			res |= F_BIGENDIAN;
  		}
  		return res;
  	}
  
+ 
  	static int getSampleSize(int formatType) {
  		switch (formatType &  F_SAMPLE_WIDTH_MASK) {
  		case F_8: return 1;
  		case F_16: return 2;
! 		case F_24_3: return 3;
! 		case F_24_4: return 4;
  		case F_32: return 4;
  		}
***************
*** 180,185 ****
  			res+="16bit";
  			break;
! 		case F_24:
! 			res+="24bit";
  			break;
  		case F_32:
--- 200,208 ----
  			res+="16bit";
  			break;
! 		case F_24_3:
! 			res += "24_3bit";
! 			break;
! 		case F_24_4:
! 			res += "24_4bit";
  			break;
  		case F_32:
***************
*** 210,243 ****
  
  	/**
! 	 * Conversion function to convert an interleaved byte array to
! 	 * a List of interleaved float arrays. The float arrays will contain normalized
! 	 * samples in the range [-1.0f, +1.0f]. The input array
! 	 * provides bytes in the format specified in <code>format</code>.
  	 * <p>
! 	 * Only PCM formats are accepted. The method will convert all
! 	 * byte values from
! 	 * <code>input[inByteOffset]</code> to
  	 * <code>input[inByteOffset + (frameCount * format.getFrameSize()) - 1]</code>
! 	 * to floats from
! 	 * <code>output(n)[outOffset]</code> to
  	 * <code>output(n)[outOffset + frameCount - 1]</code>
  	 *
  	 * @param input the audio data in an byte array
  	 * @param inByteOffset index in input where to start the conversion
! 	 * @param output list of float[] arrays which receive the converted audio data.
! 	 *        if the list does not contain enough elements, or individual float arrays
! 	 *        are not large enough, they are created.
  	 * @param outOffset the start offset in <code>output</code>
  	 * @param frameCount number of frames to be converted
  	 * @param format the input format. Only packed PCM is allowed
! 	 * @throws IllegalArgumentException if one of the parameters is out of bounds
! 	 *
  	 * @see #byte2floatInterleaved(byte[],int,float[],int,int,AudioFormat)
  	 */
  	public static void byte2float(byte[] input, int inByteOffset,
! 	                              List<float[]> output, int outOffset, int frameCount,
! 	                              //List output, int outOffset, int frameCount,
! 	                              AudioFormat format) {
! 		for (int channel = 0; channel < format.getChannels(); channel++) {
  			float[] data;
  			if (output.size() < channel) {
--- 233,336 ----
  
  	/**
! 	 * @see #byte2float(byte[] input, int inByteOffset, Object[] output,
! 	 *      int outOffset, int frameCount, AudioFormat format, boolean
! 	 *      allowAddChannel)
! 	 */
! 	public static void byte2float(byte[] input, int inByteOffset,
! 			List<float[]> output, int outOffset, int frameCount,
! 			AudioFormat format) {
! 
! 		byte2float(input, inByteOffset, output, outOffset, frameCount, format,
! 				true);
! 	}
! 
! 	/**
! 	 * @param output an array of float[] arrays
! 	 * @throws ArrayIndexOutOfBoundsException if output does not
! 	 *             format.getChannels() elements
! 	 * @see #byte2float(byte[] input, int inByteOffset, Object[] output,
! 	 *      int outOffset, int frameCount, AudioFormat format, boolean
! 	 *      allowAddChannel)
! 	 */
! 	public static void byte2float(byte[] input, int inByteOffset,
! 			Object[] output, int outOffset, int frameCount, AudioFormat format) {
! 
! 		byte2float(input, inByteOffset, output, outOffset, frameCount, format,
! 				true);
! 	}
! 
! 	/**
! 	 * @param output an array of float[] arrays
! 	 * @param allowAddChannel if true, and output has fewer channels than
! 	 *            format, then only output.length channels are filled
! 	 * @throws ArrayIndexOutOfBoundsException if output does not
! 	 *             format.getChannels() elements
! 	 * @see #byte2float(byte[] input, int inByteOffset, Object[] output,
! 	 *      int outOffset, int frameCount, AudioFormat format, boolean
! 	 *      allowAddChannel)
! 	 */
! 	public static void byte2float(byte[] input, int inByteOffset,
! 			Object[] output, int outOffset, int frameCount, AudioFormat format,
! 			boolean allowAddChannel) {
! 
! 		int channels = format.getChannels();
! 		if (!allowAddChannel && channels > output.length) {
! 			channels = output.length;
! 		}
! 		if (output.length < channels) {
! 			throw new ArrayIndexOutOfBoundsException(
! 					"too few channel output array");
! 		}
! 		for (int channel = 0; channel < channels; channel++) {
! 			float[] data = (float[]) output[channel];
! 			if (data.length < frameCount + outOffset) {
! 				data = new float[frameCount + outOffset];
! 				output[channel] = data;
! 			}
! 
! 			byte2floatGeneric(input, inByteOffset, format.getFrameSize(),
! 					data, outOffset, frameCount, format);
! 			inByteOffset += format.getFrameSize() / format.getChannels();
! 		}
! 	}
! 
! 	/**
! 	 * Conversion function to convert an interleaved byte array to a List of
! 	 * interleaved float arrays. The float arrays will contain normalized
! 	 * samples in the range [-1.0, +1.0]. The input array provides bytes in the
! 	 * format specified in <code>format</code>.
  	 * <p>
! 	 * Only PCM formats are accepted. The method will convert all byte values
! 	 * from <code>input[inByteOffset]</code> to
  	 * <code>input[inByteOffset + (frameCount * format.getFrameSize()) - 1]</code>
! 	 * to floats from <code>output(n)[outOffset]</code> to
  	 * <code>output(n)[outOffset + frameCount - 1]</code>
  	 *
  	 * @param input the audio data in an byte array
  	 * @param inByteOffset index in input where to start the conversion
! 	 * @param output list of float[] arrays which receive the converted audio
! 	 *            data. if the list does not contain enough elements, or
! 	 *            individual float arrays are not large enough, they are
! 	 *            created.
  	 * @param outOffset the start offset in <code>output</code>
  	 * @param frameCount number of frames to be converted
  	 * @param format the input format. Only packed PCM is allowed
! 	 * @param allowAddChannel if true, channels may be added to
! 	 *            <code>output</code> to match the number of input channels,
! 	 *            otherwise, only the first output.size() channels of input data
! 	 *            are converted.
! 	 * @throws IllegalArgumentException if one of the parameters is out of
! 	 *             bounds
  	 * @see #byte2floatInterleaved(byte[],int,float[],int,int,AudioFormat)
  	 */
  	public static void byte2float(byte[] input, int inByteOffset,
! 			List<float[]> output, int outOffset, int frameCount,
! 			AudioFormat format, boolean allowAddChannel) {
! 
! 		int channels = format.getChannels();
! 		if (!allowAddChannel && channels > output.size()) {
! 			channels = output.size();
! 		}
! 		for (int channel = 0; channel < channels; channel++) {
  			float[] data;
  			if (output.size() < channel) {
***************
*** 253,258 ****
  
  			byte2floatGeneric(input, inByteOffset, format.getFrameSize(),
! 			                  data, outOffset,
! 			                  frameCount, format);
  			inByteOffset += format.getFrameSize() / format.getChannels();
  		}
--- 346,350 ----
  
  			byte2floatGeneric(input, inByteOffset, format.getFrameSize(),
! 					data, outOffset, frameCount, format);
  			inByteOffset += format.getFrameSize() / format.getChannels();
  		}
***************
*** 377,391 ****
  				              | (input[inIndex] & 0xFF)))*invTwoPower15;
  				break;
! 			case CT_24SB:
! 				output[outIndex]=
! 				    ((float) ((input[inIndex]<<16)
! 				              | ((input[inIndex+1] & 0xFF)<<8)
! 				              | (input[inIndex+2] & 0xFF)))*invTwoPower23;
! 				break;
! 			case CT_24SL:
! 				output[outIndex]=
! 				    ((float) ((input[inIndex+2]<<16)
! 				              | ((input[inIndex+1] & 0xFF)<<8)
! 				              | (input[inIndex] & 0xFF)))*invTwoPower23;
  				break;
  			case CT_32SB:
--- 469,496 ----
  				              | (input[inIndex] & 0xFF)))*invTwoPower15;
  				break;
! 			case CT_24_3SB:
! 				output[outIndex] =
! 						((float) ((input[inIndex] << 16)
! 								| ((input[inIndex + 1] & 0xFF) << 8) | (input[inIndex + 2] & 0xFF)))
! 								* invTwoPower23;
! 				break;
! 			case CT_24_3SL:
! 				output[outIndex] =
! 						((float) ((input[inIndex + 2] << 16)
! 								| ((input[inIndex + 1] & 0xFF) << 8) | (input[inIndex] & 0xFF)))
! 								* invTwoPower23;
! 				break;
! 			case CT_24_4SB:
! 				output[outIndex] =
! 						((float) ((input[inIndex + 1] << 16)
! 								| ((input[inIndex + 2] & 0xFF) << 8) | (input[inIndex + 3] & 0xFF)))
! 								* invTwoPower23;
! 				break;
! 			case CT_24_4SL:
! 				// TODO: verify the indexes
! 				output[outIndex] =
! 						((float) ((input[inIndex + 3] << 16)
! 								| ((input[inIndex + 2] & 0xFF) << 8) | (input[inIndex + 1] & 0xFF)))
! 								* invTwoPower23;
  				break;
  			case CT_32SB:
***************
*** 500,505 ****
  	 * @see #float2byteInterleaved(float[],int,byte[],int,int,AudioFormat,float)
  	 */
! 	//public static void float2byte(List<float[]> input, int inOffset,
! 	public static void float2byte(List input, int inOffset,
  	                              byte[] output, int outByteOffset,
  	                              int frameCount,
--- 605,609 ----
  	 * @see #float2byteInterleaved(float[],int,byte[],int,int,AudioFormat,float)
  	 */
! 	public static void float2byte(List<float[]> input, int inOffset,
  	                              byte[] output, int outByteOffset,
  	                              int frameCount,
***************
*** 515,518 ****
--- 619,664 ----
  
  	/**
+ 	 * @param input an array of float[] arrays
+ 	 * @throws ArrayIndexOutOfBoundsException if one of the parameters is out of
+ 	 *             bounds
+ 	 * @see #float2byte(List<float[]>[] input, int inOffset, byte[] output, int
+ 	 *      outByteOffset, int frameCount, AudioFormat format, float
+ 	 *      ditherBits)
+ 	 */
+ 	public static void float2byte(Object[] input, int inOffset, byte[] output,
+ 			int outByteOffset, int frameCount, AudioFormat format,
+ 			float ditherBits) {
+ 		int channels = format.getChannels();
+ 		for (int channel = 0; channel < channels; channel++) {
+ 			float[] data = (float[]) input[channel];
+ 			float2byteGeneric(data, inOffset, output, outByteOffset,
+ 					format.getFrameSize(), frameCount, format, ditherBits);
+ 			outByteOffset += format.getFrameSize() / format.getChannels();
+ 		}
+ 	}
+ 
+ 	/**
+ 	 * @param input an array of float[] arrays
+ 	 * @param channels how many channels to use from the input array
+ 	 * @param frameSize only as optimization, the number of bytes per sample frame
+ 	 * @throws ArrayIndexOutOfBoundsException if one of the parameters is out of
+ 	 *             bounds
+ 	 * @see #float2byte(List<float[]>[] input, int inOffset, byte[] output, int
+ 	 *      outByteOffset, int frameCount, AudioFormat format, float
+ 	 *      ditherBits)
+ 	 */
+ 	static void float2byte(Object[] input, int inOffset, byte[] output,
+ 			int outByteOffset, int frameCount, int formatCode, int channels, int frameSize, 
+ 			float ditherBits) {
+ 		int sampleSize = frameSize / channels;
+ 		for (int channel = 0; channel < channels; channel++) {
+ 			float[] data = (float[]) input[channel];
+ 			float2byteGeneric(data, inOffset, output, outByteOffset,
+ 					frameSize, frameCount, formatCode, ditherBits);
+ 			outByteOffset += sampleSize;
+ 		}
+ 	}
+ 
+ 	/**
  	 * Conversion function to convert an interleaved float array to
  	 * an interleaved byte array. The float array contains normalized
***************
*** 663,677 ****
  				output[outIndex]=(byte) (iSample & 0xFF);
  				break;
! 			case CT_24SB:
! 				iSample=quantize24(input[inIndex]*twoPower23, ditherBits);
! 				output[outIndex]=(byte) (iSample >> 16);
! 				output[outIndex+1]=(byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex+2]=(byte) (iSample & 0xFF);
! 				break;
! 			case CT_24SL:
! 				iSample=quantize24(input[inIndex]*twoPower23, ditherBits);
! 				output[outIndex+2]=(byte) (iSample >> 16);
! 				output[outIndex+1]=(byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex]=(byte) (iSample & 0xFF);
  				break;
  			case CT_32SB:
--- 809,839 ----
  				output[outIndex]=(byte) (iSample & 0xFF);
  				break;
! 			case CT_24_3SB:
! 				iSample = quantize24(input[inIndex] * twoPower23, ditherBits);
! 				output[outIndex] = (byte) (iSample >> 16);
! 				output[outIndex + 1] = (byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex + 2] = (byte) (iSample & 0xFF);
! 				break;
! 			case CT_24_3SL:
! 				iSample = quantize24(input[inIndex] * twoPower23, ditherBits);
! 				output[outIndex + 2] = (byte) (iSample >> 16);
! 				output[outIndex + 1] = (byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex] = (byte) (iSample & 0xFF);
! 				break;
! 			case CT_24_4SB:
! 				// TODO: verify
! 				iSample = quantize24(input[inIndex] * twoPower23, ditherBits);
! 				output[outIndex + 0] = 0;
! 				output[outIndex + 1] = (byte) (iSample >> 16);
! 				output[outIndex + 2] = (byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex + 3] = (byte) (iSample & 0xFF);
! 				break;
! 			case CT_24_4SL:
! 				// TODO: verify
! 				iSample = quantize24(input[inIndex] * twoPower23, ditherBits);
! 				output[outIndex + 3] = (byte) (iSample >> 16);
! 				output[outIndex + 2] = (byte) ((iSample >>> 8) & 0xFF);
! 				output[outIndex + 1] = (byte) (iSample & 0xFF);
! 				output[outIndex + 0] = 0;
  				break;
  			case CT_32SB:

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32146/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	Encodings.java 
Log Message:
type safety, remove compiler warnings


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/Encodings.java

Index: Encodings.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/Encodings.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Encodings.java	13 Feb 2006 12:21:50 -0000	1.2
--- Encodings.java	22 Nov 2006 15:46:27 -0000	1.3
***************
*** 68,72 ****
  
  	/** contains all known encodings */
! 	private static StringHashedSet encodings = new StringHashedSet();
  
  	// initially add the standard encodings
--- 68,72 ----
  
  	/** contains all known encodings */
! 	private static StringHashedSet<AudioFormat.Encoding> encodings = new StringHashedSet<AudioFormat.Encoding>();
  
  	// initially add the standard encodings
***************
*** 149,154 ****
  	 */
  	public static AudioFormat.Encoding[] getEncodings() {
! 		StringHashedSet iteratedSources=new StringHashedSet();
! 		StringHashedSet retrievedTargets=new StringHashedSet();
  		Iterator sourceFormats=encodings.iterator();
  		while (sourceFormats.hasNext()) {
--- 149,154 ----
  	 */
  	public static AudioFormat.Encoding[] getEncodings() {
! 		StringHashedSet<AudioFormat.Encoding> iteratedSources=new StringHashedSet<AudioFormat.Encoding>();
! 		StringHashedSet<AudioFormat.Encoding> retrievedTargets=new StringHashedSet<AudioFormat.Encoding>();
  		Iterator sourceFormats=encodings.iterator();
  		while (sourceFormats.hasNext()) {
***************
*** 162,167 ****
  
  	private static void iterateEncodings(AudioFormat.Encoding source,
! 	                                     StringHashedSet iteratedSources,
! 	                                     StringHashedSet retrievedTargets) {
  		if (!iteratedSources.contains(source)) {
  			iteratedSources.add(source);
--- 162,167 ----
  
  	private static void iterateEncodings(AudioFormat.Encoding source,
! 	                                     StringHashedSet<AudioFormat.Encoding> iteratedSources,
! 	                                     StringHashedSet<AudioFormat.Encoding> retrievedTargets) {
  		if (!iteratedSources.contains(source)) {
  			iteratedSources.add(source);
***************
*** 169,173 ****
  			for (int i=0; i<targets.length; i++) {
  				AudioFormat.Encoding target=targets[i];
! 				if (retrievedTargets.add(target.toString())) {
  					iterateEncodings(target, iteratedSources,retrievedTargets);
  				}
--- 169,173 ----
  			for (int i=0; i<targets.length; i++) {
  				AudioFormat.Encoding target=targets[i];
! 				if (retrievedTargets.add(target)) {
  					iterateEncodings(target, iteratedSources,retrievedTargets);
  				}

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31706/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	AudioUtils.java 
Log Message:
add some more conversions, and utility queries


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioUtils.java

Index: AudioUtils.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AudioUtils.java	13 Feb 2006 12:21:50 -0000	1.2
--- AudioUtils.java	22 Nov 2006 15:45:30 -0000	1.3
***************
*** 35,38 ****
--- 35,39 ----
  import javax.sound.sampled.AudioFormat;
  import javax.sound.sampled.AudioInputStream;
+ import javax.sound.sampled.Mixer;
  
  
***************
*** 104,111 ****
  	}
  
! 	public static long millis2Bytes(long ms, float frameRate, int frameSize) {
  		return (long) (ms*frameRate/1000*frameSize);
  	}
  
  	/**
  	* Conversion milliseconds -> bytes (bytes will be frame-aligned)
--- 105,120 ----
  	}
  
! 	public static long millis2Bytes(long ms, double frameRate, int frameSize) {
  		return (long) (ms*frameRate/1000*frameSize);
  	}
  
+ 	public static long millis2Bytes(double ms, AudioFormat format) {
+ 		return millis2Bytes(ms, format.getFrameRate(), format.getFrameSize());
+ 	}
+ 
+ 	public static long millis2Bytes(double ms, double frameRate, int frameSize) {
+ 		return ((long) (ms*frameRate/1000.0))*frameSize;
+ 	}
+ 
  	/**
  	* Conversion milliseconds -> bytes (bytes will be frame-aligned)
***************
*** 143,146 ****
--- 152,191 ----
  		return (long) (frames/format.getFrameRate()*1000);
  	}
+ 	
+ 	/**
+ 	 * 
+ 	 * @param sr1 the first sample rate to compare
+ 	 * @param sr2 the second sample rate to compare
+ 	 * @return true if the sample rates are (almost) identical
+ 	 */
+ 	public static boolean sampleRateEquals(float sr1, float sr2) {
+ 		return Math.abs(sr1-sr2)<0.0000001;
+ 	}
+ 	
+ 	/**
+ 	 * @param format the audio format to test
+ 	 * @return true if the format is either PCM_SIGNED or PCM_UNSIGNED
+ 	 */
+ 	public static boolean isPCM(AudioFormat format) {
+ 		return format.getEncoding().equals(AudioFormat.Encoding.PCM_SIGNED)
+ 			|| format.getEncoding().equals(AudioFormat.Encoding.PCM_UNSIGNED);
+ 	}
+ 	
+ 	/**
+ 	 * Return if the passed mixer info is the Java Sound Audio Engine.
+ 	 * @param mixerInfo the mixer info to query
+ 	 * @return true if the mixer info describes the Java Sound Audio Engine
+ 	 */
+ 	public static boolean isJavaSoundAudioEngine(Mixer.Info mixerInfo) {
+ 		return mixerInfo.getName().equals("Java Sound Audio Engine");
+ 	}
+ 	
+ 	/**
+ 	 * tries to guess if this program is running on a big endian platform
+ 	 * @return
+ 	 */
+ 	public static boolean isSystemBigEndian() {
+ 		return java.nio.ByteOrder.nativeOrder().equals(java.nio.ByteOrder.BIG_ENDIAN);
+ 	}
  
  

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31280/tritonus/src/classes/org/tritonus/share/sampled

Modified Files:
	AudioFileTypes.java 
Log Message:
remove compiler warning


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFileTypes.java

Index: AudioFileTypes.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFileTypes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AudioFileTypes.java	13 Feb 2006 12:21:50 -0000	1.2
--- AudioFileTypes.java	22 Nov 2006 15:44:29 -0000	1.3
***************
*** 69,73 ****
  
  	/** contains all known types */
! 	private static StringHashedSet types = new StringHashedSet();
  
  	// initially add the standard types
--- 69,73 ----
  
  	/** contains all known types */
! 	private static StringHashedSet<AudioFileFormat.Type> types = new StringHashedSet<AudioFileFormat.Type>();
  
  	// initially add the standard types

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30807/tritonus/src/classes/org/tritonus/share

Modified Files:
	StringHashedSet.java 
Log Message:
fixed small typo


Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/StringHashedSet.java

Index: StringHashedSet.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/StringHashedSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StringHashedSet.java	13 Feb 2006 12:21:50 -0000	1.2
--- StringHashedSet.java	22 Nov 2006 15:43:26 -0000	1.3
***************
*** 93,97 ****
  	}
  
! 	public E get(E elem) {
  		if (elem==null) {
  			return null;
--- 93,97 ----
  	}
  
! 	public E get(Object elem) {
  		if (elem==null) {
  			return null;
***************
*** 107,110 ****
--- 107,111 ----
  		return null;
  	}
+ 
  }
  

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/ais
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21747/ais

Added Files:
	AmplitudeAudioInputStream.java FloatAudioInputStream.java 
Log Message:
import

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/dsp/ais/AmplitudeAudioInputStream.java
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/dsp/ais/FloatAudioInputStream.java

--- NEW FILE: AmplitudeAudioInputStream.java ---

--- NEW FILE: FloatAudioInputStream.java ---

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/interfaces
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21747/interfaces

Added Files:
	FloatSampleProcessor.java FloatSampleReader.java 
	FloatSampleWriter.java 
Log Message:
import

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/dsp/interfaces/FloatSampleProcessor.java
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/dsp/interfaces/FloatSampleReader.java
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/dsp/interfaces/FloatSampleWriter.java

--- NEW FILE: FloatSampleProcessor.java ---

--- NEW FILE: FloatSampleReader.java ---

--- NEW FILE: FloatSampleWriter.java ---

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/processor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21747/processor

Added Files:
	AmplitudeProcessor.java 
Log Message:
import

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/dsp/processor/AmplitudeProcessor.java

--- NEW FILE: AmplitudeProcessor.java ---

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/ais
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19988/src/classes/org/tritonus/dsp/ais

Log Message:
Directory /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/ais added to the repository


Direct links to online-CVS:

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/interfaces
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19988/src/classes/org/tritonus/dsp/interfaces

Log Message:
Directory /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/interfaces added to the repository


Direct links to online-CVS:

Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/processor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19988/src/classes/org/tritonus/dsp/processor

Log Message:
Directory /cvsroot/tritonus/tritonus/src/classes/org/tritonus/dsp/processor added to the repository


Direct links to online-CVS:

Update of /cvsroot/tritonus/tritonus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19134

Modified Files:
	.cvsignore 
Log Message:
updated

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/.cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tritonus/tritonus/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** .cvsignore	12 Feb 2006 14:05:09 -0000	1.10
--- .cvsignore	19 Apr 2006 15:37:42 -0000	1.11
***************
*** 13,14 ****
--- 13,17 ----
  project.dtd
  aclocal.m4
+ .classpath
+ .project
+ .settings

Update of /cvsroot/tritonus/tritonus/src/lib/fluidsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4925

Added Files:
	Makefile.am 
Log Message:
Initial automake file for fluidsynth

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/lib/fluidsynth/Makefile.am

--- NEW FILE: Makefile.am ---

Update of /cvsroot/tritonus/tritonus/src/lib/fluidsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10619

Modified Files:
	org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c 
Log Message:
also don't try to turn off log levels in Cygwin

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c

Index: org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c	25 Feb 2006 20:53:28 -0000	1.14
--- org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c	28 Feb 2006 22:55:54 -0000	1.15
***************
*** 553,557 ****
  	 * in the fluidsynth DLL and so causes a link error
  	 */
! #ifndef WIN32
  	if (!bTrace)
  	{
--- 553,557 ----
  	 * in the fluidsynth DLL and so causes a link error
  	 */
! #if !defined(WIN32) && !defined(__CYGWIN__)
  	if (!bTrace)
  	{

Update of /cvsroot/tritonus/tritonus/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1647

Modified Files:
	config.guess config.sub 
Log Message:
More modern version of these files so Mac OS X is recognized

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/util/config.guess
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/util/config.sub

Index: config.guess
===================================================================
RCS file: /cvsroot/tritonus/tritonus/util/config.guess,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** config.guess	13 Apr 2000 19:17:17 -0000	1.1.1.1
--- config.guess	25 Feb 2006 20:57:33 -0000	1.2
***************
*** 1,7 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
! #   Free Software Foundation, Inc.
! #
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
--- 1,9 ----
  #! /bin/sh
  # Attempt to guess a canonical system name.
[...2250 lines suppressed...]
! /bin/universe          = `(/bin/universe) 2>/dev/null`
! /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
! /bin/arch              = `(/bin/arch) 2>/dev/null`
! /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
! /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
! 
! UNAME_MACHINE = ${UNAME_MACHINE}
! UNAME_RELEASE = ${UNAME_RELEASE}
! UNAME_SYSTEM  = ${UNAME_SYSTEM}
! UNAME_VERSION = ${UNAME_VERSION}
! EOF
  
  exit 1
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:

Index: config.sub
===================================================================
RCS file: /cvsroot/tritonus/tritonus/util/config.sub,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** config.sub	13 Apr 2000 19:17:13 -0000	1.1.1.1
--- config.sub	25 Feb 2006 20:57:33 -0000	1.2
***************
*** 1,5 ****
  #! /bin/sh
! # Configuration validation subroutine script, version 1.1.
! #   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
--- 1,9 ----
  #! /bin/sh
! # Configuration validation subroutine script.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
[...1338 lines suppressed...]
  				vendor=atari
  				;;
+ 			-vos*)
+ 				vendor=stratus
+ 				;;
  		esac
  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
***************
*** 1214,1215 ****
--- 1589,1598 ----
  
  echo $basic_machine$os
+ exit
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:

Update of /cvsroot/tritonus/tritonus/src/lib/fluidsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32276

Modified Files:
	org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c 
Log Message:
Apple C compiler generates warnings if supplied integers by printf aren't
exactly of int type.

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c

Index: org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c
===================================================================
RCS file: /cvsroot/tritonus/tritonus/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c	22 Feb 2006 22:43:20 -0000	1.13
--- org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c	25 Feb 2006 20:53:28 -0000	1.14
***************
*** 187,195 ****
  
  #ifdef VARIADIC_MACROS
! 	out("nReceive: synth: %p, values: %x %d %d %d\n", synth, command, channel, data1, data2);
  #else
  	if (debug_flag)
  	{
! 		fprintf(debug_file, "synth: %p, values: %x %d %d %d\n", synth, command, channel, data1, data2);
  		fflush(debug_file);
  	}
--- 187,195 ----
  
  #ifdef VARIADIC_MACROS
! 	out("nReceive: synth: %p, values: %x %d %d %d\n", synth, (int) command, (int) channel, (int) data1, (int) data2);
  #else
  	if (debug_flag)
  	{
! 		fprintf(debug_file, "synth: %p, values: %x %d %d %d\n", synth, (int) command, (int) channel, (int) data1, (int) data2);
  		fflush(debug_file);
  	}

Update of /cvsroot/tritonus/tritonus/test/suite/src/classes/org/tritonus/test/api/midi/synthesizer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32273/src/classes/org/tritonus/test/api/midi/synthesizer

Modified Files:
	BaseSynthesizerTestCase.java 
Log Message:
fixed typo

Direct links to online-CVS:

http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/test/suite/src/classes/org/tritonus/test/api/midi/synthesizer/BaseSynthesizerTestCase.java

Index: BaseSynthesizerTestCase.java
===================================================================
RCS file: /cvsroot/tritonus/tritonus/test/suite/src/classes/org/tritonus/test/api/midi/synthesizer/BaseSynthesizerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** BaseSynthesizerTestCase.java	22 Feb 2006 20:04:04 -0000	1.2
--- BaseSynthesizerTestCase.java	25 Feb 2006 12:46:51 -0000	1.3
***************
*** 58,62 ****
  				   device.getDeviceInfo().getVendor().indexOf("Sun") != -1))
  			{
! 				System.out.println("testing seq: " + device);
  				checkSynthesizer((Synthesizer) device);
  			}
--- 58,62 ----
  				   device.getDeviceInfo().getVendor().indexOf("Sun") != -1))
  			{
! 				System.out.println("testing synth: " + device);
  				checkSynthesizer((Synthesizer) device);
  			}

Henri Manson wrote:
> Update of /cvsroot/tritonus/tritonus/src/lib/fluidsynth
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21765
> 
> Modified Files:
> 	org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c 
> Log Message:
> - program changes no longer ignored on channel 9


> - in Java_org_tritonus_midi_device_fluidsynth_FluidSynthesizer_setTrace
>   don't try to turn of log levels in Win32
>   since fluid_log_config() is not an exported function
>   in the fluidsynth DLL and so causes a link error

Ah, now I understand why you turned it off. Sorry for this argument via 
CVS. I thought your point is only about cleanness of the code. The linux 
linker makes a difference between exported and internal functions of a 
library only for 'static' methods, so you can call most internal methods 
directly. Not a nice solution, but I see no alternative currently.

Matthias

-- 
Matthias Pfisterer	Mat...@we...
Reuchlinstrasse 28	phone ++49-711-62 87 12
D-70176 Stuttgart	(in Deutschland 0711-62 87 12)
GERMANY

Work like you don't need the money.
Love like you've never been hurt.
Dance like nobody is watching.

Java Sound Resources (examples, FAQ, applications):
http://www.jsresources.org/

Tritonus, the open source implementation of the Java Sound API:
http://www.tritonus.org/
--------------------------------------------------------------