[Scummvm-cvs-logs] CVS: scummvm/common mutex.h,NONE,1.1 system.h,1.82,1.83

[Max Horn]

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

Modified Files:
	system.h 
Added Files:
	mutex.h 
Log Message:
Moved mutex stuff into a seperate header

--- NEW FILE: mutex.h ---
/* ScummVM - Scumm Interpreter
 * Copyright (C) 2003-2005 The ScummVM project
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.

 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 * $Header: /cvsroot/scummvm/scummvm/common/mutex.h,v 1.1 2005/01/10 22:04:04 fingolfin Exp $
 *
 */

#ifndef COMMON_MUTEX_H
#define COMMON_MUTEX_H

#include "common/scummsys.h"

namespace Common {

/**
 * An pseudo-opaque mutex type. See OSystem::createMutex etc. for more details.
 */
typedef struct Mutex *MutexRef;


/**
 * Auxillary class to (un)lock a mutex on the stack.
 */
class StackLock {
	MutexRef _mutex;
	const char *_mutexName;

	void lock();
	void unlock();
public:
	StackLock(MutexRef mutex, const char *mutexName = NULL);
	~StackLock();
};


} // End of namespace Common

#endif

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- system.h	10 Jan 2005 21:06:49 -0000	1.82
+++ system.h	10 Jan 2005 22:04:04 -0000	1.83
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/util.h"
+#include "common/mutex.h"
 #include "common/rect.h"
 #include "common/savefile.h"
 #include "common/singleton.h"
@@ -541,8 +542,8 @@
 	 * can use dummy implementations for these methods.
 	 */
 	//@{
-
-	typedef struct Mutex *MutexRef;
+	
+	typedef Common::MutexRef	MutexRef;
 
 	/**
 	 * Create a new mutex.
@@ -679,27 +680,8 @@
 };
 
 
-
 /** The global OSystem instance. Inited in main(). */
 #define g_system	(&OSystem::instance())
 
-namespace Common {
-
-/**
- * Auxillary class to (un)lock a mutex on the stack.
- */
-class StackLock {
-	OSystem::MutexRef _mutex;
-	const char *_mutexName;
-
-	void lock();
-	void unlock();
-public:
-	StackLock(OSystem::MutexRef mutex, const char *mutexName = NULL);
-	~StackLock();
-};
-
-}	// End of namespace Common
-
 
 #endif