[Scummvm-cvs-logs] CVS: scummvm/sky/music adlibmusic.cpp,1.10,1.11
Max Horn
fingolfin at users.sourceforge.net
Tue Aug 5 17:29:07 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui PopUpWidget.cpp,1.13,1.14
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.50.2.3,1.50.2.4 control.h,1.21.2.3,1.21.2.4 screen.cpp,1.48,1.48.2.1 screen.h,1.12,1.12.2.1 sky.cpp,1.100.2.2,1.100.2.3 sky.h,1.47,1.47.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1:/tmp/cvs-serv1282/sky/music
Modified Files:
adlibmusic.cpp
Log Message:
get rid of some g_system usage
Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- adlibmusic.cpp 13 Jul 2003 06:04:11 -0000 1.10
+++ adlibmusic.cpp 6 Aug 2003 00:28:00 -0000 1.11
@@ -32,12 +32,12 @@
_driverFileBase = 60202;
_mixer = pMixer;
- _sampleRate = g_system->property(OSystem::PROP_GET_SAMPLE_RATE, 0);
+ _sampleRate = pMixer->getOutputRate();
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, g_system->property(OSystem::PROP_GET_SAMPLE_RATE, 0));
+ _opl = OPLCreate(OPL_TYPE_YM3812, 3579545, _sampleRate);
_mixer->setupPremix(this, passMixerFunc);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui PopUpWidget.cpp,1.13,1.14
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.50.2.3,1.50.2.4 control.h,1.21.2.3,1.21.2.4 screen.cpp,1.48,1.48.2.1 screen.h,1.12,1.12.2.1 sky.cpp,1.100.2.2,1.100.2.3 sky.h,1.47,1.47.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list