[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.76,1.77 sound.h,1.4,1.5

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv31397

Modified Files:
	scummvm.cpp sound.h 
Log Message:
Added some new midi drivers - QuickTime Music and RawMidi.
-DUSE_RAWMIDI and -DUSE_QTMUSIC respectivly.

I assume these will compile - if not file a bug/patch. Also added a "-r" commandline parameter to turn on MT32 emulation... the patch conversion set isn't quite right, still..



Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** scummvm.cpp	12 Mar 2002 04:45:33 -0000	1.76
--- scummvm.cpp	14 Mar 2002 06:06:49 -0000	1.77
***************
*** 416,423 ****
  						"\tn       - no subtitles for speech\n" \
  						"\tb<num>  - start in room <num>\n" \
! 						"\tt<num>  - Set music tempo. Suggested: 1F0000\n" \
! 						"\ts<num>  - Set scale factor to <num> (1, 2, or 3 - 2 by default)\n" \
  						"\tp<path> - look for game in <path>\n" \
! 						"\tm<num> - Set music volume to <num> (0-100)\n" \
  						"\tf       - fullscreen mode\n" \
  						"\tg       - graphics mode. 1 for 2xSai anti-aliasing\n"
--- 416,424 ----
  						"\tn       - no subtitles for speech\n" \
  						"\tb<num>  - start in room <num>\n" \
! 						"\tt<num>  - set music tempo. Suggested: 1F0000\n" \
! 						"\ts<num>  - set scale factor to <num> (1, 2, or 3 - 2 by default)\n" \
  						"\tp<path> - look for game in <path>\n" \
! 						"\tm<num>  - set music volume to <num> (0-100)\n" \
! 						"\tr       - emulate roland mt32 instruments\n" \
  						"\tf       - fullscreen mode\n" \
  						"\tg       - graphics mode. 1 for 2xSai anti-aliasing\n"
***************
*** 492,495 ****
--- 493,503 ----
  						se->set_music_volume(atoi(s+1));					
                      goto NextArg;
+ 				}
+                 case 'r': {
+ 					SoundEngine *se = (SoundEngine*)_soundEngine;
+ 					
+ 					if (se)						
+ 						se->_mt32emulate = true;
+ 					break;
  				}
  				case 'g':

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sound.h	5 Mar 2002 23:37:31 -0000	1.4
--- sound.h	14 Mar 2002 06:06:49 -0000	1.5
***************
*** 18,21 ****
--- 18,27 ----
   * Change Log:
   * $Log$
+  * Revision 1.5  2002/03/14 06:06:49  ender
+  * Added some new midi drivers - QuickTime Music and RawMidi.
+  * -DUSE_RAWMIDI and -DUSE_QTMUSIC respectivly.
+  *
+  * I assume these will compile - if not file a bug/patch. Also added a "-r" commandline parameter to turn on MT32 emulation... the patch conversion set isn't quite right, still..
+  *
   * Revision 1.4  2002/03/05 23:37:31  ender
   * Adding music volume control.
***************
*** 396,405 ****
  	void adjust_priorities() {}
  
! 	bool wave_based() { return true; }
  };
  
  struct MidiSoundDriver : SoundDriver {
! 	void *_mo;
! 	bool _mt32emulate;
  	SoundEngine *_se;
  
--- 402,410 ----
  	void adjust_priorities() {}
  
! 	bool wave_based() { return true; }	
  };
  
  struct MidiSoundDriver : SoundDriver {
! 	void *_mo;	
  	SoundEngine *_se;
  
***************
*** 460,464 ****
  	bool _paused;
  	bool _active_volume_faders;
! 	bool _initialized;
  	byte _volume_fader_counter;
  
--- 465,469 ----
  	bool _paused;
  	bool _active_volume_faders;
! 	bool _initialized;	
  	byte _volume_fader_counter;
  
***************
*** 549,552 ****
--- 554,558 ----
  
  	SOUND_DRIVER_TYPE *driver() { return _driver; }
+ 	bool _mt32emulate;	
  };