[Scummvm-cvs-logs] CVS: residual main.cpp,1.35,1.36 sound.cpp,1.13,1.14 stdafx.h,1.5,1.6

[Pawel Kolodziejski]

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

Modified Files:
	main.cpp sound.cpp stdafx.h 
Log Message:
- cleanup func names,
- move setup mixer volume from spund.cpp to main.cpp

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- main.cpp	25 Dec 2004 18:23:07 -0000	1.35
+++ main.cpp	26 Dec 2004 12:40:37 -0000	1.36
@@ -120,6 +120,8 @@
 
 	g_driver = new Driver(640, 480, 24);
 	
+	g_mixer->setVolume(255);
+
 	Mixer::instance()->start();
 
 	Bitmap *splash_bm = ResourceLoader::instance()->loadBitmap("splash.bm");
@@ -170,22 +172,22 @@
 
 StackLock::StackLock(MutexRef mutex) :
 		_mutex(mutex) {
-	lock_mutex(_mutex);
+	lockMutex(_mutex);
 }
 
 StackLock::~StackLock() {
-	unlock_mutex(_mutex);
+	unlockMutex(_mutex);
 }
 
 MutexRef createMutex() {
 	return (MutexRef)SDL_CreateMutex();
 }
 
-void lock_mutex(MutexRef mutex) {
+void lockMutex(MutexRef mutex) {
 	SDL_mutexP((SDL_mutex *)mutex);
 }
 
-void unlock_mutex(MutexRef mutex) {
+void unlockMutex(MutexRef mutex) {
 	SDL_mutexV((SDL_mutex *)mutex);
 }
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/sound.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sound.cpp	10 Dec 2004 21:16:31 -0000	1.13
+++ sound.cpp	26 Dec 2004 12:40:37 -0000	1.14
@@ -266,7 +266,6 @@
 void Mixer::start() {
 	Sound::init();
 	g_mixer->setupPremix(this);
-	g_mixer->setVolume(100);
 }
 
 void Mixer::playVoice(Sound *s) {

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/residual/stdafx.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stdafx.h	10 Dec 2004 20:33:30 -0000	1.5
+++ stdafx.h	26 Dec 2004 12:40:37 -0000	1.6
@@ -29,8 +29,8 @@
 };
 
 MutexRef createMutex();
-void lock_mutex(MutexRef mutex);
-void unlock_mutex(MutexRef mutex);
+void lockMutex(MutexRef mutex);
+void unlockMutex(MutexRef mutex);
 void deleteMutex(MutexRef mutex);
 
 #if defined(WIN32)