Load the sound properties via the ResourceManager which will do the right
classpath magic to work with Game Gardens. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3377 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -32,6 +32,7 @@ import java.io.InputStream;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
import javax.sound.sampled.AudioFormat;
|
import javax.sound.sampled.AudioFormat;
|
||||||
import javax.sound.sampled.AudioInputStream;
|
import javax.sound.sampled.AudioInputStream;
|
||||||
@@ -705,7 +706,14 @@ public class SoundManager
|
|||||||
Config c = (Config) _configs.get(key.pkgPath);
|
Config c = (Config) _configs.get(key.pkgPath);
|
||||||
if (c == null) {
|
if (c == null) {
|
||||||
String propPath = key.pkgPath + Sounds.PROP_NAME;
|
String propPath = key.pkgPath + Sounds.PROP_NAME;
|
||||||
c = new Config(propPath);
|
Properties props = new Properties();
|
||||||
|
try {
|
||||||
|
props.load(_rmgr.getResource(propPath));
|
||||||
|
} catch (IOException ioe) {
|
||||||
|
Log.warning("Failed to load sound properties " +
|
||||||
|
"[path=" + propPath + ", error=" + ioe + "].");
|
||||||
|
}
|
||||||
|
c = new Config(propPath, props);
|
||||||
_configs.put(key.pkgPath, c);
|
_configs.put(key.pkgPath, c);
|
||||||
}
|
}
|
||||||
return c;
|
return c;
|
||||||
|
|||||||
Reference in New Issue
Block a user