[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibmusic.cpp,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Tue Feb 24 14:55:08 CET 2004
Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12241/sky/music
Modified Files:
adlibmusic.cpp
Log Message:
the OSystem changes we discussed on the ML (note: renaming of the existing OSystem API is not yet finished); porters will have to fix their ports to get them to compile again
Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- adlibmusic.cpp 6 Jan 2004 12:45:33 -0000 1.19
+++ adlibmusic.cpp 24 Feb 2004 22:39:40 -0000 1.20
@@ -33,16 +33,13 @@
AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk, OSystem *system)
: MusicBase(pDisk, system) {
-
+
_driverFileBase = 60202;
_mixer = pMixer;
_sampleRate = pMixer->getOutputRate();
+
+ _opl = makeAdlibOPL(_sampleRate);
- 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));
- _opl = OPLCreate(OPL_TYPE_YM3812, 3579545, _sampleRate);
-
_mixer->setupPremix(passMixerFunc, this);
}
More information about the Scummvm-git-logs
mailing list