From 6caca5fe5aab3dbf51b68a46dd3ad5eb94c3515e Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 7 Dec 2002 22:41:10 +0000 Subject: [PATCH] Added code to easily disable the sound manager. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2039 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/media/sound/SoundManager.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java index 3112c2b90..c112e3796 100644 --- a/src/java/com/threerings/media/sound/SoundManager.java +++ b/src/java/com/threerings/media/sound/SoundManager.java @@ -1,5 +1,5 @@ // -// $Id: SoundManager.java,v 1.37 2002/12/04 21:42:34 ray Exp $ +// $Id: SoundManager.java,v 1.38 2002/12/07 22:41:10 mdb Exp $ package com.threerings.media; @@ -92,6 +92,8 @@ public class SoundManager // save things off _rmgr = rmgr; + if (!SOUND_ENABLED) return; + // create a thread to plays sounds and load sound // data from the resource manager _player = new Thread("narya SoundManager") { @@ -258,6 +260,8 @@ public class SoundManager */ public void lock (String pkgPath, String key) { + if (!SOUND_ENABLED) return; + synchronized (_queue) { _queue.append(LOCK); _queue.append(new SoundKey(pkgPath, key)); @@ -269,6 +273,8 @@ public class SoundManager */ public void unlock (String pkgPath, String key) { + if (!SOUND_ENABLED) return; + synchronized (_queue) { _queue.append(UNLOCK); _queue.append(new SoundKey(pkgPath, key)); @@ -301,6 +307,8 @@ public class SoundManager */ public void play (SoundType type, String pkgPath, String key) { + if (!SOUND_ENABLED) return; + if (type == null) { // let the lazy kids play too type = DEFAULT; @@ -335,6 +343,10 @@ public class SoundManager */ public void pushMusic (String pkgPath, String key, int numloops) { + if (!SOUND_ENABLED) { + return; + } + synchronized (_queue) { _queue.append(PLAYMUSIC); _queue.append(new MusicInfo(pkgPath, key, numloops)); @@ -1065,4 +1077,7 @@ public class SoundManager /** The buffer size in bytes used when reading audio file data. */ protected static final int BUFFER_SIZE = 1024 * 24; + + /** Used to disable sound entirely. */ + protected static final boolean SOUND_ENABLED = false; }