From 5c234af8750b13035580a32c8a7a31603c244abf Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 13 Aug 2008 22:49:34 +0000
Subject: [PATCH] This needs to live in the openal package because all the
 OpenAL must not be visible to things that don't want or care about OpenAL.
 Also, the openal package is conditionally compiled, so this would have broken
 a Narya build that didn't use the OpenAL libraries.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@624 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 .../sound => openal}/OpenALSoundManager.java  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)
 rename src/java/com/threerings/{media/sound => openal}/OpenALSoundManager.java (89%)

diff --git a/src/java/com/threerings/media/sound/OpenALSoundManager.java b/src/java/com/threerings/openal/OpenALSoundManager.java
similarity index 89%
rename from src/java/com/threerings/media/sound/OpenALSoundManager.java
rename to src/java/com/threerings/openal/OpenALSoundManager.java
index 72be8e3e..1696333b 100644
--- a/src/java/com/threerings/media/sound/OpenALSoundManager.java
+++ b/src/java/com/threerings/openal/OpenALSoundManager.java
@@ -1,7 +1,7 @@
-package com.threerings.media.sound;
+//
+// $Id$
 
-
-import static com.threerings.media.Log.log;
+package com.threerings.openal;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -13,13 +13,11 @@ import com.google.common.collect.Maps;
 
 import com.samskivert.util.RunQueue;
 
-import com.threerings.media.sound.SoundManager.Frob;
-import com.threerings.openal.Clip;
-import com.threerings.openal.ClipBuffer;
-import com.threerings.openal.ClipProvider;
-import com.threerings.openal.Sound;
-import com.threerings.openal.SoundGroup;
-import com.threerings.openal.Stream;
+import com.threerings.media.sound.SoundLoader;
+import com.threerings.media.sound.SoundManager;
+import com.threerings.media.sound.AbstractSoundManager;
+
+import static com.threerings.media.Log.log;
 
 /**
  * Plays sounds via OpenAL.
@@ -77,11 +75,11 @@ public class OpenALSoundManager extends AbstractSoundManager
     }
 
     @Override
-    protected Frob loop (String pkgPath, String key, float pan)
+    protected SoundManager.Frob loop (String pkgPath, String key, float pan)
     {
         final Sound sound = _group.getSound(pkgPath + key);
         sound.loop(true);
-        return new Frob(){
+        return new SoundManager.Frob(){
             public float getPan () {
                 return 0;
             }
@@ -133,9 +131,7 @@ public class OpenALSoundManager extends AbstractSoundManager
     protected Map<String, ClipBuffer> _locked = Maps.newHashMap();
 
     protected final SoundLoader _loader;
-
     protected final SoundGroup _group;
-
     protected final com.threerings.openal.SoundManager _alSoundManager;
 
     /** Number of sounds that can be played simultaneously. */