thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: sync with scummvm

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-06-09 11:17:15 +02:00
parent 0c962164d4
commit 7329a5d164
126 changed files with 2443 additions and 1679 deletions
Download patch file Download diff file Expand all files Collapse all files

48
backends/modular-backend.cpp
View file

@ -20,46 +20,29 @@
*
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_exit
#include "backends/modular-backend.h"
#include "backends/fs/fs-factory.h"
#include "backends/audiocd/audiocd.h"
#include "backends/graphics/graphics.h"
#include "backends/mutex/mutex.h"
#include "audio/mixer.h"
#include "common/events.h"
#include "gui/message.h"
#include "graphics/pixelformat.h"
ModularBackend::ModularBackend()
:
_fsFactory(0),
_eventManager(0),
_savefileManager(0),
_timerManager(0),
_mutexManager(0),
_graphicsManager(0),
_mixer(0),
_audiocdManager(0) {
_mixer(0) {
}
ModularBackend::~ModularBackend() {
delete _fsFactory;
_fsFactory = 0;
delete _graphicsManager;
_graphicsManager = 0;
delete _eventManager;
_eventManager = 0;
delete _mixer;
_mixer = 0;
delete _audiocdManager;
_audiocdManager = 0;
delete _savefileManager;
_savefileManager = 0;
delete _timerManager;
_timerManager = 0;
delete _mutexManager;
_mutexManager = 0;
}
@ -145,16 +128,6 @@ void ModularBackend::setMouseCursor(const byte *buf, uint w, uint h, int hotspot
_graphicsManager->setMouseCursor(buf, w, h, hotspotX, hotspotY, keycolor, cursorTargetScale, format);
}
Common::TimerManager *ModularBackend::getTimerManager() {
assert(_timerManager);
return _timerManager;
}
Common::EventManager *ModularBackend::getEventManager() {
assert(_eventManager);
return _eventManager;
}
OSystem::MutexRef ModularBackend::createMutex() {
assert(_mutexManager);
return _mutexManager->createMutex();
@ -180,21 +153,10 @@ Audio::Mixer *ModularBackend::getMixer() {
return (Audio::Mixer *)_mixer;
}
AudioCDManager *ModularBackend::getAudioCDManager() {
assert(_audiocdManager);
return _audiocdManager;
}
void ModularBackend::displayMessageOnOSD(const char *msg) {
_graphicsManager->displayMessageOnOSD(msg);
}
Common::SaveFileManager *ModularBackend::getSavefileManager() {
assert(_savefileManager);
return _savefileManager;
}
FilesystemFactory *ModularBackend::getFilesystemFactory() {
assert(_fsFactory);
return _fsFactory;
void ModularBackend::quit() {
exit(0);
}