diff options
| author | Ludvig Strigeus | 2002-04-13 18:34:11 +0000 |
|---|---|---|
| committer | Ludvig Strigeus | 2002-04-13 18:34:11 +0000 |
| commit | 9f191ea9c5882f59cd23adbcbaa4a1c704909573 (patch) | |
| tree | f2ddc0e916248a56c82418b8346569bafd6e915a /sound/adlib.cpp | |
| parent | 38628f3543cf16d23968f541e4a35c95c2e17f13 (diff) | |
| download | scummvm-rg350-9f191ea9c5882f59cd23adbcbaa4a1c704909573.tar.gz scummvm-rg350-9f191ea9c5882f59cd23adbcbaa4a1c704909573.tar.bz2 scummvm-rg350-9f191ea9c5882f59cd23adbcbaa4a1c704909573.zip | |
new midi driver API,
no more USE_ADLIB,
a couple of sdl graphics driver fixes.
svn-id: r3925
Diffstat (limited to 'sound/adlib.cpp')
| -rw-r--r-- | sound/adlib.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/adlib.cpp b/sound/adlib.cpp index de550d3361..9700d99255 100644 --- a/sound/adlib.cpp +++ b/sound/adlib.cpp @@ -23,7 +23,6 @@ #include "scumm.h" #include "fmopl.h" -#if defined USE_ADLIB static byte lookup_table[64][32]; const byte volume_table[] = { @@ -643,7 +642,7 @@ void AdlibSoundDriver::mc_init_stuff(MidiChannelAdl *mc, Struct10 * s10, s11->s10->unk3 = 0; break; default: - s10->start_value = part->_drv->adlib_read_param(mc->_channel, s11->param); + s10->start_value = ((AdlibSoundDriver*)part->_drv)->adlib_read_param(mc->_channel, s11->param); } struct10_init(s10, ie); @@ -661,18 +660,18 @@ void AdlibSoundDriver::mc_inc_stuff(MidiChannelAdl *mc, Struct10 * s10, switch (s11->param) { case 0: mc->_vol_2 = s10->start_value + s11->modify_val; - part->_drv->adlib_set_param(mc->_channel, 0, + ((AdlibSoundDriver*)part->_drv)->adlib_set_param(mc->_channel, 0, volume_table[lookup_table[mc->_vol_2] [part->_vol_eff >> 2]]); break; case 13: mc->_vol_1 = s10->start_value + s11->modify_val; if (mc->_twochan) { - part->_drv->adlib_set_param(mc->_channel, 13, + ((AdlibSoundDriver*)part->_drv)->adlib_set_param(mc->_channel, 13, volume_table[lookup_table[mc->_vol_1] [part->_vol_eff >> 2]]); } else { - part->_drv->adlib_set_param(mc->_channel, 13, mc->_vol_1); + ((AdlibSoundDriver*)part->_drv)->adlib_set_param(mc->_channel, 13, mc->_vol_1); } break; case 30: @@ -682,14 +681,14 @@ void AdlibSoundDriver::mc_inc_stuff(MidiChannelAdl *mc, Struct10 * s10, s11->s10->unk3 = (char)s11->modify_val; break; default: - part->_drv->adlib_set_param(mc->_channel, s11->param, + ((AdlibSoundDriver*)part->_drv)->adlib_set_param(mc->_channel, s11->param, s10->start_value + s11->modify_val); break; } } if (code & 2 && s11->flag0x10) - part->_drv->adlib_key_onoff(mc->_channel); + ((AdlibSoundDriver*)part->_drv)->adlib_key_onoff(mc->_channel); } void AdlibSoundDriver::part_changed(Part *part, byte what) @@ -988,4 +987,3 @@ int AdlibSoundDriver::part_update_active(Part *part, uint16 *active) return count; } -#endif |