libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 20:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BACKENDS: Move implementation of OSystem::quit() out of ModularBackend

Browse Source
This commit is contained in:
Cameron Cawley 2019-11-05 22:19:47 +00:00 committed by Filippos Karapetis
parent aee09409e8
commit 48615cb83e
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backends/modular-backend.cpp
View File

@ -20,8 +20,6 @@
*
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_exit
#include "backends/modular-backend.h"
#include "backends/graphics/graphics.h"
@ -277,7 +275,3 @@ void ModularBackend::displayMessageOnOSD(const char *msg) {
void ModularBackend::displayActivityIconOnOSD(const Graphics::Surface *icon) {
_graphicsManager->displayActivityIconOnOSD(icon);
}
void ModularBackend::quit() {
exit(0);
}

2
backends/modular-backend.h
View File

@ -40,6 +40,7 @@ class MutexManager;
* OSystem::getMillis()
* OSystem::delayMillis()
* OSystem::getTimeAndDate()
* OSystem::quit()
*
* And, it should also initialize all the managers variables
* declared in this class, or override their related functions.
@ -133,7 +134,6 @@ public:
/** @name Miscellaneous */
//@{
virtual void quit() override;
virtual void displayMessageOnOSD(const char *msg) override;
virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override;

7
backends/platform/null/null.cpp
View File

@ -27,6 +27,7 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_stdout
#define FORBIDDEN_SYMBOL_EXCEPTION_stderr
#define FORBIDDEN_SYMBOL_EXCEPTION_fputs
#define FORBIDDEN_SYMBOL_EXCEPTION_exit
#include "backends/modular-backend.h"
#include "base/main.h"
@ -67,6 +68,8 @@ public:
virtual void delayMillis(uint msecs);
virtual void getTimeAndDate(TimeDate &t) const {}
virtual void quit();
virtual void logMessage(LogMessageType::Type type, const char *message);
};
@ -115,6 +118,10 @@ uint32 OSystem_NULL::getMillis(bool skipRecord) {
void OSystem_NULL::delayMillis(uint msecs) {
}
void OSystem_NULL::quit() {
exit(0);
}
void OSystem_NULL::logMessage(LogMessageType::Type type, const char *message) {
FILE *output = 0;

6
backends/platform/tizen/system.cpp
View File

@ -20,6 +20,8 @@
*
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_exit
#include <FUiCtrlMessageBox.h>
#include <FLocales.h>
@ -454,6 +456,10 @@ void TizenSystem::exitSystem() {
}
}
void TizenSystem::quit() {
exit(0);
}
void TizenSystem::logMessage(LogMessageType::Type type, const char *message) {
if (type == LogMessageType::kError) {
systemError(message);

1
backends/platform/tizen/system.h
View File

@ -86,6 +86,7 @@ private:
void delayMillis(uint msecs);
void getTimeAndDate(TimeDate &t) const;
void fatalError();
void quit();
void logMessage(LogMessageType::Type type, const char *message);
void addSysArchivesToSearchSet(Common::SearchSet &s, int priority);