aboutsummaryrefslogtreecommitdiff
path: root/sound/mods/infogrames.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2008-09-05 11:41:39 +0000
committerNicola Mettifogo2008-09-05 11:41:39 +0000
commit12106a159912055d77668f8436c1a1e87d6c0f4e (patch)
tree102603ccde53c12975cb3010cc37e34ad52bc025 /sound/mods/infogrames.cpp
parent5c0b91397d559f0a62412a135324f974e50a18eb (diff)
downloadscummvm-rg350-12106a159912055d77668f8436c1a1e87d6c0f4e.tar.gz
scummvm-rg350-12106a159912055d77668f8436c1a1e87d6c0f4e.tar.bz2
scummvm-rg350-12106a159912055d77668f8436c1a1e87d6c0f4e.zip
Removed useless dependencies from common/file.h in common code. When complete removal was not possibile, dependency has been pushed to the cpp files from the headers.
svn-id: r34343
Diffstat (limited to 'sound/mods/infogrames.cpp')
-rw-r--r--sound/mods/infogrames.cpp17
1 files changed, 17 insertions, 0 deletions
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;