[Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.8,1.9 gmidi.cpp,1.10,1.11 gmidi.h,1.3,1.4 imuse.cpp,1.16,1.17

James Brown ender at users.sourceforge.net
Thu Mar 21 08:27:30 CET 2002


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

Modified Files:
	adlib.cpp gmidi.cpp gmidi.h imuse.cpp 
Log Message:
Move some box stuff from scumm.h to new boxes.h
Also move some sound-related items from scumm.h to sound.h



Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adlib.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** adlib.cpp	20 Mar 2002 17:51:07 -0000	1.8
--- adlib.cpp	21 Mar 2002 16:12:02 -0000	1.9
***************
*** 22,26 ****
  #include "stdafx.h"
  #include "scumm.h"
- #include "sound.h"
  #include "fmopl.h"
  
--- 22,25 ----

Index: gmidi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/gmidi.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gmidi.cpp	20 Mar 2002 17:51:07 -0000	1.10
--- gmidi.cpp	21 Mar 2002 16:12:02 -0000	1.11
***************
*** 34,38 ****
  #include "stdafx.h"
  #include "scumm.h"
- #include "sound.h"
  #include "gmidi.h"
  
--- 34,37 ----

Index: gmidi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/gmidi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gmidi.h	16 Mar 2002 18:58:51 -0000	1.3
--- gmidi.h	21 Mar 2002 16:12:02 -0000	1.4
***************
*** 3,11 ****
  
  /* General Midi header file */
! 
! #define SEQ_MIDIPUTC    5       /* For timidity */
  #define SPECIAL_CHANNEL 9
  #define DEVICE_NUM 0
  
  #ifdef __APPLE__CW
  	#include <QuickTimeComponents.h>
--- 3,34 ----
  
  /* General Midi header file */
! #define SEQ_MIDIPUTC    5
  #define SPECIAL_CHANNEL 9
  #define DEVICE_NUM 0
  
+ /* Sound output type - MIDI */
+ enum {
+ 	MIDI_NULL = 0,
+ 	MIDI_WINDOWS = 1,
+ 	MIDI_TIMIDITY = 2,
+ 	MIDI_SEQ = 3,
+ 	MIDI_QTMUSIC = 4,
+ 	MIDI_AMIDI = 5
+ };
+ 
+ /* Roland to General Midi patch table. Still needs much work. */
+ static const byte mt32_to_gmidi[128] = {
+   0,   1,   2,   4,   4,   5,   5,   3,  16,  17,  18,  18,  19,
+   19,  20,  21,   6,   6,   6,   7,   7,   7,   8,   8,  62,  63,
+   62,  63,  38,  39,  38,  39,  88,  89,  52, 113,  97,  96,  91,
+   85,  14, 101,  68,  95,  86, 103,  88,  80,  48,  49,  51,  45,
+   40,  40,  42,  42,  43,  46,  46,  24,  25,  26,  27, 104,  32,
+   33,  34,  39,  36,  37,  38,  35,  79,  73,  72,  72,  74,  75,
+   64,  65,  66,  67,  71,  71,  68,  69,  70,  22,  56,  59,  57,
+   63,  60,  60,  58,  61,  61,  11,  11,  12,  88,   9,  14,  13,
+   12, 107, 111,  77,  78,  78,  76, 121,  47, 117, 127, 115, 118,
+  116, 118,  94, 115,   9,  55, 124, 123, 125, 126, 127
+ };
+ 
  #ifdef __APPLE__CW
  	#include <QuickTimeComponents.h>
***************
*** 42,60 ****
  	extern struct IOMidiRequest *ScummMidiRequest;
  #endif
- 
- /* Roland to General Midi patch table. Still needs much work. */
- static const byte mt32_to_gmidi[128] = {
-   0,   1,   2,   4,   4,   5,   5,   3,  16,  17,  18,  18,  19,
-   19,  20,  21,   6,   6,   6,   7,   7,   7,   8,   8,  62,  63,
-   62,  63,  38,  39,  38,  39,  88,  89,  52, 113,  97,  96,  91,
-   85,  14, 101,  68,  95,  86, 103,  88,  80,  48,  49,  51,  45,
-   40,  40,  42,  42,  43,  46,  46,  24,  25,  26,  27, 104,  32,
-   33,  34,  39,  36,  37,  38,  35,  79,  73,  72,  72,  74,  75,
-   64,  65,  66,  67,  71,  71,  68,  69,  70,  22,  56,  59,  57,
-   63,  60,  60,  58,  61,  61,  11,  11,  12,  88,   9,  14,  13,
-   12, 107, 111,  77,  78,  78,  76, 121,  47, 117, 127, 115, 118,
-  116, 118,  94, 115,   9,  55, 124, 123, 125, 126, 127
- };
- 
- 
  #endif	/* defined(gmidi_h) */
--- 65,67 ----

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** imuse.cpp	20 Mar 2002 17:51:07 -0000	1.16
--- imuse.cpp	21 Mar 2002 16:12:02 -0000	1.17
***************
*** 23,27 ****
  
  #include "scumm.h"
- #include "sound.h"
  
  int num_mix;
--- 23,26 ----





More information about the Scummvm-git-logs mailing list