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

Let's get jiggy with the verbosity in hopes of shedding some light on this

Browse Source 
ever-repeating sound situation.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2926 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-12-22 22:25:34 +00:00
parent 07dfb982d7
commit ddeadbcff1
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/sound/SoundManager.java
+11 -14
View File
@@ -1,5 +1,5 @@
// //
// $Id: SoundManager.java,v 1.66 2003/10/16 01:01:51 ray Exp $ // $Id: SoundManager.java,v 1.67 2003/12/22 22:25:34 mdb Exp $
package com.threerings.media.sound; package com.threerings.media.sound;
@@ -381,15 +381,13 @@ public class SoundManager
{ {
synchronized (_queue) { synchronized (_queue) {
if (_queue.size() < MAX_QUEUE_SIZE) { if (_queue.size() < MAX_QUEUE_SIZE) {
/* // if (_verbose.getValue()) {
if (_verbose.getValue()) {
Log.info("Sound request [key=" + skey + "]."); Log.info("Sound request [key=" + skey + "].");
} // }
*/
_queue.append(PLAY); _queue.append(PLAY);
_queue.append(skey); _queue.append(skey);
} else if (_verbose.getValue()) { } else /* if (_verbose.getValue()) */ {
Log.warning("SoundManager not playing sound because " + Log.warning("SoundManager not playing sound because " +
"too many sounds in queue [key=" + skey + "too many sounds in queue [key=" + skey +
", queue=" + _queue + "]."); ", queue=" + _queue + "].");
@@ -441,6 +439,7 @@ public class SoundManager
if (key.isExpired()) { if (key.isExpired()) {
return; return;
} }
try { try {
// get the sound data from our LRU cache // get the sound data from our LRU cache
byte[] data = getClipData(key); byte[] data = getClipData(key);
@@ -454,14 +453,12 @@ public class SoundManager
LineSpooler.play(stream, _clipVol, key); LineSpooler.play(stream, _clipVol, key);
} catch (IOException ioe) { } catch (IOException ioe) {
if (_verbose.getValue()) { Log.warning("Error loading sound file [key=" + key +
Log.warning("Error loading sound file [key=" + key + ", e=" + ioe + "].");
", e=" + ioe + "].");
}
} catch (UnsupportedAudioFileException uafe) { } catch (UnsupportedAudioFileException uafe) {
Log.warning("Unsupported sound format [key=" + key + ", e=" + Log.warning("Unsupported sound format [key=" + key +
uafe + "]."); ", e=" + uafe + "].");
} catch (LineUnavailableException lue) { } catch (LineUnavailableException lue) {
// this error comes every goddamned time we play a sound on // this error comes every goddamned time we play a sound on
@@ -1062,9 +1059,9 @@ public class SoundManager
int count = 0; int count = 0;
byte[] data = new byte[BUFFER_SIZE]; byte[] data = new byte[BUFFER_SIZE];
if (_verbose.getValue()) { // if (_verbose.getValue()) {
Log.info("Sound playing [key=" + _key.key + "]."); Log.info("Sound playing [key=" + _key.key + "].");
} // }
while (_valid && count != -1) { while (_valid && count != -1) {
try { try {
count = _stream.read(data, 0, data.length); count = _stream.read(data, 0, data.length);