diff options
-rw-r--r-- | common/system.cpp | 3 | ||||
-rw-r--r-- | graphics/dxa_player.cpp | 1 | ||||
-rw-r--r-- | graphics/dxa_player.h | 6 | ||||
-rw-r--r-- | gui/theme.cpp | 1 | ||||
-rw-r--r-- | gui/theme.h | 1 | ||||
-rw-r--r-- | sound/audiocd.cpp | 1 | ||||
-rw-r--r-- | sound/flac.cpp | 2 | ||||
-rw-r--r-- | sound/mixer.cpp | 1 | ||||
-rw-r--r-- | sound/mods/infogrames.cpp | 17 | ||||
-rw-r--r-- | sound/mods/infogrames.h | 17 | ||||
-rw-r--r-- | sound/mp3.cpp | 2 | ||||
-rw-r--r-- | sound/vorbis.cpp | 2 |
12 files changed, 26 insertions, 28 deletions
diff --git a/common/system.cpp b/common/system.cpp index 6ed9d46e12..d9bc027e91 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -126,10 +126,9 @@ FIXME: The config file loading code below needs to be cleaned up. Port specific variants should be pushed into the respective ports. Ideally, the default OSystem::openConfigFileForReading/Writing methods - should be removed completely. + should be removed completely. */ -#include "common/file.h" #ifdef __PLAYSTATION2__ #include "backends/platform/ps2/systemps2.h" diff --git a/graphics/dxa_player.cpp b/graphics/dxa_player.cpp index 28a1bc4dbd..f4c93a51f1 100644 --- a/graphics/dxa_player.cpp +++ b/graphics/dxa_player.cpp @@ -24,6 +24,7 @@ */ #include "common/endian.h" +#include "common/file.h" #include "graphics/dxa_player.h" #include "common/util.h" diff --git a/graphics/dxa_player.h b/graphics/dxa_player.h index 5415e440d2..dbe39bbcee 100644 --- a/graphics/dxa_player.h +++ b/graphics/dxa_player.h @@ -27,11 +27,7 @@ #define GRAPHICS_DXA_PLAYER_H #include "common/scummsys.h" -#include "common/file.h" - -namespace Common { - class File; -} +#include "common/stream.h" namespace Graphics { diff --git a/gui/theme.cpp b/gui/theme.cpp index c8501c4f91..5d1ce05fd4 100644 --- a/gui/theme.cpp +++ b/gui/theme.cpp @@ -24,6 +24,7 @@ #include "gui/theme.h" #include "gui/eval.h" +#include "common/file.h" #include "common/unzip.h" diff --git a/gui/theme.h b/gui/theme.h index 4f61609fbd..3201eefca0 100644 --- a/gui/theme.h +++ b/gui/theme.h @@ -28,7 +28,6 @@ #include "common/system.h" #include "common/rect.h" #include "common/str.h" -#include "common/file.h" #include "common/config-file.h" #include "graphics/surface.h" diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index 343d5bc440..8fc9100926 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -29,7 +29,6 @@ #include "sound/vorbis.h" #include "sound/flac.h" #include "engines/engine.h" -#include "common/file.h" #include "common/util.h" #include "common/system.h" diff --git a/sound/flac.cpp b/sound/flac.cpp index 51b75237a4..bb1a6fb4be 100644 --- a/sound/flac.cpp +++ b/sound/flac.cpp @@ -27,7 +27,7 @@ #ifdef USE_FLAC -#include "common/file.h" +#include "common/stream.h" #include "common/util.h" #include "sound/audiostream.h" diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 27e031f108..824143d829 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -23,7 +23,6 @@ * */ -#include "common/file.h" #include "common/util.h" #include "common/system.h" diff --git a/sound/mods/infogrames.cpp b/sound/mods/infogrames.cpp index 97987b037a..d5b285576a 100644 --- a/sound/mods/infogrames.cpp +++ b/sound/mods/infogrames.cpp @@ -25,6 +25,7 @@ #include "sound/mods/infogrames.h" #include "common/endian.h" +#include "common/file.h" namespace Audio { @@ -50,6 +51,14 @@ void Infogrames::Instruments::init() { _sampleData = 0; } +bool Infogrames::Instruments::load(const char *ins) { + Common::File f; + + if (f.open(ins)) + return load(f); + return false; +} + bool Infogrames::Instruments::load(Common::SeekableReadStream &ins) { int i; uint32 fsize; @@ -191,6 +200,14 @@ void Infogrames::reset() { _chn[i].cmdBlockIndices = 0; } +bool Infogrames::load(const char *dum) { + Common::File f; + + if (f.open(dum)) + return load(f); + return false; +} + bool Infogrames::load(Common::SeekableReadStream &dum) { int subSong = 0; int i; diff --git a/sound/mods/infogrames.h b/sound/mods/infogrames.h index 572c5a6426..d44ea0475c 100644 --- a/sound/mods/infogrames.h +++ b/sound/mods/infogrames.h @@ -28,7 +28,6 @@ #include "sound/mods/paula.h" #include "common/stream.h" -#include "common/file.h" namespace Audio { @@ -46,13 +45,7 @@ public: ~Instruments(); bool load(Common::SeekableReadStream &ins); - bool load(const char *ins) { - Common::File f; - - if (f.open(ins)) - return load(f); - return false; - } + bool load(const char *ins); void unload(void); uint8 getCount(void) const { return _count; } @@ -82,13 +75,7 @@ public: void setRepeating (int32 repCount) { _repCount = repCount; } bool load(Common::SeekableReadStream &dum); - bool load(const char *dum) { - Common::File f; - - if (f.open(dum)) - return load(f); - return false; - } + bool load(const char *dum); void unload(void); void restart(void) { if (_data) { diff --git a/sound/mp3.cpp b/sound/mp3.cpp index 70467bdb39..0249032e2f 100644 --- a/sound/mp3.cpp +++ b/sound/mp3.cpp @@ -27,7 +27,7 @@ #ifdef USE_MAD -#include "common/file.h" +#include "common/stream.h" #include "common/util.h" #include "sound/audiocd.h" diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index 64f67d2a13..da29b1b454 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -27,7 +27,7 @@ #ifdef USE_VORBIS -#include "common/file.h" +#include "common/stream.h" #include "common/util.h" #include "sound/audiostream.h" |