[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.170,1.171
Max Horn
fingolfin at users.sourceforge.net
Fri Jan 28 15:53:55 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.119,1.120 dimuse.h,1.69,1.70
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm player_v2.cpp,2.55,2.56 player_v2.h,2.33,2.34 sound.cpp,1.412,1.413
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5365/sky
Modified Files:
sky.cpp
Log Message:
Use class Mutex instead of MutexRef
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- sky.cpp 10 Jan 2005 22:06:17 -0000 1.170
+++ sky.cpp 28 Jan 2005 22:05:47 -0000 1.171
@@ -252,13 +252,13 @@
int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE);
if (midiDriver == MD_ADLIB) {
_systemVars.systemFlags |= SF_SBLASTER;
- _skyMusic = new AdlibMusic(_mixer, _skyDisk, _system);
+ _skyMusic = new AdlibMusic(_mixer, _skyDisk);
} else {
_systemVars.systemFlags |= SF_ROLAND;
if (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32))
- _skyMusic = new MT32Music(MidiDriver::createMidi(midiDriver), _skyDisk, _system);
+ _skyMusic = new MT32Music(MidiDriver::createMidi(midiDriver), _skyDisk);
else
- _skyMusic = new GmMusic(MidiDriver::createMidi(midiDriver), _skyDisk, _system);
+ _skyMusic = new GmMusic(MidiDriver::createMidi(midiDriver), _skyDisk);
}
if (isCDVersion()) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.119,1.120 dimuse.h,1.69,1.70
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm player_v2.cpp,2.55,2.56 player_v2.h,2.33,2.34 sound.cpp,1.412,1.413
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list