[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.410,1.411 simon.h,1.119,1.120 sound.cpp,1.58,1.59 sound.h,1.15,1.16

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv7735

Modified Files:
	simon.cpp simon.h sound.cpp sound.h 
Log Message:
renamed SimonSound class back to just Sound (now that we use namespaces that is just fine)

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -d -r1.410 -r1.411
--- simon.cpp	1 Jan 2004 10:42:10 -0000	1.410
+++ simon.cpp	3 Jan 2004 01:28:00 -0000	1.411
@@ -4796,7 +4796,7 @@
 
 	setup_vga_file_buf_pointers();
 
-	_sound = new SimonSound(_game, gss, _gameDataPath, _mixer);
+	_sound = new Sound(_game, gss, _gameDataPath, _mixer);
 
 	if (ConfMan.hasKey("sfx_mute") && ConfMan.getBool("sfx_mute") == 1) {
 		if (_game == GAME_SIMON1DOS)

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- simon.h	24 Dec 2003 00:25:01 -0000	1.119
+++ simon.h	3 Jan 2004 01:28:00 -0000	1.120
@@ -338,7 +338,7 @@
 	int _num_screen_updates;
 	int _vga_tick_counter;
 
-	SimonSound *_sound;
+	Sound *_sound;
 
 	bool _effects_paused;
 	bool _ambient_paused;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sound.cpp	27 Dec 2003 14:11:03 -0000	1.58
+++ sound.cpp	3 Jan 2004 01:28:00 -0000	1.59
@@ -229,7 +229,7 @@
 }
 #endif
 
-SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const Common::String &gameDataPath, SoundMixer *mixer)
+Sound::Sound(const byte game, const GameSpecificSettings *gss, const Common::String &gameDataPath, SoundMixer *mixer)
 	: _game(game), _gameDataPath(gameDataPath), _mixer(mixer) {
 	_voice = 0;
 	_effects = 0;
@@ -341,7 +341,7 @@
 	}
 }
 
-SimonSound::~SimonSound() {
+Sound::~Sound() {
 	delete _voice;
 	delete _effects;
 	
@@ -349,7 +349,7 @@
 	free(_offsets);
 }
 
-void SimonSound::readSfxFile(const char *filename, const Common::String &gameDataPath) {
+void Sound::readSfxFile(const char *filename, const Common::String &gameDataPath) {
 	stopAll();
 
 	File *file = new File();
@@ -376,7 +376,7 @@
 		_effects = new WavSound(_mixer, file);
 }
 
-void SimonSound::loadSfxTable(File *gameFile, uint32 base) {
+void Sound::loadSfxTable(File *gameFile, uint32 base) {
 	stopAll();
 
 	if (_game & GF_WIN)
@@ -385,7 +385,7 @@
 		_effects = new VocSound(_mixer, gameFile, base);
 }
 
-void SimonSound::readVoiceFile(const char *filename, const Common::String &gameDataPath) {
+void Sound::readVoiceFile(const char *filename, const Common::String &gameDataPath) {
 	stopAll();
 
 	File *file = new File();
@@ -408,7 +408,7 @@
 	_voice = new RawSound(_mixer, file, 0, SOUND_BIG_ENDIAN);
 }
 
-void SimonSound::playVoice(uint sound) {
+void Sound::playVoice(uint sound) {
 	if (_game == GAME_SIMON2MAC && _filenums) {
 		if (_last_voice_file != _filenums[sound]) {
 			stopAll();
@@ -437,7 +437,7 @@
 	_voice->playSound(sound, &_voice_handle, (_game == GAME_SIMON1CD32) ? 0 : SoundMixer::FLAG_UNSIGNED);
 }
 
-void SimonSound::playEffects(uint sound) {
+void Sound::playEffects(uint sound) {
 	if (!_effects)
 		return;
 	
@@ -447,7 +447,7 @@
 	_effects->playSound(sound, &_effects_handle, (_game == GAME_SIMON1CD32) ? 0 : SoundMixer::FLAG_UNSIGNED);
 }
 
-void SimonSound::playAmbient(uint sound) {
+void Sound::playAmbient(uint sound) {
 	if (!_effects)
 		return;
 
@@ -463,24 +463,24 @@
 	_effects->playSound(sound, &_ambient_handle, SoundMixer::FLAG_LOOP|SoundMixer::FLAG_UNSIGNED);
 }
 
-bool SimonSound::hasVoice() {
+bool Sound::hasVoice() {
 	return _voice_file;
 }
 
-void SimonSound::stopVoice() {
+void Sound::stopVoice() {
 	_mixer->stopHandle(_voice_handle);
 }
 
-void SimonSound::stopAll() {
+void Sound::stopAll() {
 	_mixer->stopAll();
 	_ambient_playing = 0;
 }
 
-void SimonSound::effectsPause(bool b) {
+void Sound::effectsPause(bool b) {
 	_effects_paused = b;
 }
 
-void SimonSound::ambientPause(bool b) {
+void Sound::ambientPause(bool b) {
 	_ambient_paused = b;
 
 	if (_ambient_paused && _ambient_playing) {

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sound.h	21 Dec 2003 00:05:00 -0000	1.15
+++ sound.h	3 Jan 2004 01:28:00 -0000	1.16
@@ -28,7 +28,7 @@
 
 class BaseSound;
 
-class SimonSound {
+class Sound {
 private:
 	byte _game;
 	const Common::String _gameDataPath;
@@ -53,8 +53,8 @@
 	bool _voice_file;
 	uint _ambient_playing;
 
-	SimonSound(const byte game, const GameSpecificSettings *gss, const Common::String &gameDataPath, SoundMixer *mixer);
-	~SimonSound();
+	Sound(const byte game, const GameSpecificSettings *gss, const Common::String &gameDataPath, SoundMixer *mixer);
+	~Sound();
 	
 	void readSfxFile(const char *filename, const Common::String &gameDataPath);
 	void loadSfxTable(File *gameFile, uint32 base);