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

Tested and verified: the bug is fixed. Removed extra debugging, found

Browse Source 
another instance of append() that needed to be changed to appendLoud().


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3343 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2005-02-09 23:02:39 +00:00
parent 2ff14aa456
commit 5ff24097a7
1 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/sound/SoundManager.java
+2 -27
View File
@@ -260,8 +260,7 @@ public class SoundManager
boolean queued = enqueue(skey, true); boolean queued = enqueue(skey, true);
if (queued) { if (queued) {
if (_verbose.getValue()) { if (_verbose.getValue()) {
Log.info("Sound request [key=" + skey.key + Log.info("Sound request [key=" + skey.key + "].");
", age=" + skey.getAge() + "].");
} }
} else /* if (_verbose.getValue()) */ { } else /* if (_verbose.getValue()) */ {
@@ -300,9 +299,6 @@ public class SoundManager
}; };
spooler.setDaemon(true); spooler.setDaemon(true);
spooler.start(); spooler.start();
if (_verbose.getValue()) {
Log.info("Started new player thread.");
}
} }
return queued; return queued;
@@ -319,18 +315,13 @@ public class SoundManager
synchronized (_queue) { synchronized (_queue) {
_freeSpoolers++; _freeSpoolers++;
key = (SoundKey) _queue.get(MAX_WAIT_TIME); key = (SoundKey) _queue.get(MAX_WAIT_TIME);
if (_verbose.getValue()) {
Log.info("Spooler got key " +
"[spooler=" + Thread.currentThread().hashCode() +
", key=" + key + "].");
}
_freeSpoolers--; _freeSpoolers--;
if (key == null || key.cmd == DIE) { if (key == null || key.cmd == DIE) {
_spoolerCount--; _spoolerCount--;
// if dieing and there are others to kill, do so // if dieing and there are others to kill, do so
if (key != null && _spoolerCount > 0) { if (key != null && _spoolerCount > 0) {
_queue.append(key); _queue.appendLoud(key);
} }
return; return;
} }
@@ -504,18 +495,12 @@ public class SoundManager
} }
data = (byte[][]) _clipCache.get(key); data = (byte[][]) _clipCache.get(key);
if (verbose && data != null) {
Log.info("Clip loaded from cache [key=" + key.key + "].");
}
// see if it's in the locked cache (we first look in the regular // see if it's in the locked cache (we first look in the regular
// clip cache so that locked clips that are still cached continue // clip cache so that locked clips that are still cached continue
// to be moved to the head of the LRU queue) // to be moved to the head of the LRU queue)
if (data == null) { if (data == null) {
data = (byte[][]) _lockedClips.get(key); data = (byte[][]) _lockedClips.get(key);
if (verbose && data != null) {
Log.info("Clip loaded from lock [key=" + key.key + "].");
}
} }
if (data == null) { if (data == null) {
@@ -539,10 +524,6 @@ public class SoundManager
for (int ii=0; ii < names.length; ii++) { for (int ii=0; ii < names.length; ii++) {
data[ii] = loadClipData(bundle, names[ii]); data[ii] = loadClipData(bundle, names[ii]);
} }
if (verbose) {
Log.info("Clip loaded from rsrcmgr [key=" + key.key +
"].");
}
} }
_clipCache.put(key, data); _clipCache.put(key, data);
@@ -761,12 +742,6 @@ public class SoundManager
return (stamp + MAX_SOUND_DELAY < System.currentTimeMillis()); return (stamp + MAX_SOUND_DELAY < System.currentTimeMillis());
} }
// for debugging
public long getAge ()
{
return System.currentTimeMillis() - stamp;
}
// documentation inherited // documentation inherited
public String toString () public String toString ()
{ {