[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.104,2.105 imuse.h,1.49,1.50

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26311/scumm

Modified Files:
	imuse.cpp imuse.h 
Log Message:
Preliminary preparation for new YM2612 FM emulator.
All the hooks are in, but actual implementation
needs to be checked for portability.

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -d -r2.104 -r2.105
--- imuse.cpp	3 Oct 2003 18:33:54 -0000	2.104
+++ imuse.cpp	5 Oct 2003 15:35:31 -0000	2.105
@@ -54,6 +54,7 @@
 _tempoFactor(0),
 _player_limit(ARRAYSIZE(_players)),
 _recycle_players(false),
+_direct_passthrough(false),
 _queue_end(0),
 _queue_pos(0),
 _queue_sound(0),
@@ -250,7 +251,7 @@
 		return false;
 
 	player->clear();
-	return player->startSound(sound, driver);
+	return player->startSound(sound, driver, _direct_passthrough);
 }
 
 
@@ -1117,10 +1118,14 @@
 		break;
 
 	case IMuse::PROP_RECYCLE_PLAYERS:
-		if (value > 0 && value <= ARRAYSIZE(_players))
-			_recycle_players = (value != 0);
+		_recycle_players = (value != 0);
+		break;
+
+	case IMuse::PROP_DIRECT_PASSTHROUGH:
+		_direct_passthrough = (value != 0);
 		break;
 	}
+
 	return 0;
 }
 

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- imuse.h	3 Oct 2003 18:33:54 -0000	1.49
+++ imuse.h	5 Oct 2003 15:35:31 -0000	1.50
@@ -51,12 +51,13 @@
 	~IMuse();
 
 	enum {
-		PROP_TEMPO_BASE = 1,
-		PROP_NATIVE_MT32 = 2,
-		PROP_MULTI_MIDI = 3,
-		PROP_OLD_ADLIB_INSTRUMENTS = 4,
-		PROP_LIMIT_PLAYERS = 5,
-		PROP_RECYCLE_PLAYERS = 6
+		PROP_TEMPO_BASE,
+		PROP_NATIVE_MT32,
+		PROP_MULTI_MIDI,
+		PROP_OLD_ADLIB_INSTRUMENTS,
+		PROP_LIMIT_PLAYERS,
+		PROP_RECYCLE_PLAYERS,
+		PROP_DIRECT_PASSTHROUGH
 	};
 
 	void on_timer(MidiDriver *midi);