[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
Max Horn
fingolfin at users.sourceforge.net
Fri Jan 28 15:53:59 CET 2005
Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5365/sky/music
Modified Files:
adlibmusic.cpp adlibmusic.h gmmusic.cpp gmmusic.h
mt32music.cpp mt32music.h musicbase.cpp musicbase.h
Log Message:
Use class Mutex instead of MutexRef
Index: adlibmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- adlibmusic.cpp 1 Jan 2005 16:09:22 -0000 1.23
+++ adlibmusic.cpp 28 Jan 2005 22:05:47 -0000 1.24
@@ -26,8 +26,8 @@
namespace Sky {
-AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk, OSystem *system)
- : MusicBase(pDisk, system) {
+AdlibMusic::AdlibMusic(SoundMixer *pMixer, Disk *pDisk)
+ : MusicBase(pDisk) {
_driverFileBase = 60202;
_mixer = pMixer;
Index: adlibmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/adlibmusic.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- adlibmusic.h 1 Jan 2005 16:09:22 -0000 1.12
+++ adlibmusic.h 28 Jan 2005 22:05:48 -0000 1.13
@@ -32,7 +32,7 @@
class AdlibMusic : public AudioStream, public MusicBase {
public:
- AdlibMusic(SoundMixer *pMixer, Disk *pDisk, OSystem *system);
+ AdlibMusic(SoundMixer *pMixer, Disk *pDisk);
~AdlibMusic(void);
virtual void setVolume(uint8 volume);
Index: gmmusic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gmmusic.cpp 1 Jan 2005 16:09:22 -0000 1.21
+++ gmmusic.cpp 28 Jan 2005 22:05:48 -0000 1.22
@@ -32,8 +32,8 @@
((GmMusic*)param)->timerCall();
}
-GmMusic::GmMusic(MidiDriver *pMidiDrv, Disk *pDisk, OSystem *system)
- : MusicBase(pDisk, system) {
+GmMusic::GmMusic(MidiDriver *pMidiDrv, Disk *pDisk)
+ : MusicBase(pDisk) {
_driverFileBase = 60200;
_midiDrv = pMidiDrv;
Index: gmmusic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/gmmusic.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gmmusic.h 1 Jan 2005 16:09:22 -0000 1.13
+++ gmmusic.h 28 Jan 2005 22:05:48 -0000 1.14
@@ -30,7 +30,7 @@
class GmMusic : public MusicBase {
public:
- GmMusic(MidiDriver *pMidiDrv, Disk *pDisk, OSystem *system);
+ GmMusic(MidiDriver *pMidiDrv, Disk *pDisk);
~GmMusic(void);
virtual void setVolume(uint8 volume);
private:
Index: mt32music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mt32music.cpp 10 Jan 2005 22:06:18 -0000 1.22
+++ mt32music.cpp 28 Jan 2005 22:05:48 -0000 1.23
@@ -32,8 +32,8 @@
((MT32Music*)param)->timerCall();
}
-MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk, OSystem *system)
- : MusicBase(pDisk, system) {
+MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk)
+ : MusicBase(pDisk) {
_driverFileBase = 60200;
_midiDrv = pMidiDrv;
Index: mt32music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/mt32music.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mt32music.h 1 Jan 2005 16:09:22 -0000 1.11
+++ mt32music.h 28 Jan 2005 22:05:48 -0000 1.12
@@ -30,7 +30,7 @@
class MT32Music : public MusicBase {
public:
- MT32Music(MidiDriver *pMidiDrv, Disk *pDisk, OSystem *system);
+ MT32Music(MidiDriver *pMidiDrv, Disk *pDisk);
~MT32Music(void);
private:
static void passTimerFunc(void *param);
Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- musicbase.cpp 10 Jan 2005 22:06:18 -0000 1.23
+++ musicbase.cpp 28 Jan 2005 22:05:48 -0000 1.24
@@ -22,20 +22,17 @@
#include "sky/music/musicbase.h"
#include "sky/disk.h"
#include "common/util.h"
-#include "common/system.h"
namespace Sky {
-MusicBase::MusicBase(Disk *pDisk, OSystem *system) {
+MusicBase::MusicBase(Disk *pDisk) {
_musicData = NULL;
_allowedCommands = 0;
_skyDisk = pDisk;
_currentMusic = 0;
_musicVolume = 127;
- _system = system;
_numberOfChannels = _currentMusic = 0;
- _mutex = _system->createMutex();
}
MusicBase::~MusicBase(void) {
@@ -46,7 +43,7 @@
void MusicBase::loadSection(uint8 pSection) {
- _system->lockMutex(_mutex);
+ _mutex.lock();
if (_currentMusic)
stopMusic();
if (_musicData)
@@ -63,7 +60,7 @@
_numberOfChannels = _currentMusic = 0;
setupPointers();
startDriver();
- _system->unlockMutex(_mutex);
+ _mutex.unlock();
}
bool MusicBase::musicIsPlaying(void) {
@@ -166,7 +163,7 @@
void MusicBase::pollMusic(void) {
- _system->lockMutex(_mutex);
+ _mutex.lock();
uint8 newTempo;
if (_onNextPoll.doReInit) startDriver();
if (_onNextPoll.doStopMusic) stopMusic();
@@ -182,7 +179,7 @@
updateTempo();
}
}
- _system->unlockMutex(_mutex);
+ _mutex.unlock();
_aktTime &= 0xFFFF;
}
Index: musicbase.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- musicbase.h 10 Jan 2005 22:06:18 -0000 1.16
+++ musicbase.h 28 Jan 2005 22:05:48 -0000 1.17
@@ -26,8 +26,6 @@
#include "common/scummsys.h"
#include "common/mutex.h"
-class OSystem;
-
namespace Sky {
class Disk;
@@ -50,7 +48,7 @@
class MusicBase {
public:
- MusicBase(Disk *pDisk, OSystem *system);
+ MusicBase(Disk *pDisk);
virtual ~MusicBase(void);
void loadSection(uint8 pSection);
void musicCommand(uint16 command);
@@ -62,7 +60,6 @@
protected:
- OSystem *_system;
Disk *_skyDisk;
uint8 *_musicData;
uint8 _allowedCommands;
@@ -77,7 +74,7 @@
uint32 _aktTime;
Actions _onNextPoll;
ChannelBase *_channels[10];
- Common::MutexRef _mutex;
+ Common::Mutex _mutex;
virtual void setupPointers(void) = 0;
virtual void setupChannels(uint8 *channelData) = 0;
More information about the Scummvm-git-logs
mailing list