AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eclipse suggested cleanup.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2971 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:50:28 +00:00
parent 6cd4e73720
commit d618d3c771
169 changed files with 208 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/sound/MidiPlayer.java
+1 -5
View File
@@ -1,19 +1,15 @@
//
// $Id: MidiPlayer.java,v 1.4 2003/01/08 04:09:02 mdb Exp $
// $Id: MidiPlayer.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.BufferedInputStream;
import java.io.InputStream;
import javax.sound.midi.InvalidMidiDataException;
import javax.sound.midi.MetaEventListener;
import javax.sound.midi.MetaMessage;
import javax.sound.midi.MidiChannel;
import javax.sound.midi.MidiDevice;
import javax.sound.midi.MidiSystem;
import javax.sound.midi.MidiUnavailableException;
import javax.sound.midi.Receiver;
import javax.sound.midi.Sequencer;
import javax.sound.midi.Synthesizer;
src/java/com/threerings/media/sound/ModPlayer.java
+1 -5
View File
@@ -1,23 +1,19 @@
//
// $Id: ModPlayer.java,v 1.6 2003/01/08 04:09:02 mdb Exp $
// $Id: ModPlayer.java,v 1.7 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.DataInputStream;
import java.io.InputStream;
import java.io.IOException;
import micromod.MicroMod;
import micromod.Module;
import micromod.ModuleLoader;
import micromod.output.JavaSoundOutputDevice;
import micromod.output.OutputDeviceException;
import micromod.output.PCM16StreamOutputDevice;
import micromod.output.converters.SS16LEAudioFormatConverter;
import micromod.resamplers.LinearResampler;
import com.threerings.resource.ResourceManager;
/**
* A player that plays .mod format music.
*/
src/java/com/threerings/media/sound/Mp3Player.java
+1 -7
View File
@@ -1,26 +1,20 @@
//
// $Id: Mp3Player.java,v 1.4 2003/01/08 04:09:02 mdb Exp $
// $Id: Mp3Player.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.DataLine.Info;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.Line;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
import org.apache.commons.io.StreamUtils;
import com.threerings.media.Log;
import com.threerings.resource.ResourceManager;
/**
* Plays mp3 files. Depends on three external jar files that aren't even
src/java/com/threerings/media/sound/SoundManager.java
+1 -8
View File
@@ -1,5 +1,5 @@
//
// $Id: SoundManager.java,v 1.70 2004/02/24 08:08:25 ray Exp $
// $Id: SoundManager.java,v 1.71 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
@@ -20,16 +20,10 @@ import java.util.LinkedList;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Clip;
import javax.sound.sampled.DataLine.Info;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.FloatControl;
import javax.sound.sampled.FloatControl.Type;
import javax.sound.sampled.Line;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.Mixer;
import javax.sound.sampled.SourceDataLine;
import javax.sound.sampled.UnsupportedAudioFileException;
@@ -42,7 +36,6 @@ import com.samskivert.util.IntervalManager;
import com.samskivert.util.LRUHashMap;
import com.samskivert.util.Queue;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.RunAnywhere;
import com.samskivert.util.StringUtil;
import com.threerings.resource.ResourceManager;
src/java/com/threerings/media/sound/Sounds.java
+1 -3
View File
@@ -1,10 +1,8 @@
//
// $Id: Sounds.java,v 1.4 2003/01/08 04:09:02 mdb Exp $
// $Id: Sounds.java,v 1.5 2004/02/25 14:43:17 mdb Exp $
package com.threerings.media.sound;
import java.io.File;
/**
* A base class for sound repository classes. These would extend this
* class and define keys for the various sounds that are mapped in the