The-Homebrew-Cloud/Flappy-Bird_GX2
2
0
Fork 0
mirror of https://github.com/wiiu-env/Flappy-Bird_GX2.git synced 2024-11-30 11:34:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace CMutex by std::recursive_mutex

Browse Source
This commit is contained in:
Maschell 2020-07-05 13:49:49 +02:00
parent 04d775fbdb
commit 62c4c726ff
2 changed files with 2 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/menu/MainWindow.h
View File

@ -20,8 +20,8 @@
#include <vector> #include <vector>
#include <queue> #include <queue>
#include <mutex>
#include "gui/Gui.h" #include "gui/Gui.h"
#include "system/CMutex.h"
#include "gui/GuiMainWindowScreen.h" #include "gui/GuiMainWindowScreen.h"
class CVideo; class CVideo;
@ -140,7 +140,7 @@ private:
GuiImage *pointerImg[4]; GuiImage *pointerImg[4];
bool pointerValid[4]; bool pointerValid[4];
CMutex guiMutex; std::recursive_mutex guiMutex;
}; };
#endif //_MAIN_WINDOW_H_ #endif //_MAIN_WINDOW_H_

73
src/system/CMutex.h
View File

@ -1,73 +0,0 @@
/****************************************************************************
* Copyright (C) 2015 Dimok
*
* 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 3 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, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#ifndef _CMUTEX_H_
#define _CMUTEX_H_
#include <malloc.h>
#include <coreinit/mutex.h>
class CMutex {
public:
CMutex() {
pMutex = (OSMutex *) malloc(sizeof(OSMutex));
if (!pMutex)
return;
OSInitMutex(pMutex);
}
virtual ~CMutex() {
if (pMutex)
free(pMutex);
}
void lock(void) {
if (pMutex)
OSLockMutex(pMutex);
}
void unlock(void) {
if (pMutex)
OSUnlockMutex(pMutex);
}
BOOL tryLock(void) {
if (!pMutex)
return false;
return (OSTryLockMutex(pMutex) != 0);
}
private:
OSMutex *pMutex;
};
class CMutexLock {
public:
CMutexLock() {
mutex.lock();
}
virtual ~CMutexLock() {
mutex.unlock();
}
private:
CMutex mutex;
};
#endif // _CMUTEX_H_