From ffa840c5acd20e45c4e5e030c07a6e247db659b6 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Fri, 7 Feb 2003 02:53:49 +0000 Subject: [PATCH] - fixed grievous bug that NPE'd when a sound was in a bundle rather than being loaded out of the classpath. - enabled sound. I want to test at home with my old linux machine and see how things are. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2249 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/media/sound/SoundManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java index a403dedfd..380f64672 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.44 2003/01/20 20:07:05 ray Exp $ +// $Id: SoundManager.java,v 1.45 2003/02/07 02:53:49 ray Exp $ package com.threerings.media.sound; @@ -661,7 +661,7 @@ public class SoundManager for (int ii=0; ii < names.length; ii++) { InputStream clipin = null; try { - _rmgr.getResource(bundle, names[ii]); + clipin = _rmgr.getResource(bundle, names[ii]); } catch (FileNotFoundException fnfe) { // try from the classpath clipin = _rmgr.getResource(names[ii]); @@ -1103,5 +1103,5 @@ public class SoundManager protected static final int BUFFER_SIZE = 1024 * 24; /** Used to disable sound entirely. */ - protected static final boolean SOUND_ENABLED = false; + protected static final boolean SOUND_ENABLED = true; }