From 2351316259eddffb8a7e1bc188b534fecd407b56 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 25 Apr 2005 21:08:52 +0000 Subject: [PATCH] Removed unneeded dependence on the sound services. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3524 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/puzzle/client/PuzzleController.java | 10 ---------- src/java/com/threerings/puzzle/util/PuzzleContext.java | 6 ------ .../com/threerings/stage/tools/editor/EditorApp.java | 7 ------- .../com/threerings/stage/tools/viewer/ViewerApp.java | 9 --------- src/java/com/threerings/stage/util/StageContext.java | 6 ------ 5 files changed, 38 deletions(-) diff --git a/src/java/com/threerings/puzzle/client/PuzzleController.java b/src/java/com/threerings/puzzle/client/PuzzleController.java index 4249c09db..26a1e79ac 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleController.java +++ b/src/java/com/threerings/puzzle/client/PuzzleController.java @@ -38,7 +38,6 @@ import com.samskivert.util.ObserverList; import com.samskivert.util.StringUtil; import com.threerings.media.FrameParticipant; -import com.threerings.media.sound.SoundCodes; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; @@ -126,15 +125,6 @@ public abstract class PuzzleController extends GameController return _pidx; } - /** - * Convenience method for playing a puzzle sound effect. - */ - public void playSound (String packagePath, String key) - { - _pctx.getSoundManager().play( - SoundCodes.GAME_FX, packagePath, key); - } - // documentation inherited public void setGameOver (boolean gameOver) { diff --git a/src/java/com/threerings/puzzle/util/PuzzleContext.java b/src/java/com/threerings/puzzle/util/PuzzleContext.java index b8c1cb4c5..7132b8678 100644 --- a/src/java/com/threerings/puzzle/util/PuzzleContext.java +++ b/src/java/com/threerings/puzzle/util/PuzzleContext.java @@ -27,7 +27,6 @@ import com.threerings.util.MessageManager; import com.threerings.util.Name; import com.threerings.media.FrameManager; -import com.threerings.media.sound.SoundManager; import com.threerings.parlor.util.ParlorContext; @@ -60,9 +59,4 @@ public interface PuzzleContext extends ParlorContext * Provides access to the key dispatcher. */ public KeyDispatcher getKeyDispatcher (); - - /** - * Provides access to the sound manager. - */ - public SoundManager getSoundManager (); } diff --git a/src/java/com/threerings/stage/tools/editor/EditorApp.java b/src/java/com/threerings/stage/tools/editor/EditorApp.java index f667a3dd8..dc40a49bd 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorApp.java +++ b/src/java/com/threerings/stage/tools/editor/EditorApp.java @@ -37,7 +37,6 @@ import com.threerings.resource.ResourceManager; import com.threerings.media.FrameManager; import com.threerings.media.image.ColorPository; import com.threerings.media.image.ImageManager; -import com.threerings.media.sound.SoundManager; import com.threerings.media.util.ModeUtil; import com.threerings.media.tile.TileSetRepository; @@ -153,7 +152,6 @@ public class EditorApp implements Runnable } _colpos = ColorPository.loadColorPository(_rmgr); - _soundmgr = new SoundManager(_rmgr, null, null); _kbdmgr = new KeyboardManager(); _keydisp = new KeyDispatcher(_frame); @@ -290,10 +288,6 @@ public class EditorApp implements Runnable return _msgmgr; } - public SoundManager getSoundManager() { - return _soundmgr; - } - public KeyboardManager getKeyboardManager() { return _kbdmgr; } @@ -345,7 +339,6 @@ public class EditorApp implements Runnable protected TileSetRepository _tsrepo; protected ColorPository _colpos; protected MessageManager _msgmgr; - protected SoundManager _soundmgr; protected KeyboardManager _kbdmgr; protected BundledComponentRepository _crepo; protected KeyDispatcher _keydisp; diff --git a/src/java/com/threerings/stage/tools/viewer/ViewerApp.java b/src/java/com/threerings/stage/tools/viewer/ViewerApp.java index ae14c185f..cc2874360 100644 --- a/src/java/com/threerings/stage/tools/viewer/ViewerApp.java +++ b/src/java/com/threerings/stage/tools/viewer/ViewerApp.java @@ -24,7 +24,6 @@ import com.threerings.media.FrameManager; import com.threerings.media.IconManager; import com.threerings.media.image.ColorPository; import com.threerings.media.image.ImageManager; -import com.threerings.media.sound.SoundManager; import com.threerings.media.tile.bundle.BundledTileSetRepository; import com.threerings.cast.CharacterManager; @@ -75,8 +74,6 @@ public class ViewerApp _colpos = ColorPository.loadColorPository(_rmgr); _crepo = new BundledComponentRepository(_rmgr, _imgr, "components"); _mesgmgr = new MessageManager("rsrc.i18n"); - _soundmgr = new SoundManager( - _rmgr, "general", "media/stage/feedback/default.wav"); _frame = new ViewerFrame(gc); _framemgr = FrameManager.newInstance(_frame); @@ -133,11 +130,6 @@ public class ViewerApp return null; } - // documentation inherited from interface - public SoundManager getSoundManager() { - return _soundmgr; - } - // documentation inherited from interface public KeyboardManager getKeyboardManager() { return null; @@ -210,7 +202,6 @@ public class ViewerApp protected BundledComponentRepository _crepo; protected ColorPository _colpos; protected MessageManager _mesgmgr; - protected SoundManager _soundmgr; protected FrameManager _framemgr; protected ViewerFrame _frame; diff --git a/src/java/com/threerings/stage/util/StageContext.java b/src/java/com/threerings/stage/util/StageContext.java index d5702506c..725510bf7 100644 --- a/src/java/com/threerings/stage/util/StageContext.java +++ b/src/java/com/threerings/stage/util/StageContext.java @@ -11,7 +11,6 @@ import com.threerings.util.MessageManager; import com.threerings.media.FrameManager; import com.threerings.media.image.ColorPository; import com.threerings.media.image.ImageManager; -import com.threerings.media.sound.SoundManager; import com.threerings.cast.CharacterManager; import com.threerings.cast.ComponentRepository; @@ -50,11 +49,6 @@ public interface StageContext */ public MessageManager getMessageManager (); - /** - * Returns a reference to the sound manager used by the client. - */ - public SoundManager getSoundManager(); - /** * Returns a reference to the keyboard manager. */