[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.4,1.5 adlibmusic.cpp,1.6,1.7

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv22321/sky/music

Modified Files:
	adlibchannel.cpp adlibmusic.cpp 
Log Message:
Post FMOPL-reversion cleanup.

Index: adlibchannel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibchannel.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- adlibchannel.cpp	11 Jul 2003 07:14:21 -0000	1.4
+++ adlibchannel.cpp	11 Jul 2003 10:23:13 -0000	1.5
@@ -79,8 +79,6 @@
 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;
 	}

Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- adlibmusic.cpp	11 Jul 2003 07:14:21 -0000	1.6
+++ adlibmusic.cpp	11 Jul 2003 10:23:13 -0000	1.7
@@ -33,8 +33,7 @@
 	_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 @@
 
 	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;
 	}