[Scummvm-cvs-logs] SF.net SVN: scummvm: [24386] scummvm/trunk/engines/agos/agos.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Thu Oct 19 07:28:09 CEST 2006


Revision: 24386
          http://svn.sourceforge.net/scummvm/?rev=24386&view=rev
Author:   kirben
Date:     2006-10-18 22:28:05 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Ooops, disable code for loading modules

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-19 05:21:07 UTC (rev 24385)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-19 05:28:05 UTC (rev 24386)
@@ -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 @@
 	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 @@
 			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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list