We need to do the property file inheritance processing when loading the
sounds.properties lest we lose the needed info specified in the parent properties files. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3384 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -47,6 +47,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
|
||||
import com.samskivert.util.Config;
|
||||
import com.samskivert.util.ConfigUtil;
|
||||
import com.samskivert.util.Interval;
|
||||
import com.samskivert.util.LRUHashMap;
|
||||
import com.samskivert.util.Queue;
|
||||
@@ -708,8 +709,8 @@ public class SoundManager
|
||||
String propPath = key.pkgPath + Sounds.PROP_NAME;
|
||||
Properties props = new Properties();
|
||||
try {
|
||||
props.load(_rmgr.getClassLoader().getResourceAsStream(
|
||||
propPath + ".properties"));
|
||||
props = ConfigUtil.loadInheritedProperties(
|
||||
propPath + ".properties", _rmgr.getClassLoader());
|
||||
} catch (IOException ioe) {
|
||||
Log.warning("Failed to load sound properties " +
|
||||
"[path=" + propPath + ", error=" + ioe + "].");
|
||||
|
||||
Reference in New Issue
Block a user