aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
authorTravis Howell2007-07-28 07:52:24 +0000
committerTravis Howell2007-07-28 07:52:24 +0000
commitbb2796c57a5bd6cfb417340e6cfda141eee9342e (patch)
tree4492df3bc4a51286f9409fdd06acf8dfd73c1730 /engines/parallaction
parent3d434b12335fd70659d5a99dd1dfe83b2145323f (diff)
downloadscummvm-rg350-bb2796c57a5bd6cfb417340e6cfda141eee9342e.tar.gz
scummvm-rg350-bb2796c57a5bd6cfb417340e6cfda141eee9342e.tar.bz2
scummvm-rg350-bb2796c57a5bd6cfb417340e6cfda141eee9342e.zip
Add support for multi-tune Protracker modules used in the Amiga version of Waxworks.
svn-id: r28256
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/disk.h8
-rw-r--r--engines/parallaction/disk_br.cpp2
-rw-r--r--engines/parallaction/disk_ns.cpp4
-rw-r--r--engines/parallaction/sound.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index d910201f27..ae572b1122 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -62,7 +62,7 @@ public:
virtual void loadSlide(const char *filename) = 0;
virtual void loadScenery(const char* background, const char* mask) = 0;
virtual Table* loadTable(const char* name) = 0;
- virtual Common::ReadStream* loadMusic(const char* name) = 0;
+ virtual Common::SeekableReadStream* loadMusic(const char* name) = 0;
virtual Common::ReadStream* loadSound(const char* name) = 0;
};
@@ -154,7 +154,7 @@ public:
void loadSlide(const char *filename);
void loadScenery(const char* background, const char* mask);
Table* loadTable(const char* name);
- Common::ReadStream* loadMusic(const char* name);
+ Common::SeekableReadStream* loadMusic(const char* name);
Common::ReadStream* loadSound(const char* name);
};
@@ -188,7 +188,7 @@ public:
void loadSlide(const char *filename);
void loadScenery(const char* background, const char* mask);
Table* loadTable(const char* name);
- Common::ReadStream* loadMusic(const char* name);
+ Common::SeekableReadStream* loadMusic(const char* name);
Common::ReadStream* loadSound(const char* name);
};
@@ -222,7 +222,7 @@ public:
void loadSlide(const char *filename);
void loadScenery(const char* background, const char* mask);
Table* loadTable(const char* name);
- Common::ReadStream* loadMusic(const char* name);
+ Common::SeekableReadStream* loadMusic(const char* name);
Common::ReadStream* loadSound(const char* name);
};
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 07d9954f23..452b74be51 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -119,7 +119,7 @@ Table* DosDisk_br::loadTable(const char* name) {
return 0;
}
-Common::ReadStream* DosDisk_br::loadMusic(const char* name) {
+Common::SeekableReadStream* DosDisk_br::loadMusic(const char* name) {
debugC(5, kDebugDisk, "DosDisk_br::loadMusic");
return 0;
}
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index bf9b0277cb..e500cd519b 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -674,7 +674,7 @@ Table* DosDisk_ns::loadTable(const char* name) {
return t;
}
-Common::ReadStream* DosDisk_ns::loadMusic(const char* name) {
+Common::SeekableReadStream* DosDisk_ns::loadMusic(const char* name) {
char path[PATH_LEN];
sprintf(path, "%s.mid", name);
@@ -1427,7 +1427,7 @@ Font* AmigaDisk_ns::loadFont(const char* name) {
}
-Common::ReadStream* AmigaDisk_ns::loadMusic(const char* name) {
+Common::SeekableReadStream* AmigaDisk_ns::loadMusic(const char* name) {
return openArchivedFile(name);
}
diff --git a/engines/parallaction/sound.cpp b/engines/parallaction/sound.cpp
index 9976ec13a8..1026aa5f6a 100644
--- a/engines/parallaction/sound.cpp
+++ b/engines/parallaction/sound.cpp
@@ -379,7 +379,7 @@ void AmigaSoundMan::playMusic() {
debugC(1, kDebugAudio, "AmigaSoundMan::playMusic()");
- Common::ReadStream *stream = _vm->_disk->loadMusic(_musicFile);
+ Common::SeekableReadStream *stream = _vm->_disk->loadMusic(_musicFile);
_musicStream = Audio::makeProtrackerStream(stream);
delete stream;