Went back to not initing midi until the first song is played (and doing it

on the sound manager thread).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1963 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2002-11-19 21:17:35 +00:00
parent b0aabf1478
commit 20e9ccae57
@@ -1,5 +1,5 @@
// //
// $Id: SoundManager.java,v 1.18 2002/11/19 02:24:35 ray Exp $ // $Id: SoundManager.java,v 1.19 2002/11/19 21:17:35 ray Exp $
package com.threerings.media; package com.threerings.media;
@@ -101,8 +101,6 @@ public class SoundManager
// save things off // save things off
_rmgr = rmgr; _rmgr = rmgr;
initMidi();
// create a thread to plays sounds and load sound // create a thread to plays sounds and load sound
// data from the resource manager // data from the resource manager
_player = new Thread() { _player = new Thread() {
@@ -473,6 +471,10 @@ public class SoundManager
*/ */
protected void playSequence (MidiInfo info) protected void playSequence (MidiInfo info)
{ {
if (_sequencer == null) {
initMidi();
}
stopCurrentSong(false); stopCurrentSong(false);
_midiStack.addFirst(info); _midiStack.addFirst(info);
playTopSong(); playTopSong();