[Scummvm-cvs-logs] CVS: scummvm/sword1 credits.cpp,1.13,1.14 music.cpp,1.43,1.44 music.h,1.20,1.21 sound.h,1.20,1.21

Max Horn fingolfin at users.sourceforge.net
Tue May 10 17:05:44 CEST 2005


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv451/sword1

Modified Files:
	credits.cpp music.cpp music.h sound.h 
Log Message:
Moved some more stuff to namespace Audio (enough for tonight)

Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- credits.cpp	10 May 2005 23:48:46 -0000	1.13
+++ credits.cpp	11 May 2005 00:01:37 -0000	1.14
@@ -112,7 +112,7 @@
 	_system->updateScreen();
 
 	// everything's initialized, time to render and show the credits.
-	SoundHandle bgSound;
+	Audio::SoundHandle bgSound;
 	_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &bgSound, bgSoundStream, 0);
 
 	int relDelay = 0;

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- music.cpp	10 May 2005 23:48:47 -0000	1.43
+++ music.cpp	11 May 2005 00:01:37 -0000	1.44
@@ -275,8 +275,8 @@
 }
 
 void Music::setVolume(uint8 volL, uint8 volR) {
-	_volumeL = (st_volume_t)volL;
-	_volumeR = (st_volume_t)volR;
+	_volumeL = (Audio::st_volume_t)volL;
+	_volumeR = (Audio::st_volume_t)volR;
 }
 
 void Music::giveVolume(uint8 *volL, uint8 *volR) {
@@ -327,7 +327,7 @@
 		   As the corresponding _converter is NULL, the handle will be ignored by the playing thread */
 		if (_handles[newStream].play(_tuneList[tuneId], loopFlag != 0)) {
 			_mutex.lock();
-			_converter[newStream] = makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);
+			_converter[newStream] = Audio::makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);
 			_mutex.unlock();
 		}
 	} else {

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- music.h	10 May 2005 23:48:47 -0000	1.20
+++ music.h	11 May 2005 00:01:37 -0000	1.21
@@ -103,9 +103,9 @@
 	int getRate() const { return _sampleRate; }
 
 private:
-	st_volume_t _volumeL, _volumeR;
+	Audio::st_volume_t _volumeL, _volumeR;
 	MusicHandle _handles[2];
-	RateConverter *_converter[2];
+	Audio::RateConverter *_converter[2];
 	Audio::Mixer *_mixer;
 	uint32 _sampleRate;
 	Common::Mutex _mutex;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sound.h	10 May 2005 23:48:47 -0000	1.20
+++ sound.h	11 May 2005 00:01:37 -0000	1.21
@@ -44,7 +44,7 @@
 
 struct QueueElement {
 	uint32 id, delay;
-	SoundHandle handle;
+	Audio::SoundHandle handle;
 };
 
 struct RoomVol {
@@ -103,7 +103,7 @@
 	uint32		 _cowHeaderSize;
 	uint8		 _currentCowFile;
 	CowMode		 _cowMode;
-	SoundHandle _speechHandle, _fxHandle;
+	Audio::SoundHandle _speechHandle, _fxHandle;
 	Common::RandomSource _rnd;
 	
 	QueueElement _fxQueue[MAX_FXQ_LENGTH];





More information about the Scummvm-git-logs mailing list