diff options
| author | Jamieson Christian | 2003-07-11 10:23:13 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-07-11 10:23:13 +0000 |
| commit | 378856a693942f7a6fa71c951bcba003d2d5f0c0 (patch) | |
| tree | 847cf85992c4547d925efd95d1aa72f0c274106f /sky/music | |
| parent | 88c2ef94d2ce7569ebb5c85092602391703ea6d8 (diff) | |
| download | scummvm-rg350-378856a693942f7a6fa71c951bcba003d2d5f0c0.tar.gz scummvm-rg350-378856a693942f7a6fa71c951bcba003d2d5f0c0.tar.bz2 scummvm-rg350-378856a693942f7a6fa71c951bcba003d2d5f0c0.zip | |
Post FMOPL-reversion cleanup.
svn-id: r8906
Diffstat (limited to 'sky/music')
| -rw-r--r-- | sky/music/adlibchannel.cpp | 2 | ||||
| -rw-r--r-- | sky/music/adlibmusic.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
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; } |