From: Hendrik B. <nh...@us...> - 2009-12-31 16:31:13
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/sound/manager In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23889/src/games/stendhal/client/sound/manager Modified Files: SoundFile.java Log Message: read .wave-files from jar Index: SoundFile.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/sound/manager/SoundFile.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SoundFile.java 31 Dec 2009 16:25:25 -0000 1.3 --- SoundFile.java 31 Dec 2009 16:31:00 -0000 1.4 *************** *** 143,146 **** --- 143,147 ---- { SignalProcessor decoder = null; + InputStream stream = this.getClass().getResourceAsStream("/" + filePath); switch(fileType) *************** *** 149,153 **** try { - InputStream stream = this.getClass().getResourceAsStream("/" + filePath); OggVorbisDecoder oggdec = new OggVorbisDecoder(stream, 256, outputNumSamplesPerChannel); --- 150,153 ---- *************** *** 162,170 **** try { ! AudioInputStream stream = AudioSystem.getAudioInputStream(new File(filePath)); ! decoder = new PCMStreamConverter(stream, stream.getFormat(), outputNumSamplesPerChannel); ! mNumChannels = stream.getFormat().getChannels(); ! mSampleRate = (int)stream.getFormat().getSampleRate(); } catch(Exception exception) { decoder = null; } --- 162,170 ---- try { ! AudioInputStream auidoStream = AudioSystem.getAudioInputStream(stream); ! decoder = new PCMStreamConverter(auidoStream, auidoStream.getFormat(), outputNumSamplesPerChannel); ! mNumChannels = auidoStream.getFormat().getChannels(); ! mSampleRate = (int)auidoStream.getFormat().getSampleRate(); } catch(Exception exception) { decoder = null; } |