From f4343be20dfe2467029fbc0f8ace4a1763c96810 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 2 Mar 2005 04:11:51 +0000
Subject: [PATCH] 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
---
 src/java/com/threerings/media/sound/SoundManager.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java
index b0390c5c5..652618b52 100644
--- a/src/java/com/threerings/media/sound/SoundManager.java
+++ b/src/java/com/threerings/media/sound/SoundManager.java
@@ -32,6 +32,7 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Properties;
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
@@ -705,7 +706,14 @@ public class SoundManager
         Config c = (Config) _configs.get(key.pkgPath);
         if (c == null) {
             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);
         }
         return c;