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

We need to do the property file inheritance processing when loading the

Browse Source 
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:
Michael Bayne
2005-03-07 20:06:55 +00:00
parent e75e1918b1
commit 44502d01e8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/sound/SoundManager.java
+3 -2
View File
@@ -47,6 +47,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import com.samskivert.util.Config; import com.samskivert.util.Config;
import com.samskivert.util.ConfigUtil;
import com.samskivert.util.Interval; import com.samskivert.util.Interval;
import com.samskivert.util.LRUHashMap; import com.samskivert.util.LRUHashMap;
import com.samskivert.util.Queue; import com.samskivert.util.Queue;
@@ -708,8 +709,8 @@ public class SoundManager
String propPath = key.pkgPath + Sounds.PROP_NAME; String propPath = key.pkgPath + Sounds.PROP_NAME;
Properties props = new Properties(); Properties props = new Properties();
try { try {
props.load(_rmgr.getClassLoader().getResourceAsStream( props = ConfigUtil.loadInheritedProperties(
propPath + ".properties")); propPath + ".properties", _rmgr.getClassLoader());
} catch (IOException ioe) { } catch (IOException ioe) {
Log.warning("Failed to load sound properties " + Log.warning("Failed to load sound properties " +
"[path=" + propPath + ", error=" + ioe + "]."); "[path=" + propPath + ", error=" + ioe + "].");