aboutsummaryrefslogtreecommitdiff
path: root/sound/decoders
diff options
context:
space:
mode:
authorAlejandro Marzini2010-06-09 20:09:57 +0000
committerAlejandro Marzini2010-06-09 20:09:57 +0000
commite991cd8c53ad21af037df1e0a16816aeea2d0fe2 (patch)
treef647f636fc3898c150db61de50c3522056a65d17 /sound/decoders
parent4177a1e16df7712c081e41a8eabf0b7d4694230b (diff)
downloadscummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.tar.gz
scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.tar.bz2
scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.zip
- Revised abstract AudioCDManager.
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem. - Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL. svn-id: r49548
Diffstat (limited to 'sound/decoders')
-rw-r--r--sound/decoders/flac.cpp1
-rw-r--r--sound/decoders/mp3.cpp1
-rw-r--r--sound/decoders/vorbis.cpp1
3 files changed, 0 insertions, 3 deletions
diff --git a/sound/decoders/flac.cpp b/sound/decoders/flac.cpp
index 91c48199e3..fb9499e31f 100644
--- a/sound/decoders/flac.cpp
+++ b/sound/decoders/flac.cpp
@@ -32,7 +32,6 @@
#include "common/util.h"
#include "sound/audiostream.h"
-#include "sound/audiocd.h"
#define FLAC__NO_DLL // that MS-magic gave me headaches - just link the library you like
#include <FLAC/export.h>
diff --git a/sound/decoders/mp3.cpp b/sound/decoders/mp3.cpp
index 732ae58b67..2f0419d35e 100644
--- a/sound/decoders/mp3.cpp
+++ b/sound/decoders/mp3.cpp
@@ -31,7 +31,6 @@
#include "common/stream.h"
#include "common/util.h"
-#include "sound/audiocd.h"
#include "sound/audiostream.h"
#include <mad.h>
diff --git a/sound/decoders/vorbis.cpp b/sound/decoders/vorbis.cpp
index 64869d7843..a8ac7784f5 100644
--- a/sound/decoders/vorbis.cpp
+++ b/sound/decoders/vorbis.cpp
@@ -32,7 +32,6 @@
#include "common/util.h"
#include "sound/audiostream.h"
-#include "sound/audiocd.h"
#ifdef USE_TREMOR
#if defined(ANDROID) || defined(__GP32__) // custom libtremor locations