aboutsummaryrefslogtreecommitdiff
path: root/backends/modular-backend.cpp
diff options
context:
space:
mode:
authorMax Horn2011-06-06 15:02:33 +0200
committerMax Horn2011-06-06 15:02:33 +0200
commitafb06b51cceb96cf3ac2baae1f562c673114d108 (patch)
tree6bf1c1768ab3de4034d1ddc44f32dce6259126bc /backends/modular-backend.cpp
parent338a859591c676eab46b1fc3523bc85bce8c15e2 (diff)
downloadscummvm-rg350-afb06b51cceb96cf3ac2baae1f562c673114d108.tar.gz
scummvm-rg350-afb06b51cceb96cf3ac2baae1f562c673114d108.tar.bz2
scummvm-rg350-afb06b51cceb96cf3ac2baae1f562c673114d108.zip
BACKENDS: Unify AudioCD manager instantiation
Diffstat (limited to 'backends/modular-backend.cpp')
-rw-r--r--backends/modular-backend.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index a1c227b33f..d56c9479b9 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -25,7 +25,6 @@
#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"
@@ -42,8 +41,7 @@ ModularBackend::ModularBackend()
_timerManager(0),
_mutexManager(0),
_graphicsManager(0),
- _mixer(0),
- _audiocdManager(0) {
+ _mixer(0) {
}
@@ -56,8 +54,6 @@ ModularBackend::~ModularBackend() {
_eventManager = 0;
delete _mixer;
_mixer = 0;
- delete _audiocdManager;
- _audiocdManager = 0;
delete _savefileManager;
_savefileManager = 0;
delete _timerManager;
@@ -257,11 +253,6 @@ Audio::Mixer *ModularBackend::getMixer() {
return (Audio::Mixer *)_mixer;
}
-AudioCDManager *ModularBackend::getAudioCDManager() {
- assert(_audiocdManager);
- return _audiocdManager;
-}
-
void ModularBackend::displayMessageOnOSD(const char *msg) {
_graphicsManager->displayMessageOnOSD(msg);
}