aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorathrxx2011-05-02 02:46:22 +0200
committerWillem Jan Palenstijn2011-05-17 20:33:03 +0200
commitd9772ff88f29e37fa7b91b7b6e43d846bcfad008 (patch)
treeb57d900b5c9404060a9f17b4e16de2ca73bdd864 /engines
parentbd2c84be89068757531399b32e099ec7287ee2a6 (diff)
downloadscummvm-rg350-d9772ff88f29e37fa7b91b7b6e43d846bcfad008.tar.gz
scummvm-rg350-d9772ff88f29e37fa7b91b7b6e43d846bcfad008.tar.bz2
scummvm-rg350-d9772ff88f29e37fa7b91b7b6e43d846bcfad008.zip
FM-TOWNS AUDIO: Some renaming in the euphony driver code
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/sound_towns.cpp12
-rw-r--r--engines/scumm/player_towns.cpp10
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index acf069dc02..5f4e5a55d0 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -113,7 +113,7 @@ void SoundTowns::haltTrack() {
for (int i = 0x40; i < 0x46; i++)
_driver->chanVolume(i, 0);
for (int i = 0; i < 32; i++)
- _driver->chanEnable(i, 0);
+ _driver->configChan_enable(i, 0);
_driver->stopParser();
}
@@ -330,15 +330,15 @@ void SoundTowns::playEuphonyTrack(uint32 offset, int loop) {
const uint8 *src = _musicTrackData + 852;
for (int i = 0; i < 32; i++)
- _driver->chanEnable(i, *src++);
+ _driver->configChan_enable(i, *src++);
for (int i = 0; i < 32; i++)
- _driver->chanMode(i, *src++);
+ _driver->configChan_setMode(i, *src++);
for (int i = 0; i < 32; i++)
- _driver->chanOrdr(i, *src++);
+ _driver->configChan_remap(i, *src++);
for (int i = 0; i < 32; i++)
- _driver->chanVolumeShift(i, *src++);
+ _driver->configChan_adjustVolume(i, *src++);
for (int i = 0; i < 32; i++)
- _driver->chanNoteShift(i, *src++);
+ _driver->configChan_setDetune(i, *src++);
src = _musicTrackData + 1748;
for (int i = 0; i < 6; i++)
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp
index a100af74ca..f3b790ae97 100644
--- a/engines/scumm/player_towns.cpp
+++ b/engines/scumm/player_towns.cpp
@@ -500,15 +500,15 @@ void Player_Towns_v1::playEuphonyTrack(int sound, const uint8 *data) {
const uint8 *trackData = src + 150;
for (int i = 0; i < 32; i++)
- _driver->chanEnable(i, *src++);
+ _driver->configChan_enable(i, *src++);
for (int i = 0; i < 32; i++)
- _driver->chanMode(i, 0xff);
+ _driver->configChan_setMode(i, 0xff);
for (int i = 0; i < 32; i++)
- _driver->chanOrdr(i, *src++);
+ _driver->configChan_remap(i, *src++);
for (int i = 0; i < 32; i++)
- _driver->chanVolumeShift(i, *src++);
+ _driver->configChan_adjustVolume(i, *src++);
for (int i = 0; i < 32; i++)
- _driver->chanNoteShift(i, *src++);
+ _driver->configChan_setDetune(i, *src++);
src += 8;
for (int i = 0; i < 6; i++)