aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2006-10-19 05:28:05 +0000
committerTravis Howell2006-10-19 05:28:05 +0000
commited3c6871f967ab15321df14ca6a026e08d96fae1 (patch)
tree0940e92c5cf25a0210b23c92bd651456fa1a3053 /engines
parent6e872547c30d8de61c6e1353ec9f74c693b75b29 (diff)
downloadscummvm-rg350-ed3c6871f967ab15321df14ca6a026e08d96fae1.tar.gz
scummvm-rg350-ed3c6871f967ab15321df14ca6a026e08d96fae1.tar.bz2
scummvm-rg350-ed3c6871f967ab15321df14ca6a026e08d96fae1.zip
Ooops, disable code for loading modules
svn-id: r24386
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/agos.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 9ba0de5caf..92c6acc138 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -34,7 +34,6 @@
#include "agos/vga.h"
#include "sound/mididrv.h"
-#include "sound/mod.h"
#ifdef PALMOS_68K
#include "globals.h"
@@ -2435,7 +2434,9 @@ void AGOSEngine::loadMusic(uint music) {
if (getPlatform() == Common::kPlatformAtariST) {
// TODO: Add support for music format used by Elvira 2
} else if (getPlatform() == Common::kPlatformAmiga) {
- Audio::AudioStream *modStream;
+ /*
+ _modPlayer->stop();
+
char filename[15];
File f;
@@ -2462,13 +2463,12 @@ void AGOSEngine::loadMusic(uint music) {
free(srcBuf);
Common::MemoryReadStream stream(dstBuf, dstSize);
- modStream = Audio::makeMODStream(&stream);
+ _modPlayer->loadModuleStream(stream);
} else {
- modStream = Audio::makeMODStream(&f);
- }
-
- _mixer->stopAll();
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, modStream);
+ _modPlayer->loadModuleStream(f);
+ }
+ _modPlayer->start();
+ */
} else if (getGameType() == GType_SIMON2) {
midi.stop();
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music - 1], SEEK_SET);