[Scummvm-cvs-logs] CVS: scummvm/sound gmidi.cpp,1.8,1.9 gmidi.h,1.2,1.3

[James Brown]

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

Modified Files:
	gmidi.cpp gmidi.h 
Log Message:
MorphOS port (sdl version) + endian fixes for big endian machines.



Index: gmidi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/gmidi.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gmidi.cpp	14 Mar 2002 13:28:32 -0000	1.8
--- gmidi.cpp	16 Mar 2002 18:58:51 -0000	1.9
***************
*** 1,3 ****
! /* ScummVM - Scumm Interpreter
   * Copyright (C) 2001 The ScummVM project
   *
--- 1,3 ----
!  /* ScummVM - Scumm Interpreter
   * Copyright (C) 2001 The ScummVM project
   *
***************
*** 23,28 ****
--- 23,33 ----
   * QuickTime support by Florent Boudet <flobo at ifrance.com>
   * Raw output support by Michael Pearce
+  * MorphOS support by Ruediger Hanke 
   */
  
+ #ifdef __MORPHOS__
+ #include <devices/timer.h>
+ #endif
+ 
  
  #include "stdafx.h"
***************
*** 54,57 ****
--- 59,64 ----
  			midiInitQuicktime();
  			break;
+ 		case MIDI_AMIDI:
+ 			break;
  		default:
  			DeviceType = 0;
***************
*** 83,86 ****
--- 90,96 ----
  			MidiOutQuicktime(_mo, b);
  			break;
+ 		case MIDI_AMIDI:
+ 			MidiOutMorphOS(_mo, b);
+ 			break;
  		default:
  			error("Invalid midi device type ");
***************
*** 137,141 ****
  int MidiDriver::connect_to_timidity(int port) {
  	int s = 0;
! #if !defined(__APPLE__CW)		// No socket support on Apple Carbon
  	struct hostent *serverhost;
  	struct sockaddr_in sadd;	
--- 147,151 ----
  int MidiDriver::connect_to_timidity(int port) {
  	int s = 0;
! #if !defined(__APPLE__CW) && !defined(__MORPHOS__)  // No socket support on Apple Carbon or Morphos
  	struct hostent *serverhost;
  	struct sockaddr_in sadd;	
***************
*** 338,341 ****
--- 348,370 ----
  #endif
  }
+ 
+ /*********** MorphOS            */
+ void MidiDriver::MidiOutMorphOS(void *a, int b) {
+ #ifdef __MORPHOS__
+       if( ScummMidiRequest ) {
+               ULONG midi_data = b;    // you never know about an int's size ;-)
+               ScummMidiRequest->amr_Std.io_Command = CMD_WRITE;
+               ScummMidiRequest->amr_Std.io_Data = &midi_data;
+               ScummMidiRequest->amr_Std.io_Length = 4;
+               DoIO( (struct IORequest *)ScummMidiRequest );
+       }
+ #endif
+ }
+ 
+ 
+ 
+ 
+ 
+ 
  
  void MidiDriver::midiInitNull() {warning("Music not enabled - MIDI support selected with no MIDI driver available. Try Adlib");}

Index: gmidi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/gmidi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gmidi.h	14 Mar 2002 08:04:21 -0000	1.2
--- gmidi.h	16 Mar 2002 18:58:51 -0000	1.3
***************
*** 31,34 ****
--- 31,45 ----
  #endif
  
+ #ifdef __MORPHOS__
+ 	#include <exec/types.h>
+ 	#include <devices/amidi.h>
+ 
+ 	#define NO_PPCINLINE_STDARG
+ 	#define NO_PPCINLINE_VARARGS
+ 	#include <clib/alib_protos.h>
+ 	#include <proto/exec.h>
+ 
+ 	extern struct IOMidiRequest *ScummMidiRequest;
+ #endif
  
  /* Roland to General Midi patch table. Still needs much work. */