diff options
| -rw-r--r-- | backends/midi/adlib.cpp | 5 | ||||
| -rw-r--r-- | sky/music/adlibchannel.cpp | 2 | ||||
| -rw-r--r-- | sky/music/adlibmusic.cpp | 5 |
3 files changed, 1 insertions, 11 deletions
diff --git a/backends/midi/adlib.cpp b/backends/midi/adlib.cpp index 434e6f1f69..06a800603e 100644 --- a/backends/midi/adlib.cpp +++ b/backends/midi/adlib.cpp @@ -849,8 +849,6 @@ int MidiDriver_ADLIB::open() { _adlib_reg_cache = (byte *)calloc(256, 1); // We need to emulate one YM3812 chip -// if (0 != YM3812Init(1, 3579545, g_system->property(OSystem::PROP_GET_SAMPLE_RATE, 0))) -// error("Error initialising YM3812 sound chip emulation"); int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL); int eg_ent = g_system->property(OSystem::PROP_GET_FMOPL_EG_ENT, NULL); OPLBuildTables((env_bits ? env_bits : FMOPL_ENV_BITS_HQ), (eg_ent ? eg_ent : FMOPL_EG_ENT_HQ)); @@ -991,8 +989,6 @@ void MidiDriver_ADLIB::adlib_write(byte port, byte value) { return; _adlib_reg_cache[port] = value; -// YM3812Write(0, 0, port); -// YM3812Write(0, 1, value); OPLWriteReg (_opl, port, value); } @@ -1003,7 +999,6 @@ void MidiDriver_ADLIB::generate_samples(int16 *data, int len) { step = len; if (step > _next_tick) step = _next_tick; -// YM3812UpdateOne(0, data, step); YM3812UpdateOne (_opl, data, step); _next_tick -= step; diff --git a/sky/music/adlibchannel.cpp b/sky/music/adlibchannel.cpp index 7418b05568..6303e261ed 100644 --- a/sky/music/adlibchannel.cpp +++ b/sky/music/adlibchannel.cpp @@ -79,8 +79,6 @@ void SkyAdlibChannel::updateVolume(uint16 pVolume) { void SkyAdlibChannel::setRegister(uint8 regNum, uint8 value) { if (_adlibRegMirror[regNum] != value) { -// YM3812Write(0, 0, regNum); -// YM3812Write(0, 1, value); OPLWriteReg (_opl, regNum, value); _adlibRegMirror[regNum] = value; } diff --git a/sky/music/adlibmusic.cpp b/sky/music/adlibmusic.cpp index 444e4cd3e0..5ce82a6f3c 100644 --- a/sky/music/adlibmusic.cpp +++ b/sky/music/adlibmusic.cpp @@ -33,8 +33,7 @@ SkyAdlibMusic::SkyAdlibMusic(SoundMixer *pMixer, SkyDisk *pSkyDisk, OSystem *sys _driverFileBase = 60202; _mixer = pMixer; _sampleRate = g_system->property(OSystem::PROP_GET_SAMPLE_RATE, 0); -// if (0 != YM3812Init(1, 3579545, _sampleRate)) -// error("Error initialising YM3812 sound chip emulation"); + int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL); int eg_ent = g_system->property(OSystem::PROP_GET_FMOPL_EG_ENT, NULL); OPLBuildTables((env_bits ? env_bits : FMOPL_ENV_BITS_HQ), (eg_ent ? eg_ent : FMOPL_EG_ENT_HQ)); @@ -112,8 +111,6 @@ void SkyAdlibMusic::startDriver(void) { uint16 cnt = 0; while (_initSequence[cnt] || _initSequence[cnt+1]) { -// YM3812Write(0, 0, _initSequence[cnt]); -// YM3812Write(0, 1, _initSequence[cnt+1]); OPLWriteReg (_opl, _initSequence[cnt], _initSequence[cnt+1]); cnt += 2; } |