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

Check that the new variable isn't null, not the one that we just checked two lines ago

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@779 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Charlie Groves
2009-03-05 23:15:42 +00:00
parent 77d71ce7ed
commit ad9837830b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/openal/OpenALSoundPlayer.java
+6 -5
View File
@@ -113,7 +113,7 @@ public class OpenALSoundPlayer extends SoundPlayer
public void setClipVolume (final float vol) public void setClipVolume (final float vol)
{ {
super.setClipVolume(vol); super.setClipVolume(vol);
_ticker.postRunnable(new Runnable() { getSoundQueue().postRunnable(new Runnable() {
public void run () { public void run () {
_alSoundManager.setBaseGain(vol); _alSoundManager.setBaseGain(vol);
}}); }});
@@ -173,7 +173,7 @@ public class OpenALSoundPlayer extends SoundPlayer
InputStream rsrc = _loader.getSound(bundle, path); InputStream rsrc = _loader.getSound(bundle, path);
final StreamDecoder dec = new OggStreamDecoder(); final StreamDecoder dec = new OggStreamDecoder();
dec.init(rsrc); dec.init(rsrc);
getSoundQueue().postRunnable(new Runnable(){ getSoundQueue().postRunnable(new Runnable() {
public void run () { public void run () {
Stream s = new Stream(_alSoundManager) { Stream s = new Stream(_alSoundManager) {
@Override @Override
@@ -287,14 +287,15 @@ public class OpenALSoundPlayer extends SoundPlayer
@Override @Override
public void shutdown () public void shutdown ()
{ {
getSoundQueue().postRunnable(new Runnable(){ getSoundQueue().postRunnable(new Runnable() {
public void run () { public void run () {
_group.dispose(); _group.dispose();
_locked.clear(); _locked.clear();
for (Stream stream : _alSoundManager.getStreams()) { for (Stream stream : _alSoundManager.getStreams()) {
stream.dispose(); stream.dispose();
} }
}}); }
});
} }
/** /**
@@ -307,7 +308,7 @@ public class OpenALSoundPlayer extends SoundPlayer
Preconditions.checkNotNull(bundle, Preconditions.checkNotNull(bundle,
"Unable to find the bundle name for a package [package=%s, key=%s]", pkgPath, key); "Unable to find the bundle name for a package [package=%s, key=%s]", pkgPath, key);
String[] names = _loader.getPaths(pkgPath, key); String[] names = _loader.getPaths(pkgPath, key);
Preconditions.checkNotNull(bundle, "No such sound [package=%s, key=%s]", pkgPath, key); Preconditions.checkNotNull(names, "No such sound [package=%s, key=%s]", pkgPath, key);
String[] paths = new String[names.length]; String[] paths = new String[names.length];
for (int ii = 0; ii < paths.length; ii++) { for (int ii = 0; ii < paths.length; ii++) {
paths[ii] = bundle + ":" + names[ii]; paths[ii] = bundle + ":" + names[ii];