[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.8,1.9

[James Brown]

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

Modified Files:
	mididrv.cpp 
Log Message:
Fix midi compilation - in more ways than one :P


Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mididrv.cpp	20 Apr 2002 18:53:45 -0000	1.8
--- mididrv.cpp	21 Apr 2002 04:14:42 -0000	1.9
***************
*** 348,351 ****
--- 348,352 ----
  #endif // __MORPHOS__
  
+ #if defined(UNIX)
  #define SEQ_MIDIPUTC    5
  #define SPECIAL_CHANNEL 9
***************
*** 382,386 ****
  	_mode=mode;
  	if (mode!=MO_SIMPLE) return MERR_STREAMING_NOT_AVAILABLE;
! #if !defined(__APPLE__CW)		// No getenv support on Apple Carbon
  	char *device_name = getenv("SCUMMVM_MIDI");
  	if (device_name != NULL) {
--- 383,387 ----
  	_mode=mode;
  	if (mode!=MO_SIMPLE) return MERR_STREAMING_NOT_AVAILABLE;
! 
  	char *device_name = getenv("SCUMMVM_MIDI");
  	if (device_name != NULL) {
***************
*** 398,402 ****
  			error("Cannot open /dev/null to dump midi output");
  	}
! #endif
  	return 0;
  }
--- 399,403 ----
  			error("Cannot open /dev/null to dump midi output");
  	}
! 
  	return 0;
  }
***************
*** 410,414 ****
  void MidiDriver_SEQ::send(uint32 b)
  {
! 	unsigned long buf[256];
  	int position = 0;
  
--- 411,415 ----
  void MidiDriver_SEQ::send(uint32 b)
  {
! 	unsigned char buf[256];
  	int position = 0;
  
***************
*** 420,432 ****
  	case 0xE0:
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = b;
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (b >> 8) & 0x7F;
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (b >> 16) & 0x7F;
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
--- 421,433 ----
  	case 0xE0:
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (unsigned char)b;
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (unsigned char)((b >> 8) & 0x7F);
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (unsigned char)((b >> 16) & 0x7F);
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
***************
*** 435,443 ****
  	case 0xD0:
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = b;
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (b >> 8) & 0x7F;
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
--- 436,444 ----
  	case 0xD0:
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (unsigned char)b;
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
  		buf[position++] = SEQ_MIDIPUTC;
! 		buf[position++] = (unsigned char)((b >> 8) & 0x7F);
  		buf[position++] = DEVICE_NUM;
  		buf[position++] = 0;
***************
*** 479,482 ****
--- 480,484 ----
  	return 0;
  }
+ #endif
  
  /* NULL driver */