[Scummvm-cvs-logs] CVS: scummvm/sound/softsynth mt32.cpp,1.5,1.6
Max Horn
fingolfin at users.sourceforge.net
Fri Jan 28 15:54:09 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibmusic.cpp,1.23,1.24 adlibmusic.h,1.12,1.13 gmmusic.cpp,1.21,1.22 gmmusic.h,1.13,1.14 mt32music.cpp,1.22,1.23 mt32music.h,1.11,1.12 musicbase.cpp,1.23,1.24 musicbase.h,1.16,1.17
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common timer.cpp,1.32,1.33 timer.h,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sound/softsynth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5365/sound/softsynth
Modified Files:
mt32.cpp
Log Message:
Use class Mutex instead of MutexRef
Index: mt32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/softsynth/mt32.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mt32.cpp 10 Jan 2005 22:06:20 -0000 1.5
+++ mt32.cpp 28 Jan 2005 22:05:50 -0000 1.6
@@ -378,7 +378,7 @@
class MidiDriver_ThreadedMT32 : public MidiDriver_MT32 {
private:
- OSystem::MutexRef _eventMutex;
+ OSystem::Mutex _eventMutex;
MidiEvent_MT32 *_events;
Timer::TimerProc _timer_proc;
@@ -391,7 +391,6 @@
public:
MidiDriver_ThreadedMT32(SoundMixer *mixer);
- virtual ~MidiDriver_ThreadedMT32();
void onTimer();
void close();
@@ -400,15 +399,10 @@
MidiDriver_ThreadedMT32::MidiDriver_ThreadedMT32(SoundMixer *mixer) : MidiDriver_MT32(mixer) {
- _eventMutex = g_system->createMutex();
_events = NULL;
_timer_proc = NULL;
}
-MidiDriver_ThreadedMT32::~MidiDriver_ThreadedMT32() {
- g_system->deleteMutex(_eventMutex);
-}
-
void MidiDriver_ThreadedMT32::close() {
MidiDriver_MT32::close();
while ((popMidiEvent() != NULL)) {
@@ -427,7 +421,7 @@
}
void MidiDriver_ThreadedMT32::pushMidiEvent(MidiEvent_MT32 *event) {
- g_system->lockMutex(_eventMutex);
+ Common::StackLock lock(_eventMutex);
if (_events == NULL) {
_events = event;
} else {
@@ -436,16 +430,14 @@
last = last->_next;
last->_next = event;
}
- g_system->unlockMutex(_eventMutex);
}
MidiEvent_MT32 *MidiDriver_ThreadedMT32::popMidiEvent() {
+ Common::StackLock lock(_eventMutex);
MidiEvent_MT32 *event;
- g_system->lockMutex(_eventMutex);
event = _events;
if (event != NULL)
_events = event->_next;
- g_system->unlockMutex(_eventMutex);
return event;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibmusic.cpp,1.23,1.24 adlibmusic.h,1.12,1.13 gmmusic.cpp,1.21,1.22 gmmusic.h,1.13,1.14 mt32music.cpp,1.22,1.23 mt32music.h,1.11,1.12 musicbase.cpp,1.23,1.24 musicbase.h,1.16,1.17
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common timer.cpp,1.32,1.33 timer.h,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list