[Scummvm-cvs-logs] CVS: scummvm/sky/music musicbase.cpp,1.19,1.20

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky/music
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32588/sky/music

Modified Files:
	musicbase.cpp 
Log Message:
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- musicbase.cpp	6 Jan 2004 12:45:33 -0000	1.19
+++ musicbase.cpp	28 Feb 2004 12:58:12 -0000	1.20
@@ -34,7 +34,7 @@
 	_musicVolume = 127;
 	_system = system;
 	_numberOfChannels = _currentMusic = 0;
-	_mutex = _system->create_mutex();
+	_mutex = _system->createMutex();
 }
 
 MusicBase::~MusicBase(void) {
@@ -45,7 +45,7 @@
 
 void MusicBase::loadSection(uint8 pSection) {
 
-	_system->lock_mutex(_mutex);
+	_system->lockMutex(_mutex);
 	if (_currentMusic)
 		stopMusic();
 	if (_musicData)
@@ -62,7 +62,7 @@
 	_numberOfChannels = _currentMusic = 0;
 	setupPointers();
 	startDriver();
-	_system->unlock_mutex(_mutex);
+	_system->unlockMutex(_mutex);
 }
 
 bool MusicBase::musicIsPlaying(void) {
@@ -165,7 +165,7 @@
 
 void MusicBase::pollMusic(void) {
 
-	_system->lock_mutex(_mutex);
+	_system->lockMutex(_mutex);
 	uint8 newTempo;
 	if (_onNextPoll.doReInit) startDriver();
 	if (_onNextPoll.doStopMusic) stopMusic();
@@ -181,7 +181,7 @@
 			updateTempo();
 		}
 	}
-	_system->unlock_mutex(_mutex);
+	_system->unlockMutex(_mutex);
 	_aktTime &= 0xFFFF;
 }