diff options
| author | Max Horn | 2003-08-05 23:58:24 +0000 |
|---|---|---|
| committer | Max Horn | 2003-08-05 23:58:24 +0000 |
| commit | 75db41750ef0ae4ad3d2b86f016fe21f67160fc4 (patch) | |
| tree | 9e74abef6ed60eede40e65adf55ecccc91cc50f4 /backends/midi | |
| parent | c431e229b3279bcb73de15dcdb32422b14162d65 (diff) | |
| download | scummvm-rg350-75db41750ef0ae4ad3d2b86f016fe21f67160fc4.tar.gz scummvm-rg350-75db41750ef0ae4ad3d2b86f016fe21f67160fc4.tar.bz2 scummvm-rg350-75db41750ef0ae4ad3d2b86f016fe21f67160fc4.zip | |
getting rid of g_mixer; removing lots of whitespace
svn-id: r9527
Diffstat (limited to 'backends/midi')
| -rw-r--r-- | backends/midi/adlib.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backends/midi/adlib.cpp b/backends/midi/adlib.cpp index 5da6601149..a95fa8da38 100644 --- a/backends/midi/adlib.cpp +++ b/backends/midi/adlib.cpp @@ -554,7 +554,7 @@ class MidiDriver_ADLIB : public MidiDriver { friend class AdlibPercussionChannel; public: - MidiDriver_ADLIB(); + MidiDriver_ADLIB(SoundMixer *mixer); int open(); void close(); @@ -810,14 +810,14 @@ void AdlibPercussionChannel::noteOn(byte note, byte velocity) { // MidiDriver method implementations -MidiDriver_ADLIB::MidiDriver_ADLIB() { +MidiDriver_ADLIB::MidiDriver_ADLIB(SoundMixer *mixer) + : _mixer(mixer) { uint i; _isOpen = false; _game_SmallHeader = false; _adlib_reg_cache = 0; - _mixer = 0 _timer_proc = 0; _timer_param = 0; @@ -839,8 +839,7 @@ int MidiDriver_ADLIB::open() { if (_isOpen) return MERR_ALREADY_OPEN; _isOpen = true; - _mixer = g_mixer; - + int i; AdlibVoice *voice; |