[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.52,1.53 sound.cpp,1.267,1.268

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv11213/scumm

Modified Files:
	imuse_digi.cpp sound.cpp 
Log Message:
renamed some Timer methods

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- imuse_digi.cpp	9 Oct 2003 14:17:05 -0000	1.52
+++ imuse_digi.cpp	17 Oct 2003 16:39:32 -0000	1.53
@@ -695,12 +695,12 @@
 	for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
 		_channel[l]._mixerChannel = 0;
 	}
-	_scumm->_timer->installProcedure(timer_handler, 200000, this);
+	_scumm->_timer->installTimerProc(timer_handler, 200000, this);
 	_pause = false;
 }
 
 IMuseDigital::~IMuseDigital() {
-	_scumm->_timer->releaseProcedure(timer_handler);
+	_scumm->_timer->removeTimerProc(timer_handler);
 
 	for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
 		_scumm->_mixer->stopChannel(_channel[l]._mixerChannel);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- sound.cpp	17 Oct 2003 16:30:24 -0000	1.267
+++ sound.cpp	17 Oct 2003 16:39:32 -0000	1.268
@@ -1044,7 +1044,7 @@
 		_bundleMusicTrack = 0;
 		_numberSamplesBundleMusic = _bundle->getNumberOfMusicSamplesByName(song);
 		_nameBundleMusic = song;
-		_scumm->_timer->installProcedure(&music_handler, 1000000, this);
+		_scumm->_timer->installTimerProc(&music_handler, 1000000, this);
 	} else if (strcmp(_nameBundleMusic, song) != 0) {
 		_newNameBundleMusic = song;
 		_musicBundleToBeChanged = true;
@@ -1057,7 +1057,7 @@
 
 void Sound::stopBundleMusic() {
 	// First stop the music timer
-	_scumm->_timer->releaseProcedure(&music_handler);
+	_scumm->_timer->removeTimerProc(&music_handler);
 	_nameBundleMusic = "";
 	_scumm->_mixer->stopChannel(_bundleMusicTrack);
 	if (_musicBundleBufFinal) {
@@ -1412,12 +1412,12 @@
 	else 
 		timer_interval = 101;
 
-	_scumm->_timer->releaseProcedure(&cd_timer_handler);
-	_scumm->_timer->installProcedure(&cd_timer_handler, 1000 * timer_interval, _scumm);
+	_scumm->_timer->removeTimerProc(&cd_timer_handler);
+	_scumm->_timer->installTimerProc(&cd_timer_handler, 1000 * timer_interval, _scumm);
 }
 
 void Sound::stopCDTimer() {
-	_scumm->_timer->releaseProcedure(&cd_timer_handler);
+	_scumm->_timer->removeTimerProc(&cd_timer_handler);
 }
 
 void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) {