WIP #6: recursively load SFX (easier to organize)

abrindam · Feb 16, 2016 · 52e0830 · 52e0830
1 parent ce3c0fe
commit 52e0830
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/assets/sfx/test_2amr4.75k_16b.wav → assets/sfx/voice/test_2amr4.75k_16b.wav b/assets/sfx/test_2amr4.75k_16b.wav → assets/sfx/voice/test_2amr4.75k_16b.wav
diff --git a/src/com/brindyblitz/artemis/engconsole/ui/damcon/InternalTeam.java b/src/com/brindyblitz/artemis/engconsole/ui/damcon/InternalTeam.java
@@ -48,7 +48,7 @@ public InternalTeam(EngineeringConsoleManager.EnhancedDamconStatus damcon_status
     public void setSelected(boolean selected) {
         if (selected) {
             System.out.println("Selecting " + this);
-            AudioManager.playSound("test_2amr4.75k_16b.wav");
+            AudioManager.playSound("voice/test_2amr4.75k_16b.wav");
         }
 
         this.selected = selected;

diff --git a/src/com/brindyblitz/artemis/utils/AudioManager.java b/src/com/brindyblitz/artemis/utils/AudioManager.java
@@ -8,10 +8,16 @@ public abstract class AudioManager {
     private static HashMap<String, File> soundBank = new HashMap<>();
 
     public static void initialize(String path) {
-        File sfx = new File(path);
-        // TODO: SFX > make this recursive so I can better organize assets
-        for (File f : sfx.listFiles()) {
-            soundBank.put(f.getName(), f);
+        loadAssetsInDirectory(path, "");
+    }
+
+    private static void loadAssetsInDirectory(String path, String prefix) {
+        for (File f : new File(path).listFiles()) {
+            if (f.isDirectory()) {
+                loadAssetsInDirectory(f.getPath(), new File(prefix, f.getName()).getPath());
+            } else {
+                soundBank.put(new File(prefix, f.getName()).getPath().substring(1), f);
+            }
         }
     }