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

Rename all the media.SoundManager stuff to variants on SoundPlayer to conflict

Browse Source 
less with openal.SoundManager.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@625 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Charlie Groves
2008-08-14 00:50:17 +00:00
parent 5c234af875
commit fc32634412
5 changed files with 95 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/openal/OpenALSoundManager.java → src/java/com/threerings/openal/OpenALSoundPlayer.java
+8 -9
View File
@@ -14,19 +14,18 @@ import com.google.common.collect.Maps;
import com.samskivert.util.RunQueue;
import com.threerings.media.sound.SoundLoader;
import com.threerings.media.sound.SoundManager;
import com.threerings.media.sound.AbstractSoundManager;
import com.threerings.media.sound.SoundPlayer;
import static com.threerings.media.Log.log;
/**
* Plays sounds via OpenAL.
* Implements the abstract pieces of {@link SoundPlayer} via OpenAL.
*/
public class OpenALSoundManager extends AbstractSoundManager
public class OpenALSoundPlayer extends SoundPlayer
implements ClipProvider
{
public OpenALSoundManager (SoundLoader loader)
public OpenALSoundPlayer (SoundLoader loader)
{
_loader = loader;
_alSoundManager = new MediaALSoundManager();
@@ -75,11 +74,11 @@ public class OpenALSoundManager extends AbstractSoundManager
}
@Override
protected SoundManager.Frob loop (String pkgPath, String key, float pan)
protected Frob loop (String pkgPath, String key, float pan)
{
final Sound sound = _group.getSound(pkgPath + key);
sound.loop(true);
return new SoundManager.Frob(){
return new Frob(){
public float getPan () {
return 0;
}
@@ -114,7 +113,7 @@ public class OpenALSoundManager extends AbstractSoundManager
}
}
protected class MediaALSoundManager extends com.threerings.openal.SoundManager {
protected class MediaALSoundManager extends SoundManager {
protected MediaALSoundManager () {
super(getSoundQueue());
}
@@ -132,7 +131,7 @@ public class OpenALSoundManager extends AbstractSoundManager
protected final SoundLoader _loader;
protected final SoundGroup _group;
protected final com.threerings.openal.SoundManager _alSoundManager;
protected final SoundManager _alSoundManager;
/** Number of sounds that can be played simultaneously. */
protected final int SOURCE_COUNT = 10;