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

- fixed grievous bug that NPE'd when a sound was in a bundle rather than

Browse Source 
being loaded out of the classpath.
- enabled sound. I want to test at home with my old linux machine and see
  how things are.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2249 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2003-02-07 02:53:49 +00:00
parent a28d13419d
commit ffa840c5ac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/sound/SoundManager.java
+3 -3
View File
@@ -1,5 +1,5 @@
// //
// $Id: SoundManager.java,v 1.44 2003/01/20 20:07:05 ray Exp $ // $Id: SoundManager.java,v 1.45 2003/02/07 02:53:49 ray Exp $
package com.threerings.media.sound; package com.threerings.media.sound;
@@ -661,7 +661,7 @@ public class SoundManager
for (int ii=0; ii < names.length; ii++) { for (int ii=0; ii < names.length; ii++) {
InputStream clipin = null; InputStream clipin = null;
try { try {
_rmgr.getResource(bundle, names[ii]); clipin = _rmgr.getResource(bundle, names[ii]);
} catch (FileNotFoundException fnfe) { } catch (FileNotFoundException fnfe) {
// try from the classpath // try from the classpath
clipin = _rmgr.getResource(names[ii]); clipin = _rmgr.getResource(names[ii]);
@@ -1103,5 +1103,5 @@ public class SoundManager
protected static final int BUFFER_SIZE = 1024 * 24; protected static final int BUFFER_SIZE = 1024 * 24;
/** Used to disable sound entirely. */ /** Used to disable sound entirely. */
protected static final boolean SOUND_ENABLED = false; protected static final boolean SOUND_ENABLED = true;
} }