[Scummvm-cvs-logs] CVS: residual main.cpp,1.33,1.34 stdafx.h,1.4,1.5 timer.cpp,1.9,1.10

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Dec 10 12:34:06 CET 2004


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

Modified Files:
	main.cpp stdafx.h timer.cpp 
Log Message:
rename create/delete_mutex to proper naming,
synced audiostream with main tree

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- main.cpp	9 Dec 2004 23:55:43 -0000	1.33
+++ main.cpp	10 Dec 2004 20:33:30 -0000	1.34
@@ -176,7 +176,7 @@
 	unlock_mutex(_mutex);
 }
 
-MutexRef create_mutex() {
+MutexRef createMutex() {
 	return (MutexRef)SDL_CreateMutex();
 }
 
@@ -188,6 +188,6 @@
 	SDL_mutexV((SDL_mutex *)mutex);
 }
 
-void delete_mutex(MutexRef mutex) {
+void deleteMutex(MutexRef mutex) {
 	SDL_DestroyMutex((SDL_mutex *)mutex);
 }

Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/residual/stdafx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- stdafx.h	25 Feb 2004 08:21:31 -0000	1.4
+++ stdafx.h	10 Dec 2004 20:33:30 -0000	1.5
@@ -28,10 +28,10 @@
 	~StackLock();
 };
 
-MutexRef create_mutex();
+MutexRef createMutex();
 void lock_mutex(MutexRef mutex);
 void unlock_mutex(MutexRef mutex);
-void delete_mutex(MutexRef mutex);
+void deleteMutex(MutexRef mutex);
 
 #if defined(WIN32)
 

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/timer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- timer.cpp	27 Mar 2004 18:30:04 -0000	1.9
+++ timer.cpp	10 Dec 2004 20:33:31 -0000	1.10
@@ -28,7 +28,7 @@
 	_timerHandler(0),
 	_lastTime(0) {
 
-	_mutex = create_mutex();
+	_mutex = createMutex();
 
 	g_timer = this;
 
@@ -56,7 +56,7 @@
 		}
 	}
 
-	delete_mutex(_mutex);
+	deleteMutex(_mutex);
 }
 
 int Timer::timer_handler(int t) {





More information about the Scummvm-git-logs mailing list