[Scummvm-cvs-logs] CVS: scummvm/morphos morphos.cpp,1.11,1.12 morphos_sound.cpp,1.7,1.8

Ruediger Hanke tomjoad at users.sourceforge.net
Fri Apr 19 03:19:03 CEST 2002


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

Modified Files:
	morphos.cpp morphos_sound.cpp 
Log Message:
Fix freeze on exit bug when using MIDI music, removed no longer required headers

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** morphos.cpp	18 Apr 2002 21:40:24 -0000	1.11
--- morphos.cpp	19 Apr 2002 10:18:12 -0000	1.12
***************
*** 170,174 ****
  	if( ScummMusicThread )
  	{
! 		Signal( (struct Task *)ScummMusicThread, SIGBREAKF_CTRL_F );
  		ObtainSemaphore( &ScummMusicThreadRunning );		/* Wait for thread to finish */
  		ReleaseSemaphore( &ScummMusicThreadRunning );
--- 170,174 ----
  	if( ScummMusicThread )
  	{
! 		Signal( (struct Task *)ScummMusicThread, SIGBREAKF_CTRL_C );
  		ObtainSemaphore( &ScummMusicThreadRunning );		/* Wait for thread to finish */
  		ReleaseSemaphore( &ScummMusicThreadRunning );

Index: morphos_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos_sound.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** morphos_sound.cpp	18 Apr 2002 21:40:24 -0000	1.7
--- morphos_sound.cpp	19 Apr 2002 10:18:12 -0000	1.8
***************
*** 22,31 ****
   */
  
- #include <devices/timer.h>
- 
  #include "stdafx.h"
  #include "scumm.h"
- #include "mididrv.h"
- #include "imuse.h"
  
  #include <dos/dos.h>
--- 22,27 ----





More information about the Scummvm-git-logs mailing list