diff options
| author | athrxx | 2011-04-30 15:56:18 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-05-17 20:24:30 +0200 |
| commit | 6845f25f541707786f81dded25485c4ff5c8d62d (patch) | |
| tree | b05635eb1aa414353e29c72483d448b9278d1b92 /engines/scumm/player_towns.cpp | |
| parent | 63a78593516dc428f77ac01d90bc228fcf01de5d (diff) | |
| download | scummvm-rg350-6845f25f541707786f81dded25485c4ff5c8d62d.tar.gz scummvm-rg350-6845f25f541707786f81dded25485c4ff5c8d62d.tar.bz2 scummvm-rg350-6845f25f541707786f81dded25485c4ff5c8d62d.zip | |
SCUMM: Adapt code to latest FM-TOWNS audio driver changes
Diffstat (limited to 'engines/scumm/player_towns.cpp')
| -rw-r--r-- | engines/scumm/player_towns.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp index 2301b2a9b0..a100af74ca 100644 --- a/engines/scumm/player_towns.cpp +++ b/engines/scumm/player_towns.cpp @@ -574,16 +574,15 @@ void Player_Towns_v1::playCdaTrack(int sound, const uint8 *data, bool skipTrackV _cdaCurrentSound = sound; } -Player_Towns_v2::Player_Towns_v2(ScummEngine *vm, IMuse *imuse, Audio::Mixer *mixer, MidiDriver_TOWNS *driver, bool disposeIMuse, bool disposeDriver) : Player_Towns(vm, true), _imuse(imuse), _driver(driver), _imuseDispose(disposeIMuse), _driverDispose(disposeDriver), _sblData(0) { +Player_Towns_v2::Player_Towns_v2(ScummEngine *vm, Audio::Mixer *mixer, IMuse *imuse, bool disposeIMuse) : Player_Towns(vm, true), _imuse(imuse), _imuseDispose(disposeIMuse), _sblData(0) { _soundOverride = new SoundOvrParameters[_numSoundMax]; memset(_soundOverride, 0, _numSoundMax * sizeof(SoundOvrParameters)); - if (_driver) - _intf = _driver->intf(); + _intf = new TownsAudioInterface(mixer, 0); } Player_Towns_v2::~Player_Towns_v2() { - if (_driverDispose) - delete _driver; + delete _intf; + _intf = 0; if (_imuseDispose) delete _imuse; |