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 17:40:21
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/lowlevel/gsm Modified Files: Encoder.java GSMDecoder.java Long_term.java Lpc.java Rpe.java Short_term.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/gsm/Encoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Long_term.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Lpc.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Rpe.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Short_term.java Index: Encoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Encoder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Encoder.java 13 Feb 2006 13:25:23 -0000 1.3 --- Encoder.java 13 Feb 2006 17:40:04 -0000 1.4 *************** *** 130,137 **** stripAUHeader(from); - int check_stream = 0; - // Read bytes till EOF. ! while((check_stream = ulaw_input(from)) > 0) { //System.out.println("Entering Native method."); --- 130,135 ---- stripAUHeader(from); // Read bytes till EOF. ! while(ulaw_input(from) > 0) { //System.out.println("Entering Native method."); *************** *** 190,197 **** to = new FileOutputStream(output_file); - int check_stream = 0; - // Read bytes till EOF. ! while((check_stream = ulaw_input(input)) > 0) { gsm_encode(); --- 188,193 ---- to = new FileOutputStream(output_file); // Read bytes till EOF. ! while(ulaw_input(input) > 0) { gsm_encode(); *************** *** 384,388 **** int dp_dpp_point_dp0 = 120; ! short[] ep = new short[40]; short[] e = new short[50]; short[] so = new short[160]; --- 380,384 ---- int dp_dpp_point_dp0 = 120; ! //short[] ep = new short[40]; short[] e = new short[50]; short[] so = new short[160]; *************** *** 444,448 **** int mp = g_s.getMp(); ! short s1 = 0, msp = 0, lsp = 0, temp = 0, SO = 0; int L_s2 = 0, L_temp = 0; int k = 160; --- 440,444 ---- int mp = g_s.getMp(); ! short s1 = 0, msp = 0, lsp = 0, SO = 0; int L_s2 = 0, L_temp = 0; int k = 160; *************** *** 530,535 **** { int i = 0; - byte output = 0; - for (i = 0; i < frame.length; i++) { --- 526,529 ---- Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** GSMDecoder.java 13 Feb 2006 13:25:23 -0000 1.2 --- GSMDecoder.java 13 Feb 2006 17:40:04 -0000 1.3 *************** *** 389,393 **** int i,p; int temp, temp1, temp2, temp3; - int ltmp; //assert(mant >0 && mant <= 7 ); --- 389,392 ---- *************** *** 494,498 **** int[] dp0) { - int ltmp; int brp, drpp, Nr; --- 493,496 ---- *************** *** 559,563 **** { int temp1; - int ltmp; // STEP( 0, -32, 13107 ); --- 557,560 ---- Index: Long_term.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Long_term.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Long_term.java 16 Jan 2005 09:53:23 -0000 1.1 --- Long_term.java 13 Feb 2006 17:40:05 -0000 1.2 *************** *** 342,346 **** throws IllegalArgumentException { - int ltmp; /* for ADD */ short brp, drpp, Nr; short[] drp = S.getDp0(); --- 342,345 ---- Index: Lpc.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Lpc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Lpc.java 16 Jan 2005 09:53:23 -0000 1.1 --- Lpc.java 13 Feb 2006 17:40:05 -0000 1.2 *************** *** 44,49 **** int i = 0, sp_index = 0; short temp = 0, smax = 0, scalauto = 0; - int L_temp = 0; - int L_temp2 = 0; /* Dynamic scaling of the array s[0..159] --- 44,47 ---- *************** *** 229,233 **** { short temp = 0; - int ltmp = 0; int r_index = 0; --- 227,230 ---- Index: Rpe.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Rpe.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Rpe.java 16 Jan 2005 09:53:23 -0000 1.1 --- Rpe.java 13 Feb 2006 17:40:05 -0000 1.2 *************** *** 73,77 **** { int L_result = 0; - int i = 0; /* --- 73,76 ---- *************** *** 98,102 **** /* #define STEP( i, H ) (e[ k + i ] * H) */ - i = 0; L_result +=( e[ k + 0 ] * -134 ) --- 97,100 ---- *************** *** 134,138 **** int Mc_index) { - int m = 0; int L_result = 0; int EM = 0; /* xxx should be L_EM? */ --- 132,135 ---- Index: Short_term.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Short_term.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Short_term.java 13 Feb 2006 12:21:49 -0000 1.2 --- Short_term.java 13 Feb 2006 17:40:05 -0000 1.3 *************** *** 127,131 **** short[] LARpp) /* out: decoded .. */ { ! short temp1 = 0, temp2 = 0; int index = 0; --- 127,131 ---- short[] LARpp) /* out: decoded .. */ { ! short temp1 = 0; int index = 0; *************** *** 333,337 **** short[] v_temp = S.getV(); short sri = 0, tmp1 = 0, tmp2 = 0; - int ltmp = 0; /* for GSM_ADD & GSM_SUB */ int index = wt_sr_index_start; --- 333,336 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:18
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/sampled/mixer/esd Modified Files: EsdSourceDataLine.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/esd/EsdSourceDataLine.java Index: EsdSourceDataLine.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** EsdSourceDataLine.java 13 Feb 2006 12:21:50 -0000 1.2 --- EsdSourceDataLine.java 13 Feb 2006 17:40:07 -0000 1.3 *************** *** 42,46 **** import org.tritonus.lowlevel.esd.EsdStream; import org.tritonus.share.sampled.TConversionTool; - import org.tritonus.share.sampled.TVolumeUtils; import org.tritonus.share.sampled.mixer.TMixer; import org.tritonus.share.sampled.mixer.TBaseDataLine; --- 42,45 ---- *************** *** 334,341 **** --- 333,342 ---- TDebug.out("EsdSourceDataLine.setGainImpl(): called: "); } + /* float fLeftDb = m_fGain + m_fPan * 15.0F; float fRightDb = m_fGain - m_fPan * 15.0F; float fLeftLinear = (float) TVolumeUtils.log2lin(fLeftDb); float fRightLinear = (float) TVolumeUtils.log2lin(fRightDb); + */ // m_esdStream.setVolume((int) (fLeftLinear * 256), // (int) (fRightLinear * 256)); |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:18
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/pvorbis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/sampled/file/pvorbis Modified Files: VorbisAudioFileReader.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/file/pvorbis/VorbisAudioFileReader.java Index: VorbisAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/pvorbis/VorbisAudioFileReader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** VorbisAudioFileReader.java 13 Feb 2006 12:21:50 -0000 1.3 --- VorbisAudioFileReader.java 13 Feb 2006 17:40:06 -0000 1.4 *************** *** 214,220 **** --- 214,222 ---- // These are only used for error checking. + /* int bitrate_upper = abData[16] + 256 * abData[17] + 65536 * abData[18] + 16777216 * abData[19]; int bitrate_nominal = abData[20] + 256 * abData[21] + 65536 * abData[22] + 16777216 * abData[23]; int bitrate_lower = abData[24] + 256 * abData[25] + 65536 * abData[26] + 16777216 * abData[27]; + */ int[] blocksizes = new int[2]; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:17
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/midi/device/java Modified Files: JavaSequencer.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/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.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** JavaSequencer.java 13 Feb 2006 12:21:49 -0000 1.2 --- JavaSequencer.java 13 Feb 2006 17:40:05 -0000 1.3 *************** *** 251,255 **** Track[] aTracks = sequence.getTracks(); // this is used to get a useful time value for the end of track message ! long lHighestTime = 0; while (m_nPhase == STATE_STARTED) { --- 251,255 ---- Track[] aTracks = sequence.getTracks(); // this is used to get a useful time value for the end of track message ! //long lHighestTime = 0; while (m_nPhase == STATE_STARTED) { |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:17
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/share/sampled/file Modified Files: TAudioFileWriter.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/file/TAudioFileWriter.java Index: TAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file/TAudioFileWriter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 --- TAudioFileWriter.java 13 Feb 2006 17:40:07 -0000 1.4 *************** *** 300,304 **** } int nTotalWritten = 0; - AudioFormat inputFormat = audioInputStream.getFormat(); AudioFormat outputFormat = audioOutputStream.getFormat(); --- 300,303 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:15
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/jorbis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/sampled/file/jorbis Modified Files: JorbisAudioFileReader.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/file/jorbis/JorbisAudioFileReader.java Index: JorbisAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/jorbis/JorbisAudioFileReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** JorbisAudioFileReader.java 16 Jan 2005 12:45:51 -0000 1.1 --- JorbisAudioFileReader.java 13 Feb 2006 17:40:05 -0000 1.2 *************** *** 162,168 **** // These are only used for error checking. ! int bitrate_upper = oggPacketBuffer.read(32); ! int bitrate_nominal = oggPacketBuffer.read(32); ! int bitrate_lower = oggPacketBuffer.read(32); int[] blocksizes = new int[2]; --- 162,168 ---- // These are only used for error checking. ! /*int bitrate_upper =*/ oggPacketBuffer.read(32); ! /*int bitrate_nominal =*/ oggPacketBuffer.read(32); ! /*int bitrate_lower =*/ oggPacketBuffer.read(32); int[] blocksizes = new int[2]; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 17:40:14
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/vorbis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104/src/classes/org/tritonus/sampled/file/vorbis Modified Files: VorbisAudioFileReader.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/file/vorbis/VorbisAudioFileReader.java Index: VorbisAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/vorbis/VorbisAudioFileReader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** VorbisAudioFileReader.java 13 Feb 2006 12:21:50 -0000 1.3 --- VorbisAudioFileReader.java 13 Feb 2006 17:40:06 -0000 1.4 *************** *** 222,228 **** --- 222,230 ---- // These are only used for error checking. + /* int bitrate_upper = abData[16] + 256 * abData[17] + 65536 * abData[18] + 16777216 * abData[19]; int bitrate_nominal = abData[20] + 256 * abData[21] + 65536 * abData[22] + 16777216 * abData[23]; int bitrate_lower = abData[24] + 256 * abData[25] + 65536 * abData[26] + 16777216 * abData[27]; + */ int[] blocksizes = new int[2]; |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 14:32:20
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/fluidsynth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14433/src/classes/org/tritonus/midi/device/fluidsynth Modified Files: FluidSynthesizer.java FluidSynthesizerProvider.java Log Message: reorganized open/close behaviour - now using openImpl() and closeImpl(); moved default soundbank loading from provider to open part of the synth itself Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/midi/device/fluidsynth/FluidSynthesizer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/midi/device/fluidsynth/FluidSynthesizerProvider.java Index: FluidSynthesizer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/fluidsynth/FluidSynthesizer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** FluidSynthesizer.java 13 Feb 2006 11:24:54 -0000 1.4 --- FluidSynthesizer.java 13 Feb 2006 14:32:03 -0000 1.5 *************** *** 41,44 **** --- 41,45 ---- import javax.sound.midi.*; + import org.tritonus.share.TDebug; import org.tritonus.share.midi.TMidiDevice; *************** *** 102,122 **** { super(info, false, true); ! if (newSynth() < 0) { ! throw new Exception("Low-level initialization of the synthesizer failed"); ! } ! if (TDebug.TraceSynthesizer) TDebug.out("FluidSynthesizer: " + Integer.toHexString(synthPtr)); ! try ! { ! Receiver r = getReceiver(); ! channels = new FluidMidiChannel[16]; ! for (int i = 0; i < 16; i++) ! channels[i] = new FluidMidiChannel(r, i); ! } ! catch (Exception e) { } } public void setDefaultSoundBank(int sfontID) { --- 103,144 ---- { super(info, false, true); ! } ! ! ! protected void openImpl() ! throws MidiUnavailableException ! { ! if (newSynth() < 0) { + throw new MidiUnavailableException("Low-level initialization of the synthesizer failed"); } + if (TDebug.TraceSynthesizer) TDebug.out("FluidSynthesizer: " + Integer.toHexString(synthPtr)); + + Receiver r = getReceiver(); + channels = new FluidMidiChannel[16]; + for (int i = 0; i < 16; i++) + channels[i] = new FluidMidiChannel(r, i); + + String sfontFile = + System.getProperty("tritonus.fluidsynth.defaultsoundbank"); + if (sfontFile != null && ! sfontFile.equals("")) + { + int sfontID = loadSoundFont(sfontFile); + setDefaultSoundBank(sfontID); + } + } + + + protected void closeImpl() + { + if (TDebug.TraceSynthesizer) TDebug.out("FluidSynthesizer.closeImpl(): " + + Integer.toHexString(synthPtr)); + deleteSynth(); + super.closeImpl(); } + + public void setDefaultSoundBank(int sfontID) { *************** *** 128,140 **** protected void finalize(){ if (TDebug.TraceSynthesizer) TDebug.out("finalize: " + Integer.toHexString(synthPtr)); ! deleteSynth(); ! } ! ! ! public void close() ! { ! if (TDebug.TraceSynthesizer) TDebug.out("close: " + Integer.toHexString(synthPtr)); ! deleteSynth(); ! super.close(); } --- 150,154 ---- protected void finalize(){ if (TDebug.TraceSynthesizer) TDebug.out("finalize: " + Integer.toHexString(synthPtr)); ! close(); } *************** *** 158,164 **** public native void setGain(float gain); ! /* $$mp: currently not functional because fluid_synth_set_reverb_preset() is not ! present in fluidsynth 1.0.6 ! */ public native void setReverbPreset(int reverbPreset); --- 172,178 ---- public native void setGain(float gain); ! /* $$mp: currently not functional because fluid_synth_set_reverb_preset() ! * is not present in fluidsynth 1.0.6. ! */ public native void setReverbPreset(int reverbPreset); Index: FluidSynthesizerProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/device/fluidsynth/FluidSynthesizerProvider.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** FluidSynthesizerProvider.java 13 Feb 2006 12:21:49 -0000 1.4 --- FluidSynthesizerProvider.java 13 Feb 2006 14:32:03 -0000 1.5 *************** *** 88,100 **** try { ! FluidSynthesizer synth = new FluidSynthesizer(sm_info); ! String sfontFile = ! System.getProperty("tritonus.fluidsynth.defaultsoundbank"); ! if (sfontFile != null && ! sfontFile.equals("")) ! { ! int sfontID = synth.loadSoundFont(sfontFile); ! synth.setDefaultSoundBank(sfontID); ! } ! device = synth; } catch (Exception e) --- 88,92 ---- try { ! device = new FluidSynthesizer(sm_info); } catch (Exception e) |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 14:29:48
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/midi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13680/src/classes/org/tritonus/share/midi Modified Files: TMidiDevice.java Log Message: synchronized open/close; made sure that device in in closed state if openImp() fails Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/midi/TMidiDevice.java Index: TMidiDevice.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/midi/TMidiDevice.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TMidiDevice.java 13 Feb 2006 11:27:16 -0000 1.2 --- TMidiDevice.java 13 Feb 2006 14:29:27 -0000 1.3 *************** *** 138,142 **** ! public void open() throws MidiUnavailableException { --- 138,142 ---- ! public synchronized void open() throws MidiUnavailableException { *************** *** 144,149 **** if (! isOpen()) { - m_bDeviceOpen = true; openImpl(); } if (TDebug.TraceMidiDevice) { TDebug.out("TMidiDevice.open(): end"); } --- 144,152 ---- if (! isOpen()) { openImpl(); + /* If openImpl() throws a MidiUnavailableException, m_bDeviceOpen + * remains false. + */ + m_bDeviceOpen = true; } if (TDebug.TraceMidiDevice) { TDebug.out("TMidiDevice.open(): end"); } *************** *** 165,169 **** ! public void close() { if (TDebug.TraceMidiDevice) { TDebug.out("TMidiDevice.close(): begin"); } --- 168,172 ---- ! public synchronized void close() { if (TDebug.TraceMidiDevice) { TDebug.out("TMidiDevice.close(): begin"); } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 13:40:54
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27865/src/classes/org/tritonus/share/sampled Modified Files: FloatSampleBuffer.java Log Message: minor fixes 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.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** FloatSampleBuffer.java 13 Feb 2006 12:21:50 -0000 1.3 --- FloatSampleBuffer.java 13 Feb 2006 13:40:43 -0000 1.4 *************** *** 231,238 **** --- 231,240 ---- } + @SuppressWarnings("hiding") protected void init(int channelCount, int sampleCount, float sampleRate) { init(channelCount, sampleCount, sampleRate, LAZY_DEFAULT); } + @SuppressWarnings("hiding") protected void init(int channelCount, int sampleCount, float sampleRate, boolean lazy) { if (channelCount<0 || sampleCount<0) { *************** *** 246,249 **** --- 248,252 ---- } + @SuppressWarnings("hiding") private void createChannels(int channelCount, int sampleCount, boolean lazy) { this.sampleCount=sampleCount; *************** *** 324,327 **** --- 327,331 ---- * It also destroys lazy removed channels and samples. */ + @SuppressWarnings("hiding") public void reset(int channels, int sampleCount, float sampleRate) { init(channels, sampleCount, sampleRate, false); *************** *** 598,601 **** --- 602,606 ---- * to integer samples. */ + @SuppressWarnings("hiding") public void mixDownChannels() { float[] firstChannel=getChannel(0); |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 13:33:49
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25193/src/classes/org/tritonus/lowlevel/gsm Modified Files: Gsm_State.java Log Message: minor fix Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Gsm_State.java Index: Gsm_State.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Gsm_State.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Gsm_State.java 13 Feb 2006 13:25:24 -0000 1.2 --- Gsm_State.java 13 Feb 2006 13:33:37 -0000 1.3 *************** *** 112,117 **** public String toString() { ! String temp = new String(""); ! return (new String("").valueOf(nrp)); } --- 112,116 ---- public String toString() { ! return String.valueOf(nrp); } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 13:26:07
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22090/src/classes/javax/sound/midi Modified Files: Sequence.java Log Message: resolved name hidings Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/midi/Sequence.java Index: Sequence.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi/Sequence.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Sequence.java 16 Jan 2005 08:25:03 -0000 1.1 --- Sequence.java 13 Feb 2006 13:25:23 -0000 1.2 *************** *** 100,103 **** --- 100,104 ---- + @SuppressWarnings("unchecked") public Track createTrack() { *************** *** 121,124 **** --- 122,126 ---- + @SuppressWarnings("unchecked") public Track[] getTracks() { |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 13:25:38
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22090/src/classes/org/tritonus/lowlevel/gsm Modified Files: Encoder.java GSMDecoder.java Gsm_State.java Log Message: resolved name hidings Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Encoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Gsm_State.java Index: Encoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Encoder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Encoder.java 13 Feb 2006 12:21:49 -0000 1.2 --- Encoder.java 13 Feb 2006 13:25:23 -0000 1.3 *************** *** 543,551 **** * Used for debugging. * ! * @param g_s The Gsm_State object to be viewed. */ ! private void dump_Gsm_State(Gsm_State g_s) { ! g_s.dump_Gsm_State(); } --- 543,551 ---- * Used for debugging. * ! * @param state The Gsm_State object to be viewed. */ ! private void dump_Gsm_State(Gsm_State state) { ! state.dump_Gsm_State(); } Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** GSMDecoder.java 16 Jan 2005 09:53:23 -0000 1.1 --- GSMDecoder.java 13 Feb 2006 13:25:23 -0000 1.2 *************** *** 46,54 **** ! private int[] dp0 = new int[280]; private int[] u = new int[8]; private int[][] LARpp = new int[2][8]; ! private int j; private int nrp; --- 46,54 ---- ! private int[] m_dp0 = new int[280]; private int[] u = new int[8]; private int[][] LARpp = new int[2][8]; ! private int m_j; private int nrp; *************** *** 291,299 **** //print("erp",erp); ! longTermSynthesisFiltering(Ncr[j], bcr[j], m_erp, dp0); for (k = 0; k < 40; k++) { ! m_wt[j * 40 + k] = dp0[120 + k]; } --- 291,299 ---- //print("erp",erp); ! longTermSynthesisFiltering(Ncr[j], bcr[j], m_erp, m_dp0); for (k = 0; k < 40; k++) { ! m_wt[j * 40 + k] = m_dp0[120 + k]; } *************** *** 526,531 **** ! int[] LARpp_j = LARpp[j]; ! int[] LARpp_j_1 = LARpp[j^=1]; decodingOfTheCodedLogAreaRatios(LARcr,LARpp_j); --- 526,531 ---- ! int[] LARpp_j = LARpp[m_j]; ! int[] LARpp_j_1 = LARpp[m_j^=1]; decodingOfTheCodedLogAreaRatios(LARcr,LARpp_j); Index: Gsm_State.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Gsm_State.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Gsm_State.java 16 Jan 2005 09:53:23 -0000 1.1 --- Gsm_State.java 13 Feb 2006 13:25:24 -0000 1.2 *************** *** 25,29 **** public class Gsm_State { ! private short[] dp0; private short z1; /* preprocessing, Offset_com. */ private int L_z2; /* Offset_com. */ --- 25,29 ---- public class Gsm_State { ! private short[] m_dp0; private short z1; /* preprocessing, Offset_com. */ private int L_z2; /* Offset_com. */ *************** *** 31,36 **** private short[] u; /* short_term.java */ ! private short[][] LARpp; /* */ ! private short j; /* */ private short nrp; /* long_term.java, synthesis */ --- 31,36 ---- private short[] u; /* short_term.java */ ! private short[][] m_LARpp; /* */ ! private short m_j; /* */ private short nrp; /* long_term.java, synthesis */ *************** *** 87,91 **** for(col = 0; col < 8; ++col) { ! System.out.print("["+i+"]["+col+"] " +LARpp[i][col]); System.out.print(", "); } --- 87,91 ---- for(col = 0; col < 8; ++col) { ! System.out.print("["+i+"]["+col+"] " +m_LARpp[i][col]); System.out.print(", "); } *************** *** 93,97 **** } System.out.print("\n"); ! System.out.println("\nj: " + j); System.out.println("\nnrp: " + nrp); System.out.println("\nv[]: "); --- 93,97 ---- } System.out.print("\n"); ! System.out.println("\nj: " + m_j); System.out.println("\nnrp: " + nrp); System.out.println("\nv[]: "); *************** *** 118,122 **** public void setDp0(short[] lcl_arg0) { ! dp0 = lcl_arg0; } --- 118,122 ---- public void setDp0(short[] lcl_arg0) { ! m_dp0 = lcl_arg0; } *************** *** 125,129 **** public void setDp0Indexed(int ix,short lcl_arg0) { ! dp0[ix] = lcl_arg0; } --- 125,129 ---- public void setDp0Indexed(int ix,short lcl_arg0) { ! m_dp0[ix] = lcl_arg0; } *************** *** 132,136 **** public short[] getDp0() { ! return dp0; } --- 132,136 ---- public short[] getDp0() { ! return m_dp0; } *************** *** 139,143 **** public short getDp0Indexed(int ix) { ! return dp0[ix]; } --- 139,143 ---- public short getDp0Indexed(int ix) { ! return m_dp0[ix]; } *************** *** 211,215 **** public void setLARpp(short[][] lcl_arg0) { ! LARpp = lcl_arg0; } --- 211,215 ---- public void setLARpp(short[][] lcl_arg0) { ! m_LARpp = lcl_arg0; } *************** *** 217,221 **** public void setLARppIndexed(int ix,short[] lcl_arg0) { ! LARpp[ix] = lcl_arg0; } --- 217,221 ---- public void setLARppIndexed(int ix,short[] lcl_arg0) { ! m_LARpp[ix] = lcl_arg0; } *************** *** 223,227 **** public short[][] getLARpp() { ! return LARpp; } --- 223,227 ---- public short[][] getLARpp() { ! return m_LARpp; } *************** *** 229,233 **** public short[] getLARppIndexed(int ix) { ! return LARpp[ix]; } --- 229,233 ---- public short[] getLARppIndexed(int ix) { ! return m_LARpp[ix]; } *************** *** 235,239 **** public void setJ(short lcl_arg0) { ! j = lcl_arg0; } --- 235,239 ---- public void setJ(short lcl_arg0) { ! m_j = lcl_arg0; } *************** *** 241,245 **** public short getJ() { ! return j; } --- 241,245 ---- public short getJ() { ! return m_j; } |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 13:25:38
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22090/src/classes/org/tritonus/share/sampled/file Modified Files: TAudioFileWriter.java Log Message: resolved name hidings Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file/TAudioFileWriter.java Index: TAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file/TAudioFileWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TAudioFileWriter.java 13 Feb 2006 12:21:50 -0000 1.2 --- TAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 *************** *** 66,71 **** protected static final int ALL = AudioSystem.NOT_SPECIFIED; ! public static AudioFormat.Encoding PCM_SIGNED=new AudioFormat.Encoding("PCM_SIGNED"); ! public static AudioFormat.Encoding PCM_UNSIGNED=new AudioFormat.Encoding("PCM_UNSIGNED"); /** Buffer length for the loop in the write() method. --- 66,71 ---- protected static final int ALL = AudioSystem.NOT_SPECIFIED; ! protected static final AudioFormat.Encoding PCM_SIGNED = AudioFormat.Encoding.PCM_SIGNED; ! protected static final AudioFormat.Encoding PCM_UNSIGNED = AudioFormat.Encoding.PCM_UNSIGNED; /** Buffer length for the loop in the write() method. |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 13:25:38
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22090/src/classes/org/tritonus/sampled/file Modified Files: AiffAudioFileWriter.java AuAudioFileWriter.java WaveAudioFileWriter.java Log Message: resolved name hidings Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioFileWriter.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileWriter.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileWriter.java Index: AiffAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioFileWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AiffAudioFileWriter.java 13 Feb 2006 12:21:50 -0000 1.2 --- AiffAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 *************** *** 36,40 **** import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFormat; - import javax.sound.sampled.AudioSystem; import org.tritonus.share.sampled.file.AudioOutputStream; --- 36,39 ---- *************** *** 57,62 **** }; - private static final int ALL=AudioSystem.NOT_SPECIFIED; - private static final AudioFormat.Encoding PCM_SIGNED = AudioFormat.Encoding.PCM_SIGNED; private static final AudioFormat.Encoding ULAW = AudioFormat.Encoding.ULAW; private static final AudioFormat.Encoding IMA_ADPCM = new AudioFormat.Encoding("IMA_ADPCM"); --- 56,59 ---- Index: AuAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AuAudioFileWriter.java 13 Feb 2006 12:21:50 -0000 1.2 --- AuAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 *************** *** 37,41 **** import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFormat; - import javax.sound.sampled.AudioSystem; import org.tritonus.share.sampled.file.AudioOutputStream; --- 37,40 ---- *************** *** 57,61 **** }; - private static final int ALL=AudioSystem.NOT_SPECIFIED; // IMPORTANT: this array depends on the AudioFormat.match() algorithm which takes --- 56,59 ---- Index: WaveAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** WaveAudioFileWriter.java 13 Feb 2006 12:21:50 -0000 1.2 --- WaveAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 *************** *** 36,40 **** import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFormat; - import javax.sound.sampled.AudioSystem; import org.tritonus.share.sampled.file.AudioOutputStream; --- 36,39 ---- *************** *** 56,60 **** }; - private static final int ALL=AudioSystem.NOT_SPECIFIED; // IMPORTANT: this array depends on the AudioFormat.match() algorithm which takes --- 55,58 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 13:25:38
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/convert In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22090/src/classes/org/tritonus/share/sampled/convert Modified Files: TSynchronousFilteredAudioInputStream.java Log Message: resolved name hidings Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/convert/TSynchronousFilteredAudioInputStream.java Index: TSynchronousFilteredAudioInputStream.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/convert/TSynchronousFilteredAudioInputStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TSynchronousFilteredAudioInputStream.java 13 Feb 2006 12:21:50 -0000 1.2 --- TSynchronousFilteredAudioInputStream.java 13 Feb 2006 13:25:24 -0000 1.3 *************** *** 65,69 **** * largest intermediate buffer ever needed. */ ! protected byte[] buffer=null; /** --- 65,69 ---- * largest intermediate buffer ever needed. */ ! protected byte[] m_buffer=null; /** *************** *** 148,152 **** private void clearBuffer() { ! buffer = null; } --- 148,152 ---- private void clearBuffer() { ! m_buffer = null; } *************** *** 187,194 **** } else { // assert that the buffer fits ! if (buffer == null || buffer.length < originalBytes) { ! buffer = new byte[originalBytes]; } ! readBuffer=buffer; readOffset=0; } --- 187,194 ---- } else { // assert that the buffer fits ! if (m_buffer == null || m_buffer.length < originalBytes) { ! m_buffer = new byte[originalBytes]; } ! readBuffer=m_buffer; readOffset=0; } *************** *** 208,212 **** nFramesConverted=nFramesRead; } else { ! nFramesConverted = convert(buffer, abData, nOffset, nFramesRead); } if (TDebug.TraceAudioConverter) { --- 208,212 ---- nFramesConverted=nFramesRead; } else { ! nFramesConverted = convert(m_buffer, abData, nOffset, nFramesRead); } if (TDebug.TraceAudioConverter) { |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:29
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/javax/sound/midi Modified Files: MetaMessage.java MidiSystem.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/midi/MetaMessage.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/midi/MidiSystem.java Index: MetaMessage.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi/MetaMessage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** MetaMessage.java 16 Jan 2005 08:25:03 -0000 1.1 --- MetaMessage.java 13 Feb 2006 12:21:48 -0000 1.2 *************** *** 29,33 **** package javax.sound.midi; - import org.tritonus.share.TDebug; import org.tritonus.share.midi.MidiUtils; --- 29,32 ---- Index: MidiSystem.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi/MidiSystem.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** MidiSystem.java 16 Jan 2005 08:25:03 -0000 1.1 --- MidiSystem.java 13 Feb 2006 12:21:48 -0000 1.2 *************** *** 47,51 **** import javax.sound.midi.spi.MidiFileReader; import javax.sound.midi.spi.MidiFileWriter; - import javax.sound.midi.spi.SoundbankReader; import org.tritonus.core.TMidiConfig; --- 47,50 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:29
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi/spi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/javax/sound/midi/spi Modified Files: MidiFileWriter.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/midi/spi/MidiFileWriter.java Index: MidiFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/midi/spi/MidiFileWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** MidiFileWriter.java 16 Jan 2005 08:25:03 -0000 1.1 --- MidiFileWriter.java 13 Feb 2006 12:21:48 -0000 1.2 *************** *** 36,40 **** import javax.sound.midi.Sequence; - import javax.sound.midi.MidiFileFormat; --- 36,39 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:20
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/spi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/javax/sound/sampled/spi Modified Files: AudioFileWriter.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/spi/AudioFileWriter.java Index: AudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/spi/AudioFileWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AudioFileWriter.java 16 Jan 2005 08:25:04 -0000 1.1 --- AudioFileWriter.java 13 Feb 2006 12:21:48 -0000 1.2 *************** *** 32,36 **** import java.io.File; - import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; --- 32,35 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:19
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/convert In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/org/tritonus/sampled/convert Modified Files: AlawFormatConversionProvider.java SampleRateConversionProvider.java SmartFormatConversionProvider.java UlawFormatConversionProvider.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/AlawFormatConversionProvider.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/SampleRateConversionProvider.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/SmartFormatConversionProvider.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/UlawFormatConversionProvider.java Index: AlawFormatConversionProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/AlawFormatConversionProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlawFormatConversionProvider.java 16 Jan 2005 12:45:49 -0000 1.1 --- AlawFormatConversionProvider.java 13 Feb 2006 12:21:49 -0000 1.2 *************** *** 37,41 **** import javax.sound.sampled.AudioInputStream; - import org.tritonus.share.TDebug; import org.tritonus.share.sampled.AudioFormats; import org.tritonus.share.sampled.TConversionTool; --- 37,40 ---- Index: SampleRateConversionProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/SampleRateConversionProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** SampleRateConversionProvider.java 16 Jan 2005 12:45:49 -0000 1.1 --- SampleRateConversionProvider.java 13 Feb 2006 12:21:49 -0000 1.2 *************** *** 41,49 **** import org.tritonus.share.TDebug; import org.tritonus.share.sampled.AudioFormats; - import org.tritonus.share.sampled.TConversionTool; import org.tritonus.share.sampled.FloatSampleBuffer; import org.tritonus.share.sampled.AudioUtils; import org.tritonus.share.sampled.convert.TSimpleFormatConversionProvider; - import org.tritonus.share.sampled.convert.TAsynchronousFilteredAudioInputStream; import org.tritonus.share.ArraySet; --- 41,47 ---- Index: SmartFormatConversionProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/SmartFormatConversionProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** SmartFormatConversionProvider.java 16 Jan 2005 12:45:49 -0000 1.1 --- SmartFormatConversionProvider.java 13 Feb 2006 12:21:49 -0000 1.2 *************** *** 36,40 **** import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; - import javax.sound.sampled.spi.FormatConversionProvider; import org.tritonus.share.sampled.convert.TFormatConversionProvider; --- 36,39 ---- Index: UlawFormatConversionProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/convert/UlawFormatConversionProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** UlawFormatConversionProvider.java 16 Jan 2005 12:45:49 -0000 1.1 --- UlawFormatConversionProvider.java 13 Feb 2006 12:21:49 -0000 1.2 *************** *** 37,41 **** import javax.sound.sampled.AudioInputStream; - import org.tritonus.share.TDebug; import org.tritonus.share.sampled.AudioFormats; import org.tritonus.share.sampled.TConversionTool; --- 37,40 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:19
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/org/tritonus/share Modified Files: GlobalInfo.java StringHashedSet.java TSettings.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/GlobalInfo.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/StringHashedSet.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/TSettings.java Index: GlobalInfo.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/GlobalInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** GlobalInfo.java 20 Jan 2005 07:47:16 -0000 1.1 --- GlobalInfo.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,36 **** package org.tritonus.share; - import org.tritonus.share.TDebug; - --- 31,34 ---- Index: StringHashedSet.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/StringHashedSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** StringHashedSet.java 20 Jan 2005 07:47:16 -0000 1.1 --- StringHashedSet.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,35 **** package org.tritonus.share; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; --- 31,34 ---- Index: TSettings.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/TSettings.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TSettings.java 20 Jan 2005 07:47:16 -0000 1.1 --- TSettings.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,36 **** package org.tritonus.share; - import java.io.PrintStream; - import java.util.StringTokenizer; import java.security.AccessControlException; --- 31,34 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:19
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/org/tritonus/sampled/mixer/alsa Modified Files: AlsaBaseDataLine.java AlsaDataLineMixer.java AlsaDataLineMixerProvider.java AlsaPortMixer.java AlsaSourceDataLine.java AlsaTargetDataLine.java AlsaUtils.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixerProvider.java 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/AlsaSourceDataLine.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: AlsaBaseDataLine.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaBaseDataLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaBaseDataLine.java 16 Jan 2005 12:49:53 -0000 1.1 --- AlsaBaseDataLine.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,35 **** package org.tritonus.sampled.mixer.alsa; - import java.io.IOException; import java.util.Collection; --- 31,34 ---- *************** *** 38,43 **** import javax.sound.sampled.FloatControl; import javax.sound.sampled.LineUnavailableException; - import javax.sound.sampled.SourceDataLine; - import javax.sound.sampled.Mixer; import org.tritonus.share.TDebug; --- 37,40 ---- *************** *** 46,51 **** import org.tritonus.lowlevel.alsa.AlsaPcmHWParams; import org.tritonus.lowlevel.alsa.AlsaPcmSWParams; - import org.tritonus.share.sampled.TConversionTool; - import org.tritonus.share.sampled.mixer.TMixer; import org.tritonus.share.sampled.mixer.TBaseDataLine; --- 43,46 ---- Index: AlsaDataLineMixer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaDataLineMixer.java 16 Jan 2005 12:49:53 -0000 1.1 --- AlsaDataLineMixer.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 30,42 **** package org.tritonus.sampled.mixer.alsa; - import java.util.Arrays; import java.util.ArrayList; import java.util.Collection; - import java.util.HashMap; - import java.util.Map; - import java.util.HashSet; import java.util.List; - import java.util.Set; - import java.util.Iterator; import javax.sound.sampled.AudioFormat; --- 30,36 ---- Index: AlsaDataLineMixerProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaDataLineMixerProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaDataLineMixerProvider.java 16 Jan 2005 12:49:53 -0000 1.1 --- AlsaDataLineMixerProvider.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 29,35 **** package org.tritonus.sampled.mixer.alsa; - import javax.sound.sampled.Mixer; - import javax.sound.sampled.spi.MixerProvider; - import org.tritonus.lowlevel.alsa.Alsa; import org.tritonus.lowlevel.alsa.AlsaCtl; --- 29,32 ---- Index: AlsaPortMixer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaPortMixer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaPortMixer.java 16 Jan 2005 12:49:53 -0000 1.1 --- AlsaPortMixer.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 29,51 **** package org.tritonus.sampled.mixer.alsa; - import java.util.Arrays; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; - import java.util.HashSet; - import java.util.Set; - import java.util.Iterator; import java.util.List; import javax.sound.sampled.AudioFormat; - import javax.sound.sampled.AudioSystem; import javax.sound.sampled.BooleanControl; - import javax.sound.sampled.Clip; import javax.sound.sampled.CompoundControl; import javax.sound.sampled.Control; - import javax.sound.sampled.DataLine; import javax.sound.sampled.FloatControl; - import javax.sound.sampled.SourceDataLine; - import javax.sound.sampled.TargetDataLine; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.Line; --- 29,42 ---- *************** *** 55,60 **** import org.tritonus.share.GlobalInfo; import org.tritonus.share.TDebug; - import org.tritonus.share.sampled.mixer.TBooleanControl; - import org.tritonus.share.sampled.mixer.TFloatControl; import org.tritonus.share.sampled.mixer.TMixer; import org.tritonus.share.sampled.mixer.TMixerInfo; --- 46,49 ---- Index: AlsaSourceDataLine.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaSourceDataLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaSourceDataLine.java 16 Jan 2005 12:49:53 -0000 1.1 --- AlsaSourceDataLine.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 29,34 **** package org.tritonus.sampled.mixer.alsa; - import java.io.IOException; - import javax.sound.sampled.AudioFormat; import javax.sound.sampled.DataLine; --- 29,32 ---- *************** *** 36,49 **** import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; - import javax.sound.sampled.Mixer; import org.tritonus.share.TDebug; import org.tritonus.lowlevel.alsa.Alsa; import org.tritonus.lowlevel.alsa.AlsaPcm; - import org.tritonus.lowlevel.alsa.AlsaPcmHWParams; - import org.tritonus.lowlevel.alsa.AlsaPcmSWParams; import org.tritonus.share.sampled.TConversionTool; - import org.tritonus.share.sampled.mixer.TMixer; - import org.tritonus.share.sampled.mixer.TBaseDataLine; --- 34,42 ---- Index: AlsaTargetDataLine.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaTargetDataLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaTargetDataLine.java 16 Jan 2005 12:49:53 -0000 1.1 --- AlsaTargetDataLine.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 29,35 **** package org.tritonus.sampled.mixer.alsa; - import java.io.IOException; - - import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.DataLine; --- 29,32 ---- *************** *** 37,41 **** import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.TargetDataLine; - import javax.sound.sampled.Mixer; import org.tritonus.share.TDebug; --- 34,37 ---- *************** *** 43,48 **** import org.tritonus.lowlevel.alsa.AlsaPcm; import org.tritonus.share.sampled.TConversionTool; - import org.tritonus.share.sampled.mixer.TMixer; - import org.tritonus.share.sampled.mixer.TBaseDataLine; --- 39,42 ---- Index: AlsaUtils.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/alsa/AlsaUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AlsaUtils.java 16 Jan 2005 12:49:53 -0000 1.1 --- AlsaUtils.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,40 **** package org.tritonus.sampled.mixer.alsa; - import java.io.IOException; - import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioSystem; - import org.tritonus.share.TDebug; import org.tritonus.share.sampled.AudioFormats; import org.tritonus.lowlevel.alsa.AlsaPcm; --- 31,37 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:18
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/org/tritonus/share/sampled Modified Files: AudioFileTypes.java AudioFormatSet.java AudioUtils.java Encodings.java FloatSampleBuffer.java FloatSampleTools.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFileTypes.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormatSet.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioUtils.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/Encodings.java 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: AudioFileTypes.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFileTypes.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AudioFileTypes.java 20 Jan 2005 07:47:16 -0000 1.1 --- AudioFileTypes.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 30,34 **** import javax.sound.sampled.AudioFileFormat; import org.tritonus.share.StringHashedSet; - import org.tritonus.share.TDebug; /** --- 30,33 ---- Index: AudioFormatSet.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormatSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AudioFormatSet.java 20 Jan 2005 07:47:16 -0000 1.1 --- AudioFormatSet.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,35 **** package org.tritonus.share.sampled; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; --- 31,34 ---- Index: AudioUtils.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AudioUtils.java 20 Jan 2005 07:47:16 -0000 1.1 --- AudioUtils.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 30,49 **** package org.tritonus.share.sampled; - import java.io.File; - import java.io.FileOutputStream; - import java.io.InputStream; - import java.io.IOException; - import java.io.OutputStream; - import java.util.Collection; import java.util.Iterator; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioFormat; - import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioInputStream; - import javax.sound.sampled.spi.AudioFileWriter; - - import org.tritonus.share.TDebug; - import org.tritonus.share.sampled.TConversionTool; --- 30,38 ---- Index: Encodings.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/Encodings.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Encodings.java 20 Jan 2005 07:47:16 -0000 1.1 --- Encodings.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 32,36 **** import javax.sound.sampled.AudioFormat; import org.tritonus.share.StringHashedSet; - import org.tritonus.share.TDebug; /** --- 32,35 ---- Index: FloatSampleBuffer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** FloatSampleBuffer.java 27 Jan 2006 09:06:35 -0000 1.2 --- FloatSampleBuffer.java 13 Feb 2006 12:21:50 -0000 1.3 *************** *** 30,43 **** import java.util.ArrayList; - import java.util.Iterator; - import java.util.Random; - import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioFormat; - import javax.sound.sampled.AudioFileFormat; - import javax.sound.sampled.AudioInputStream; - import javax.sound.sampled.spi.AudioFileWriter; - - import org.tritonus.share.TDebug; /** --- 30,35 ---- Index: FloatSampleTools.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleTools.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** FloatSampleTools.java 27 Jan 2006 09:06:35 -0000 1.2 --- FloatSampleTools.java 13 Feb 2006 12:21:50 -0000 1.3 *************** *** 31,35 **** import java.util.*; import javax.sound.sampled.*; ! import org.tritonus.share.TDebug; /** --- 31,35 ---- import java.util.*; import javax.sound.sampled.*; ! /** |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:18
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/org/tritonus/sampled/mixer/esd Modified Files: EsdMixer.java EsdMixerProvider.java EsdSourceDataLine.java EsdTargetDataLine.java EsdUtils.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdMixer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdMixerProvider.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdUtils.java Index: EsdMixer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdMixer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** EsdMixer.java 16 Jan 2005 12:49:53 -0000 1.1 --- EsdMixer.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 32,40 **** import java.util.Arrays; - import java.util.HashMap; - import java.util.Map; - import java.util.HashSet; - import java.util.Set; - import java.util.Iterator; import javax.sound.sampled.AudioFormat; --- 32,35 ---- Index: EsdMixerProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdMixerProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** EsdMixerProvider.java 16 Jan 2005 12:49:53 -0000 1.1 --- EsdMixerProvider.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,37 **** package org.tritonus.sampled.mixer.esd; - import javax.sound.sampled.Mixer; - import javax.sound.sampled.spi.MixerProvider; - import org.tritonus.lowlevel.esd.Esd; import org.tritonus.share.TDebug; --- 31,34 ---- Index: EsdSourceDataLine.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdSourceDataLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** EsdSourceDataLine.java 16 Jan 2005 12:49:53 -0000 1.1 --- EsdSourceDataLine.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,44 **** package org.tritonus.sampled.mixer.esd; - import java.io.IOException; - import javax.sound.sampled.AudioFormat; import javax.sound.sampled.BooleanControl; - import javax.sound.sampled.Control; import javax.sound.sampled.DataLine; import javax.sound.sampled.FloatControl; import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.SourceDataLine; - import javax.sound.sampled.Mixer; import org.tritonus.share.TDebug; --- 31,40 ---- Index: EsdTargetDataLine.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdTargetDataLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** EsdTargetDataLine.java 16 Jan 2005 12:49:53 -0000 1.1 --- EsdTargetDataLine.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,37 **** package org.tritonus.sampled.mixer.esd; - import java.io.IOException; - - import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.DataLine; --- 31,34 ---- *************** *** 39,43 **** import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.TargetDataLine; - import javax.sound.sampled.Mixer; import org.tritonus.share.TDebug; --- 36,39 ---- Index: EsdUtils.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/mixer/esd/EsdUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** EsdUtils.java 16 Jan 2005 12:49:53 -0000 1.1 --- EsdUtils.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 31,39 **** package org.tritonus.sampled.mixer.esd; - import java.io.IOException; - import javax.sound.sampled.AudioFormat; - import org.tritonus.share.TDebug; import org.tritonus.lowlevel.esd.Esd; --- 31,36 ---- |
|
From: Matthias P. <pfi...@us...> - 2006-02-13 12:22:18
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/midi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29879/src/classes/org/tritonus/share/midi Modified Files: TDirectSynthesizer.java TPreloadingSequencer.java Log Message: removed unnecessary imports Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/midi/TDirectSynthesizer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/midi/TPreloadingSequencer.java Index: TDirectSynthesizer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/midi/TDirectSynthesizer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TDirectSynthesizer.java 20 Jan 2005 07:47:16 -0000 1.1 --- TDirectSynthesizer.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 38,43 **** import javax.sound.midi.Synthesizer; - import org.tritonus.share.TDebug; - /* TODO: implement aquiring of a SourceDataLine, perhaps in a separate --- 38,41 ---- Index: TPreloadingSequencer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/midi/TPreloadingSequencer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TPreloadingSequencer.java 20 Jan 2005 07:47:16 -0000 1.1 --- TPreloadingSequencer.java 13 Feb 2006 12:21:50 -0000 1.2 *************** *** 29,53 **** package org.tritonus.share.midi; - import java.io.InputStream; - import java.io.IOException; - - import java.util.BitSet; import java.util.Collection; - import java.util.Iterator; - import java.util.Set; - import javax.sound.midi.MidiSystem; - import javax.sound.midi.Sequencer; - import javax.sound.midi.Sequence; - import javax.sound.midi.InvalidMidiDataException; - import javax.sound.midi.MetaMessage; - import javax.sound.midi.MetaEventListener; import javax.sound.midi.MidiMessage; - import javax.sound.midi.ShortMessage; - import javax.sound.midi.ControllerEventListener; import javax.sound.midi.MidiDevice; import org.tritonus.share.TDebug; - import org.tritonus.share.ArraySet; --- 29,38 ---- |