[Scummvm-cvs-logs] SF.net SVN: scummvm:[43485] scummvm/trunk/engines/saga/music.cpp

[thebluegr at users.sourceforge.net]

Revision: 43485
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43485&view=rev
Author:   thebluegr
Date:     2009-08-17 18:25:51 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
Put back the code for playing external digital music, used by the MIDI enhancement project, which was removed in rev. #43480

Modified Paths:
--------------
    scummvm/trunk/engines/saga/music.cpp

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2009-08-17 18:23:05 UTC (rev 43484)
+++ scummvm/trunk/engines/saga/music.cpp	2009-08-17 18:25:51 UTC (rev 43485)
@@ -271,11 +271,25 @@
 		realTrackNumber = resourceId + 1;
 	}
 
+	// Try to open standalone digital track
+	char trackName[2][16];
+	sprintf(trackName[0], "track%d", realTrackNumber);
+	sprintf(trackName[1], "track%02d", realTrackNumber);
+	Audio::AudioStream *stream = 0;
+	for (int i = 0; i < 2; ++i) {
+		stream = Audio::AudioStream::openStreamFile(trackName[i], 0, 0, (flags == MUSIC_LOOP) ? 0 : 1);
+		if (stream) {
+			_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, stream);
+			_digitalMusic = true;
+			return;
+		}
+	}
+
 	if (_vm->getGameId() == GID_ITE) {
 		if (resourceId >= 9 && resourceId <= 34) {
 			if (_digitalMusicContext != NULL) {
 				loopStart = 0;
-				// fix ITE sunstatm/sunspot score
+				// Fix ITE sunstatm/sunspot score
 				if (resourceId == MUSIC_SUNSPOT)
 					loopStart = 4 * 18727;
 


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