From 44502d01e81c712064315667dd34d6df15a4e486 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 7 Mar 2005 20:06:55 +0000
Subject: [PATCH] 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
---
 src/java/com/threerings/media/sound/SoundManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java
index 521d7c6cd..b4aca2512 100644
--- a/src/java/com/threerings/media/sound/SoundManager.java
+++ b/src/java/com/threerings/media/sound/SoundManager.java
@@ -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 + "].");