Menu
▾
▴
tritonus-commits — CVS activity reports: sends one email per commit.
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(14) |
Dec
(33) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(68) |
Feb
(19) |
Mar
(6) |
Apr
(97) |
May
(15) |
Jun
(28) |
Jul
(83) |
Aug
(21) |
Sep
(67) |
Oct
(16) |
Nov
|
Dec
(22) |
| 2003 |
Jan
(47) |
Feb
(17) |
Mar
(5) |
Apr
|
May
(5) |
Jun
(106) |
Jul
(25) |
Aug
|
Sep
(14) |
Oct
(7) |
Nov
(24) |
Dec
(5) |
| 2004 |
Jan
(54) |
Feb
(19) |
Mar
|
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
(153) |
Dec
(6) |
| 2005 |
Jan
(178) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(2) |
Feb
(173) |
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(12) |
Dec
(14) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(29) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(29) |
Feb
(3) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
(7) |
Feb
|
Mar
(18) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:12
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/alsa Modified Files: AlsaCtl.java AlsaMixerElement.java AlsaPcm.java AlsaPcmHWParams.java AlsaPcmHWParamsFormatMask.java AlsaPcmSWParams.java AlsaSeq.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaCtl.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaMixerElement.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcm.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaSeq.java Index: AlsaCtl.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaCtl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaCtl.java 16 Jan 2005 09:53:22 -0000 1.1 --- AlsaCtl.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 37,42 **** public class AlsaCtl { ! /** contains a pointer to snd_ctl_t */ private long m_lNativeHandle; --- 37,43 ---- public class AlsaCtl { ! /** Contains a pointer to snd_ctl_t. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: AlsaMixerElement.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaMixerElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaMixerElement.java 16 Jan 2005 09:53:22 -0000 1.1 --- AlsaMixerElement.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 61,64 **** --- 61,67 ---- private AlsaMixer m_mixer; + + + @SuppressWarnings("unused") private long m_lNativeHandle; Index: AlsaPcm.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaPcm.java 16 Jan 2005 09:53:22 -0000 1.1 --- AlsaPcm.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 189,192 **** --- 189,193 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: AlsaPcmHWParams.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcmHWParams.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaPcmHWParams.java 16 Jan 2005 09:53:22 -0000 1.1 --- AlsaPcmHWParams.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 41,44 **** --- 41,45 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; *************** *** 83,87 **** nReturn = getRate(alValues); ! double dRate = (double) -1; if (nReturn >= 0) { --- 84,88 ---- nReturn = getRate(alValues); ! double dRate = -1; if (nReturn >= 0) { Index: AlsaPcmHWParamsFormatMask.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaPcmHWParamsFormatMask.java 16 Jan 2005 09:53:22 -0000 1.1 --- AlsaPcmHWParamsFormatMask.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 42,45 **** --- 42,46 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: AlsaPcmSWParams.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaPcmSWParams.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaPcmSWParams.java 16 Jan 2005 09:53:22 -0000 1.1 --- AlsaPcmSWParams.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 41,44 **** --- 41,45 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: AlsaSeq.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/alsa/AlsaSeq.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaSeq.java 16 Jan 2005 09:53:22 -0000 1.1 --- AlsaSeq.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 382,385 **** --- 382,386 ---- * This holds a pointer for the native code - do not touch! */ + @SuppressWarnings("unused") private long m_lNativeHandle; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:11
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/pvorbis Modified Files: Block.java DspState.java Info.java StaticCodebook.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/Block.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/DspState.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/Info.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/StaticCodebook.java Index: Block.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/Block.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Block.java 5 Jan 2005 20:35:51 -0000 1.1 --- Block.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 54,57 **** --- 54,58 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: DspState.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/DspState.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** DspState.java 5 Feb 2005 18:58:03 -0000 1.4 --- DspState.java 13 Feb 2006 19:45:30 -0000 1.5 *************** *** 54,57 **** --- 54,58 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: Info.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/Info.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Info.java 14 Jan 2005 10:00:01 -0000 1.3 --- Info.java 13 Feb 2006 19:45:30 -0000 1.4 *************** *** 56,59 **** --- 56,60 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: StaticCodebook.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/StaticCodebook.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** StaticCodebook.java 13 Feb 2006 12:21:49 -0000 1.2 --- StaticCodebook.java 13 Feb 2006 19:45:30 -0000 1.3 *************** *** 233,237 **** private int calculateMaptype1Quantvals() { ! int vals = (int) Math.floor(Math.pow((float) m_nEntries, 1.0f / m_nDimensions)); /* the above *should* be reliable, but we'll not assume that FP is --- 233,237 ---- private int calculateMaptype1Quantvals() { ! int vals = (int) Math.floor(Math.pow(m_nEntries, 1.0f / m_nDimensions)); /* the above *should* be reliable, but we'll not assume that FP is |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:10
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/gsm Modified Files: Encoder.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Encoder.java Index: Encoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Encoder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Encoder.java 13 Feb 2006 17:40:04 -0000 1.4 --- Encoder.java 13 Feb 2006 19:45:29 -0000 1.5 *************** *** 72,76 **** public static void stripAUHeader(InputStream in) throws Exception { ! DataInputStream input = new DataInputStream( (InputStream) in ); /* Just read these bits from the stream and do nothing with them */ --- 72,76 ---- public static void stripAUHeader(InputStream in) throws Exception { ! DataInputStream input = new DataInputStream(in ); /* Just read these bits from the stream and do nothing with them */ |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:09
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/lame In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/lame Modified Files: Lame.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/lame/Lame.java Index: Lame.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/lame/Lame.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Lame.java 13 Feb 2006 12:21:49 -0000 1.2 --- Lame.java 13 Feb 2006 19:45:30 -0000 1.3 *************** *** 104,107 **** --- 104,108 ---- * size of ints may be 64 bit. */ + @SuppressWarnings("unused") private long m_lNativeGlobalFlags; *************** *** 161,165 **** if (TDebug.TraceAudioConverter) { TDebug.out("LAME parameters: channels="+sourceFormat.getChannels() ! +" sample rate="+((int) Math.round(sourceFormat.getSampleRate())+"Hz") +" bitrate="+bitRate+"KBit/s"); TDebug.out(" channelMode="+chmode2string(channelMode) --- 162,166 ---- if (TDebug.TraceAudioConverter) { TDebug.out("LAME parameters: channels="+sourceFormat.getChannels() ! +" sample rate="+(Math.round(sourceFormat.getSampleRate())+"Hz") +" bitrate="+bitRate+"KBit/s"); TDebug.out(" channelMode="+chmode2string(channelMode) *************** *** 167,171 **** +" VBR="+VBR+" bigEndian="+sourceFormat.isBigEndian()); } ! int result=nInitParams(sourceFormat.getChannels(), (int) Math.round(sourceFormat.getSampleRate()), bitRate, channelMode, quality, VBR, sourceFormat.isBigEndian()); --- 168,172 ---- +" VBR="+VBR+" bigEndian="+sourceFormat.isBigEndian()); } ! int result=nInitParams(sourceFormat.getChannels(), Math.round(sourceFormat.getSampleRate()), bitRate, channelMode, quality, VBR, sourceFormat.isBigEndian()); |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:08
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/javax/sound/sampled Modified Files: AudioSystem.java FloatControl.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/AudioSystem.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/FloatControl.java Index: AudioSystem.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/AudioSystem.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AudioSystem.java 13 Feb 2006 17:40:03 -0000 1.3 --- AudioSystem.java 13 Feb 2006 19:45:28 -0000 1.4 *************** *** 55,59 **** public static final int NOT_SPECIFIED = -1; - private static final AudioFormat[] EMPTY_FORMAT_ARRAY = new AudioFormat[0]; private static final AudioFormat.Encoding[] EMPTY_ENCODING_ARRAY = new AudioFormat.Encoding[0]; private static final AudioFileFormat.Type[] EMPTY_TYPE_ARRAY = new AudioFileFormat.Type[0]; --- 55,58 ---- *************** *** 676,680 **** AudioInputStream sourceStream) { ! return getAudioInputStreamImpl((Object) targetEncoding, sourceStream); } --- 675,679 ---- AudioInputStream sourceStream) { ! return getAudioInputStreamImpl(targetEncoding, sourceStream); } *************** *** 725,729 **** AudioInputStream sourceStream) { ! return getAudioInputStreamImpl((Object) targetFormat, sourceStream); } --- 724,728 ---- AudioInputStream sourceStream) { ! return getAudioInputStreamImpl(targetFormat, sourceStream); } Index: FloatControl.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/FloatControl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** FloatControl.java 16 Jan 2005 08:25:03 -0000 1.1 --- FloatControl.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 38,46 **** extends Control { - private static final String DEFAULT_TRUE_LABEL = "true"; - private static final String DEFAULT_FALSE_LABEL = "false"; - - - private float m_fValue; private float m_fMinimum; --- 38,41 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:08
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/esd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/esd Modified Files: EsdRecordingStream.java EsdSample.java EsdStream.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/esd/EsdRecordingStream.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/esd/EsdSample.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/esd/EsdStream.java Index: EsdRecordingStream.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/esd/EsdRecordingStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** EsdRecordingStream.java 13 Feb 2006 12:21:49 -0000 1.2 --- EsdRecordingStream.java 13 Feb 2006 19:45:28 -0000 1.3 *************** *** 42,45 **** --- 42,46 ---- * size of ints may be 64 bit. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: EsdSample.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/esd/EsdSample.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** EsdSample.java 13 Feb 2006 12:21:49 -0000 1.2 --- EsdSample.java 13 Feb 2006 19:45:28 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- * size of ints may be 64 bit. */ + @SuppressWarnings("unused") private long m_lNativeFd; *************** *** 48,51 **** --- 49,53 ---- * size of ints may be 64 bit. */ + @SuppressWarnings("unused") private long m_lNativeId; Index: EsdStream.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/esd/EsdStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** EsdStream.java 13 Feb 2006 12:21:49 -0000 1.2 --- EsdStream.java 13 Feb 2006 19:45:28 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- * size of ints may be 64 bit. */ + @SuppressWarnings("unused") private long m_lNativeHandle; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:08
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cdparanoia In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/cdda/cdparanoia Modified Files: Cdparanoia.java CdparanoiaMidLevel.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cdparanoia/Cdparanoia.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cdparanoia/CdparanoiaMidLevel.java Index: Cdparanoia.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cdparanoia/Cdparanoia.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Cdparanoia.java 16 Jan 2005 10:00:16 -0000 1.1 --- Cdparanoia.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 58,61 **** --- 58,62 ---- * do not touch! */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: CdparanoiaMidLevel.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cdparanoia/CdparanoiaMidLevel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** CdparanoiaMidLevel.java 13 Feb 2006 12:21:49 -0000 1.2 --- CdparanoiaMidLevel.java 13 Feb 2006 19:45:28 -0000 1.3 *************** *** 330,340 **** - private boolean isBigEndian() - { - return getFormat().isBigEndian(); - } - - - public void close() throws IOException --- 330,333 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:46:07
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cooked_ioctl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/cdda/cooked_ioctl Modified Files: CookedIoctl.java CookedIoctlMidLevel.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cooked_ioctl/CookedIoctl.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cooked_ioctl/CookedIoctlMidLevel.java Index: CookedIoctl.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cooked_ioctl/CookedIoctl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** CookedIoctl.java 16 Jan 2005 10:00:16 -0000 1.1 --- CookedIoctl.java 13 Feb 2006 19:45:28 -0000 1.2 *************** *** 54,57 **** --- 54,58 ---- * do not touch! */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: CookedIoctlMidLevel.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/cdda/cooked_ioctl/CookedIoctlMidLevel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** CookedIoctlMidLevel.java 13 Feb 2006 12:21:49 -0000 1.2 --- CookedIoctlMidLevel.java 13 Feb 2006 19:45:28 -0000 1.3 *************** *** 301,311 **** - private boolean isBigEndian() - { - return getFormat().isBigEndian(); - } - - - public void close() throws IOException --- 301,304 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:46
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/vorbis Modified Files: Block.java Comment.java DspState.java Info.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/Block.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/Comment.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/DspState.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/Info.java Index: Block.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/Block.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Block.java 16 Jan 2005 09:53:23 -0000 1.1 --- Block.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 54,57 **** --- 54,58 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: Comment.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/Comment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Comment.java 16 Jan 2005 09:53:23 -0000 1.1 --- Comment.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 52,55 **** --- 52,56 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: DspState.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/DspState.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** DspState.java 16 Jan 2005 09:53:23 -0000 1.1 --- DspState.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 53,56 **** --- 53,57 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: Info.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/vorbis/Info.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Info.java 16 Jan 2005 09:53:23 -0000 1.1 --- Info.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 54,57 **** --- 54,58 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:44
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/sampled/mixer/alsa Modified Files: AlsaDataLineMixer.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java Index: AlsaDataLineMixer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AlsaDataLineMixer.java 13 Feb 2006 12:21:50 -0000 1.2 --- AlsaDataLineMixer.java 13 Feb 2006 19:45:31 -0000 1.3 *************** *** 135,139 **** Line.Info targetLineInfo = new DataLine.Info( TargetDataLine.class, ! (AudioFormat[]) targetFormats.toArray(EMPTY_AUDIOFORMAT_ARRAY), AudioSystem.NOT_SPECIFIED, AudioSystem.NOT_SPECIFIED); --- 135,139 ---- Line.Info targetLineInfo = new DataLine.Info( TargetDataLine.class, ! targetFormats.toArray(EMPTY_AUDIOFORMAT_ARRAY), AudioSystem.NOT_SPECIFIED, AudioSystem.NOT_SPECIFIED); |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:44
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/midi/device/alsa Modified Files: AlsaSequencer.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/midi/device/alsa/AlsaSequencer.java Index: AlsaSequencer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/alsa/AlsaSequencer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AlsaSequencer.java 13 Feb 2006 12:21:49 -0000 1.2 --- AlsaSequencer.java 13 Feb 2006 19:45:31 -0000 1.3 *************** *** 741,745 **** MidiUtils.getUnsignedInteger(abData[1]) * 256 + MidiUtils.getUnsignedInteger(abData[2]); ! setTempoInMPQ((float) nTempo); break; } --- 741,745 ---- MidiUtils.getUnsignedInteger(abData[1]) * 256 + MidiUtils.getUnsignedInteger(abData[2]); ! setTempoInMPQ(nTempo); break; } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:43
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/ogg Modified Files: Buffer.java Packet.java Page.java StreamState.java SyncState.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/Buffer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/Packet.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/Page.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/StreamState.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/SyncState.java Index: Buffer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/Buffer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Buffer.java 16 Jan 2005 09:53:23 -0000 1.1 --- Buffer.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 51,54 **** --- 51,55 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: Packet.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/Packet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Packet.java 16 Jan 2005 09:53:23 -0000 1.1 --- Packet.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 52,55 **** --- 52,56 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: Page.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/Page.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Page.java 16 Jan 2005 09:53:23 -0000 1.1 --- Page.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 50,53 **** --- 50,54 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: StreamState.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/StreamState.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** StreamState.java 16 Jan 2005 09:53:23 -0000 1.1 --- StreamState.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 51,54 **** --- 51,55 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: SyncState.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/ogg/SyncState.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** SyncState.java 16 Jan 2005 09:53:23 -0000 1.1 --- SyncState.java 13 Feb 2006 19:45:30 -0000 1.2 *************** *** 51,54 **** --- 51,55 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:43
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/sampled/file Modified Files: AuAudioFileReader.java WaveAudioFileReader.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileReader.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileReader.java Index: AuAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AuAudioFileReader.java 13 Feb 2006 12:21:50 -0000 1.2 --- AuAudioFileReader.java 13 Feb 2006 19:45:31 -0000 1.3 *************** *** 159,167 **** AudioFormat format = new AudioFormat(encoding, ! (float) nSampleRate, nSampleSize, nNumChannels, calculateFrameSize(nSampleSize, nNumChannels), ! (float) nSampleRate, true); AudioFileFormat audioFileFormat = new TAudioFileFormat( --- 159,167 ---- AudioFormat format = new AudioFormat(encoding, ! nSampleRate, nSampleSize, nNumChannels, calculateFrameSize(nSampleSize, nNumChannels), ! nSampleRate, true); AudioFileFormat audioFileFormat = new TAudioFileFormat( Index: WaveAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** WaveAudioFileReader.java 13 Feb 2006 12:21:50 -0000 1.2 --- WaveAudioFileReader.java 13 Feb 2006 19:45:31 -0000 1.3 *************** *** 136,140 **** int sampleSizeInBits; int frameSize=0; ! float frameRate=(float) sampleRate; int cbSize = 0; --- 136,140 ---- int sampleSizeInBits; int frameSize=0; ! float frameRate= sampleRate; int cbSize = 0; *************** *** 245,249 **** return new AudioFormat( encoding, ! (float) sampleRate, sampleSizeInBits, channelCount, --- 245,249 ---- return new AudioFormat( encoding, ! sampleRate, sampleSizeInBits, channelCount, |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:42
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/share/sampled Modified Files: AudioFormatSet.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormatSet.java Index: AudioFormatSet.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormatSet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AudioFormatSet.java 13 Feb 2006 12:21:50 -0000 1.2 --- AudioFormatSet.java 13 Feb 2006 19:45:32 -0000 1.3 *************** *** 75,79 **** public boolean add(AudioFormat elem) { ! if (elem==null || !(elem instanceof AudioFormat)) { return false; } --- 75,79 ---- public boolean add(AudioFormat elem) { ! if (elem==null) { return false; } *************** *** 82,89 **** public boolean contains(AudioFormat elem) { ! if (elem==null || !(elem instanceof AudioFormat)) { return false; } ! AudioFormat comp=(AudioFormat) elem; Iterator it=iterator(); while (it.hasNext()) { --- 82,89 ---- public boolean contains(AudioFormat elem) { ! if (elem==null) { return false; } ! AudioFormat comp= elem; Iterator it=iterator(); while (it.hasNext()) { *************** *** 96,103 **** public AudioFormat get(AudioFormat elem) { ! if (elem==null || !(elem instanceof AudioFormat)) { return null; } ! AudioFormat comp=(AudioFormat) elem; Iterator it=iterator(); while (it.hasNext()) { --- 96,103 ---- public AudioFormat get(AudioFormat elem) { ! if (elem==null) { return null; } ! AudioFormat comp= elem; Iterator it=iterator(); while (it.hasNext()) { *************** *** 111,115 **** public AudioFormat getAudioFormat(AudioFormat elem) { ! return (AudioFormat) get(elem); } --- 111,115 ---- public AudioFormat getAudioFormat(AudioFormat elem) { ! return get(elem); } *************** *** 139,143 **** // $$mp: TODO: remove; should be obsolete public AudioFormat[] toAudioFormatArray() { ! return (AudioFormat[]) toArray(EMPTY_FORMAT_ARRAY); } --- 139,143 ---- // $$mp: TODO: remove; should be obsolete public AudioFormat[] toAudioFormatArray() { ! return toArray(EMPTY_FORMAT_ARRAY); } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:42
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/midi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/share/midi Modified Files: MidiUtils.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/midi/MidiUtils.java Index: MidiUtils.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/midi/MidiUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** MidiUtils.java 20 Jan 2005 07:47:16 -0000 1.1 --- MidiUtils.java 13 Feb 2006 19:45:31 -0000 1.2 *************** *** 45,49 **** public static int getUnsignedInteger(byte b) { ! return (b < 0) ? (int) b + 256 : b; } --- 45,49 ---- public static int getUnsignedInteger(byte b) { ! return (b < 0) ? b + 256 : b; } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:41
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/midi/device/java Modified Files: JavaSequencer.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/midi/device/java/JavaSequencer.java Index: JavaSequencer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/java/JavaSequencer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** JavaSequencer.java 13 Feb 2006 17:40:05 -0000 1.3 --- JavaSequencer.java 13 Feb 2006 19:45:31 -0000 1.4 *************** *** 373,377 **** MidiUtils.getUnsignedInteger(abData[2]); // TDebug.out("tempo (us/quarter note): " + nTempo); ! setTempoInMPQ((float) nTempo); // TODO: setTempoInMPQ() seems to be not thread-safe } --- 373,377 ---- MidiUtils.getUnsignedInteger(abData[2]); // TDebug.out("tempo (us/quarter note): " + nTempo); ! setTempoInMPQ(nTempo); // TODO: setTempoInMPQ() seems to be not thread-safe } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 19:45:41
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pogg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31731/src/classes/org/tritonus/lowlevel/pogg Modified Files: Buffer.java Packet.java Log Message: removed unused variables; removed unnecessary casts Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pogg/Buffer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pogg/Packet.java Index: Buffer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pogg/Buffer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Buffer.java 18 Jan 2005 18:54:11 -0000 1.4 --- Buffer.java 13 Feb 2006 19:45:30 -0000 1.5 *************** *** 53,56 **** --- 53,57 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; Index: Packet.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pogg/Packet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Packet.java 5 Feb 2005 18:58:03 -0000 1.4 --- Packet.java 13 Feb 2006 19:45:30 -0000 1.5 *************** *** 52,55 **** --- 52,56 ---- * This must be long to be 64bit-clean. */ + @SuppressWarnings("unused") private long m_lNativeHandle; |
|
From: Henri M. <hfm...@us...> - 2006-02-13 18:40:26
|
Update of /cvsroot/tritonus/tritonus/src/lib/fluidsynth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8320 Modified Files: org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c Log Message: check in every native call whether synthesizer is created + extra debug statements 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.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c 12 Feb 2006 18:54:54 -0000 1.6 --- org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c 13 Feb 2006 18:40:15 -0000 1.7 *************** *** 121,124 **** --- 121,133 ---- goto error_recovery; } + #ifdef VARIADIC_MACROS + out("newSynth: synth: %p\n", synth); + #else + if (debug_flag) + { + fprintf(debug_file, "newSynth: synth: %p\n", synth); + fflush(debug_file); + } + #endif adriver = new_fluid_audio_driver(settings, synth); *************** *** 151,154 **** --- 160,172 ---- synth = get_synth(env, obj); + #ifdef VARIADIC_MACROS + out("deleteSynth: synth: %p\n", synth); + #else + if (debug_flag) + { + fprintf(debug_file, "deleteSynth: synth: %p\n", synth); + fflush(debug_file); + } + #endif settings = (fluid_settings_t*) (*env)->GetIntField(env, obj, settingsPtrFieldID); adriver = (fluid_audio_driver_t*) (*env)->GetIntField(env, obj, audioDriverPtrFieldID); *************** *** 169,204 **** #ifdef VARIADIC_MACROS ! out("synth: %p, values: %d %d %d %d\n", synth, command, channel, data1, data2); #else if (debug_flag) { ! fprintf(debug_file, "synth: %p, values: %d %d %d %d\n", synth, command, channel, data1, data2); fflush(debug_file); } #endif ! fflush(stdout); ! event = new_fluid_midi_event(); ! if (!event) { ! printf("failed to instantiate fluid_midi_event_t\n"); ! return; } - //printf("2"); fflush(stdout); - fluid_midi_event_set_type(event, command); - fluid_midi_event_set_channel(event, channel); - fluid_midi_event_set_key(event, data1); - fluid_midi_event_set_velocity(event, data2); - //printf("3"); fflush(stdout); - /*printf("values2: %d %d %d %d\n", - fluid_midi_event_get_type(event), - fluid_midi_event_get_channel(event), - fluid_midi_event_get_key(event), - fluid_midi_event_get_velocity(event)); - fflush(stdout); - */ - fluid_synth_handle_midi_event(synth, event); - //printf("4"); fflush(stdout); - delete_fluid_midi_event(event); - //printf("5\n"); fflush(stdout); } --- 187,224 ---- #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); } #endif ! if (synth) { ! event = new_fluid_midi_event(); ! if (!event) ! { ! printf("failed to instantiate fluid_midi_event_t\n"); ! return; ! } ! //printf("2"); fflush(stdout); ! fluid_midi_event_set_type(event, command); ! fluid_midi_event_set_channel(event, channel); ! fluid_midi_event_set_key(event, data1); ! fluid_midi_event_set_velocity(event, data2); ! //printf("3"); fflush(stdout); ! /*printf("values2: %d %d %d %d\n", ! fluid_midi_event_get_type(event), ! fluid_midi_event_get_channel(event), ! fluid_midi_event_get_key(event), ! fluid_midi_event_get_velocity(event)); ! fflush(stdout); ! */ ! fluid_synth_handle_midi_event(synth, event); ! //printf("4"); fflush(stdout); ! delete_fluid_midi_event(event); ! //printf("5\n"); fflush(stdout); } } *************** *** 272,321 **** synthobj = (*env)->GetObjectField(env, obj, synthFieldID); synth = get_synth(env, synthobj); ! ! fluidinstrclass = (*env)->FindClass(env, "org/tritonus/midi/sb/fluidsynth/FluidSoundbank$FluidInstrument"); ! if (!fluidinstrclass) printf("could not get class id"); ! //printf("5"); ! initid = (*env)->GetMethodID(env, fluidinstrclass, "<init>", "(Lorg/tritonus/midi/sb/fluidsynth/FluidSoundbank;IILjava/lang/String;)V"); ! if (!initid) printf("could not get method id"); ! //printf("6"); ! ! sfont = fluid_synth_get_sfont_by_id(synth, sfontID); ! ! if (sfont != NULL) { ! sfont->iteration_start(sfont); ! while (sfont->iteration_next(sfont, &preset)) { ! count++; } - } ! //printf("7"); ! instruments = (*env)->NewObjectArray(env, count, fluidinstrclass, NULL); ! sfont = fluid_synth_get_sfont_by_id(synth, sfontID); ! offset = fluid_synth_get_bank_offset(synth, sfontID); ! if (sfont == NULL) ! return 0; ! sfont->iteration_start(sfont); ! while (sfont->iteration_next(sfont, &preset)) ! { ! instrname = (*env)->NewStringUTF(env, ! // fluid_preset_get_name(&preset) ! preset.get_name(&preset) ! ); ! instrument = (*env)->NewObject(env, fluidinstrclass, initid, obj, ! // (jint) fluid_preset_get_banknum(&preset) + offset, ! (jint) (preset.get_banknum(&preset) + offset), ! // (jint) fluid_preset_get_num(&preset), ! (jint) (preset.get_num(&preset)), ! (jobject) instrname); ! (*env)->SetObjectArrayElement(env, instruments, i++, instrument); } ! return instruments; } --- 292,354 ---- synthobj = (*env)->GetObjectField(env, obj, synthFieldID); synth = get_synth(env, synthobj); ! #ifdef VARIADIC_MACROS ! out("nGetInstruments: synth: %p\n", synth); ! #else ! if (debug_flag) { ! fprintf(debug_file, "nGetInstruments: synth: %p\n", synth); ! fflush(debug_file); ! } ! #endif ! if (synth) ! { ! fluidinstrclass = (*env)->FindClass(env, "org/tritonus/midi/sb/fluidsynth/FluidSoundbank$FluidInstrument"); ! if (!fluidinstrclass) printf("could not get class id"); ! //printf("5"); ! initid = (*env)->GetMethodID(env, fluidinstrclass, "<init>", "(Lorg/tritonus/midi/sb/fluidsynth/FluidSoundbank;IILjava/lang/String;)V"); ! if (!initid) printf("could not get method id"); ! //printf("6"); ! ! sfont = fluid_synth_get_sfont_by_id(synth, sfontID); ! if (sfont != NULL) { ! sfont->iteration_start(sfont); ! ! while (sfont->iteration_next(sfont, &preset)) ! { ! count++; ! } } ! //printf("7"); ! instruments = (*env)->NewObjectArray(env, count, fluidinstrclass, NULL); ! sfont = fluid_synth_get_sfont_by_id(synth, sfontID); ! offset = fluid_synth_get_bank_offset(synth, sfontID); ! if (sfont == NULL) ! return 0; ! sfont->iteration_start(sfont); ! while (sfont->iteration_next(sfont, &preset)) ! { ! instrname = (*env)->NewStringUTF(env, ! // fluid_preset_get_name(&preset) ! preset.get_name(&preset) ! ); ! instrument = (*env)->NewObject(env, fluidinstrclass, initid, obj, ! // (jint) fluid_preset_get_banknum(&preset) + offset, ! (jint) (preset.get_banknum(&preset) + offset), ! // (jint) fluid_preset_get_num(&preset), ! (jint) (preset.get_num(&preset)), ! (jobject) instrname); ! (*env)->SetObjectArrayElement(env, instruments, i++, instrument); ! } ! return instruments; } ! else ! return NULL; } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:45
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/dsp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/lowlevel/dsp Modified Files: Complex.java FilterDesign.java Log Message: resolved name shadowing; removed unused variables Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/dsp/Complex.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/dsp/FilterDesign.java Index: Complex.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/dsp/Complex.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Complex.java 22 Nov 2004 17:51:42 -0000 1.2 --- Complex.java 13 Feb 2006 17:40:03 -0000 1.3 *************** *** 61,70 **** * @serial Real part of the Complex. */ ! private double re; /** * @serial Imaginary part of the Complex. */ ! private double im; /** [...1367 lines suppressed...] } else if (state == 0 || state == 1) { ! z.m_im = sign; return z; } else if (state == 2 || state == 3 || state == 5) { ! z.m_im = Double.valueOf(input.substring(iBeginNumber,k)).doubleValue(); return z; } else { *************** *** 1357,1361 **** if (!haveRealPart) { ! z.re = Double.valueOf(input).doubleValue(); return z; } else { --- 1357,1361 ---- if (!haveRealPart) { ! z.m_re = Double.valueOf(input).doubleValue(); return z; } else { Index: FilterDesign.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/dsp/FilterDesign.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** FilterDesign.java 23 Nov 2004 19:28:33 -0000 1.5 --- FilterDesign.java 13 Feb 2006 17:40:03 -0000 1.6 *************** *** 62,69 **** int nFullLength = nHalfLength * 2; Complex[] aFrequencyResponse = new Complex[nFullLength]; ! double dScaleFactor = (double) (nFullLength - 1) / (double) nFullLength; for (int k = 0; k < nHalfLength; k++) { ! double dPhase = -Math.PI * k * dScaleFactor; } // TODO: middle point has to be 0 --- 62,69 ---- int nFullLength = nHalfLength * 2; Complex[] aFrequencyResponse = new Complex[nFullLength]; ! //double dScaleFactor = (double) (nFullLength - 1) / (double) nFullLength; for (int k = 0; k < nHalfLength; k++) { ! //double dPhase = -Math.PI * k * dScaleFactor; } // TODO: middle point has to be 0 *************** *** 71,75 **** for (int k = nHalfLength; k < nFullLength; k++) { ! double dPhase = Math.PI - Math.PI * k * dScaleFactor; } Complex[] aComplexCoefficients = Util.IDFT(aFrequencyResponse); --- 71,75 ---- for (int k = nHalfLength; k < nFullLength; k++) { ! //double dPhase = Math.PI - Math.PI * k * dScaleFactor; } Complex[] aComplexCoefficients = Util.IDFT(aFrequencyResponse); |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:44
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/javax/sound/sampled Modified Files: AudioSystem.java Log Message: resolved name shadowing; removed unused variables Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/AudioSystem.java Index: AudioSystem.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/AudioSystem.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AudioSystem.java 13 Feb 2006 12:21:48 -0000 1.2 --- AudioSystem.java 13 Feb 2006 17:40:03 -0000 1.3 *************** *** 126,130 **** Mixer.Info[] infos = action.getMixerInfos(); // TDebug.out("MI length: " + infos.length); ! return action.getMixerInfos(); } --- 126,130 ---- Mixer.Info[] infos = action.getMixerInfos(); // TDebug.out("MI length: " + infos.length); ! return infos; } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:44
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/javax/sound/midi Modified Files: MetaMessage.java Log Message: resolved name shadowing; removed unused variables Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/midi/MetaMessage.java Index: MetaMessage.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi/MetaMessage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MetaMessage.java 13 Feb 2006 12:21:48 -0000 1.2 --- MetaMessage.java 13 Feb 2006 17:40:03 -0000 1.3 *************** *** 95,99 **** throw new InvalidMidiDataException("type must not exceed 127"); } ! byte[] abLength = MidiUtils.getVariableLengthQuantity(nDataLength); int nCompleteLength = 2 + nDataLength; byte[] abCompleteData = new byte[nCompleteLength]; --- 95,99 ---- throw new InvalidMidiDataException("type must not exceed 127"); } ! //byte[] abLength = MidiUtils.getVariableLengthQuantity(nDataLength); int nCompleteLength = 2 + nDataLength; byte[] abCompleteData = new byte[nCompleteLength]; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:25
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/lowlevel/pvorbis Modified Files: Comment.java Log Message: resolved name shadowing; removed unused variables Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/Comment.java Index: Comment.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/pvorbis/Comment.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Comment.java 13 Feb 2006 12:21:49 -0000 1.4 --- Comment.java 13 Feb 2006 17:40:05 -0000 1.5 *************** *** 122,126 **** public String query(String strTag, int nIndex) { - String strFullTag = strTag + "="; int nCount = 0; for (int i = 0; i < m_comments.size(); i++) --- 122,125 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:22
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/sampled/mixer/alsa Modified Files: AlsaPortMixer.java AlsaTargetDataLine.java AlsaUtils.java Log Message: resolved name shadowing; removed unused variables Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaUtils.java Index: AlsaPortMixer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AlsaPortMixer.java 13 Feb 2006 12:21:50 -0000 1.2 --- AlsaPortMixer.java 13 Feb 2006 17:40:06 -0000 1.3 *************** *** 279,284 **** } List<Control> controls; ! Control c; ! int nDirection; if (info.isSource()) { --- 279,284 ---- } List<Control> controls; ! //Control c; ! //int nDirection; if (info.isSource()) { Index: AlsaTargetDataLine.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AlsaTargetDataLine.java 13 Feb 2006 12:21:50 -0000 1.2 --- AlsaTargetDataLine.java 13 Feb 2006 17:40:07 -0000 1.3 *************** *** 156,160 **** } int nFrameSize = getFormat().getFrameSize(); - int nOriginalOffset = nOffset; int nFramesToRead = nLength / nFrameSize; if (nLength > 0 && !isActive()) --- 156,159 ---- Index: AlsaUtils.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaUtils.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AlsaUtils.java 13 Feb 2006 12:21:50 -0000 1.2 --- AlsaUtils.java 13 Feb 2006 17:40:07 -0000 1.3 *************** *** 185,192 **** public static int getAlsaFormat(AudioFormat audioFormat) { - int nChannels = audioFormat.getChannels(); - AudioFormat.Encoding encoding = audioFormat.getEncoding(); - int nSampleSize = audioFormat.getSampleSizeInBits(); - for (int nFormat = 0; nFormat < sm_aFormatTable.length; nFormat++) { --- 185,188 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:21
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/mixer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/share/sampled/mixer Modified Files: TClip.java Log Message: resolved name shadowing; removed unused variables Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/mixer/TClip.java Index: TClip.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/mixer/TClip.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TClip.java 13 Feb 2006 12:21:50 -0000 1.2 --- TClip.java 13 Feb 2006 17:40:07 -0000 1.3 *************** *** 107,112 **** DataLine.Info info = new DataLine.Info(Clip.class, audioFormat, -1/*nBufferSize*/); - /* setLineInfo(info); int nFrameSize = audioFormat.getFrameSize(); long lTotalLength = audioInputStream.getFrameLength() * nFrameSize; --- 107,112 ---- DataLine.Info info = new DataLine.Info(Clip.class, audioFormat, -1/*nBufferSize*/); setLineInfo(info); + /* int nFrameSize = audioFormat.getFrameSize(); long lTotalLength = audioInputStream.getFrameLength() * nFrameSize; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:21
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/jorbis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/sampled/convert/jorbis Modified Files: JorbisFormatConversionProvider.java Log Message: resolved name shadowing; removed unused variables Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/jorbis/JorbisFormatConversionProvider.java Index: JorbisFormatConversionProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/jorbis/JorbisFormatConversionProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** JorbisFormatConversionProvider.java 16 Jan 2005 12:45:50 -0000 1.1 --- JorbisFormatConversionProvider.java 13 Feb 2006 17:40:05 -0000 1.2 *************** *** 426,429 **** --- 426,430 ---- currComment = (new String(ptr[j], 0, ptr[j].length - 1)).trim(); m_songComments.add(currComment); + /* if (currComment.toUpperCase().startsWith("ARTIST")) { *************** *** 435,438 **** --- 436,440 ---- String miniDragLabel = currComment.substring(6); } + */ if (TDebug.TraceAudioConverter) TDebug.out("Comment: " + currComment); } |