From 29a5c6a45b90e64cf5d618da4cdcd6e6da3425fb Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Wed, 18 Aug 2010 21:38:43 +0000
Subject: SCUMM/FM-TOWNS: start rewriting audio code

- Start rewriting audio code for FM-TOWNS versions of Loom, Indy3 and Monkey Island 1 using the recently added code in towns_audio.cpp (Zak should work the same way, but I can't test, since I don't own that one).
- All sound types (pcm, euphony and cd audio) now support volume and balance control (e.g. try walking into/out of the kitchen and opening/closing the door in the Scumm Bar in Monkey Island 1 or walking into/out of the circus tent).
- Pcm sounds now support proper loop start/end and note offsets (e.g. try out the hammer sound in the forge in LOOM for example).
- some other minor improvements
- The FM-Towns versions of Indy 4 and Monkey Island 2 are not affected. I don't have Monkey Island 2, but I presume that it will work like Indy 4. Adding support for these will be a separate task, since they work quite differently.

svn-id: r52198
---
 engines/scumm/imuse/imuse_player.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/imuse/imuse_player.cpp')

diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 73aec472e4..6b38f80df1 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -47,7 +47,6 @@ namespace Scumm {
 #define PERCUSSION_CHANNEL 9
 
 extern MidiParser *MidiParser_createRO();
-extern MidiParser *MidiParser_createEUP();
 
 uint16 Player::_active_notes[128];
 
@@ -195,7 +194,11 @@ int Player::start_seq_sound(int sound, bool reset_vars) {
 		_parser = MidiParser_createRO();
 	} else if (!memcmp(ptr, "SO", 2)) {
 		// Euphony (FM-TOWNS) resource
-		_parser = MidiParser_createEUP();
+		
+		//////////// REMOVE
+		//_parser = MidiParser_createEUP();
+		///////////
+
 	} else if (!memcmp(ptr, "FORM", 4)) {
 		// Humongous Games XMIDI resource
 		_parser = MidiParser::createParser_XMIDI();
-- 
cgit v1.2.3


From a48e19eaef1ce4cad6b877acc7b330a224280405 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Sat, 18 Sep 2010 11:26:10 +0000
Subject: SCUMM: minor cleanup

svn-id: r52792
---
 engines/scumm/imuse/imuse_player.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'engines/scumm/imuse/imuse_player.cpp')

diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 6b38f80df1..a90915e438 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -192,13 +192,6 @@ int Player::start_seq_sound(int sound, bool reset_vars) {
 	if (!memcmp(ptr, "RO", 2)) {
 		// Old style 'RO' resource
 		_parser = MidiParser_createRO();
-	} else if (!memcmp(ptr, "SO", 2)) {
-		// Euphony (FM-TOWNS) resource
-		
-		//////////// REMOVE
-		//_parser = MidiParser_createEUP();
-		///////////
-
 	} else if (!memcmp(ptr, "FORM", 4)) {
 		// Humongous Games XMIDI resource
 		_parser = MidiParser::createParser_XMIDI();
-- 
cgit v1.2.3