[Scummvm-cvs-logs] CVS: scummvm/morphos morphos.cpp,1.1,1.2 morphos_sound.cpp,1.1,1.2

Ruediger Hanke tomjoad at users.sourceforge.net
Thu Apr 4 13:44:26 CEST 2002


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

Modified Files:
	morphos.cpp morphos_sound.cpp 
Log Message:
Removed some obsolete code

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** morphos.cpp	4 Apr 2002 12:54:27 -0000	1.1
--- morphos.cpp	4 Apr 2002 14:05:54 -0000	1.2
***************
*** 17,20 ****
--- 17,23 ----
   *
   * MorphOS interface
+  *
+  * $Header$
+  *
   */
  
***************
*** 50,56 ****
  #include <proto/cybergraphics.h>
  
- #ifdef __MORPHOS__
  #include <emul/emulinterface.h>
- #endif
  
  #include <time.h>
--- 53,57 ----
***************
*** 194,220 ****
  }
  
- /*void cd_playtrack( int track, int offset, int delay )
- {
- 	if( !CDrive && CDDABase )
- 	{
- 		CDrive = CDDA_FindNextDrive( NULL, FindCDTags );
- 		if( CDrive )
- 		{
- 			if( !CDDA_ObtainDrive( CDrive, CDDA_SHARED_ACCESS, NULL ) )
- 				CDrive = NULL;
- 		}
- 	}
- 
- 	if( CDrive && offset && delay )
- 	{
- 		double offs, del;
- 		offs = offset;
- 		del = delay;
- 		PlayTags[ 1 ].ti_Data = (ULONG)((offs * 7.5) - CDDATrackOffset);
- 		PlayTags[ 3 ].ti_Data = PlayTags[ 1 ].ti_Data + (ULONG)(del * 7.5);
- 		CDDA_Play( CDrive, PlayTags );
- 	}
- }*/
- 
  static int   cd_track = 0, cd_num_loops = 0, cd_start_frame = 0;
  static ULONG cd_end_time = 0;
--- 195,198 ----
***************
*** 427,431 ****
  		 pixfmt == PIXFMT_RGB16PC || pixfmt == PIXFMT_BGR16PC
  	  )
! 		col = ((col >> 8) & 0xff) | ((col << 8) & 0xff00);
  
  
--- 405,409 ----
  		 pixfmt == PIXFMT_RGB16PC || pixfmt == PIXFMT_BGR16PC
  	  )
! 		col = ((col >> 8) & 0xff) | ((col << 8) & 0xff00);	/* Not really sure about this?!?! */
  
  
***************
*** 497,512 ****
  	if( fullScreen )
  	{
- 		UBYTE depthstr[ 10 ];
- 		if( (ScummScale == 1) && (GetVar( "SCUMMVM_DEPTH", depthstr, 10, GVF_GLOBAL_ONLY ) > 0) )
- 		{
- 			ScummDepth = atoi( (char *)depthstr );
- 			mode = BestCModeIDTags( CYBRBIDTG_NominalWidth, 	ScummScrWidth,
- 											CYBRBIDTG_NominalHeight,   ScummScrHeight,
- 											CYBRBIDTG_Depth,   			ScummDepth,
- 											TAG_DONE
- 										 );
- 		}
- 		else
- 		{
  		for( i = ScummScale; mode == INVALID_ID && depths[ i ]; i++ )
  			mode = BestCModeIDTags( CYBRBIDTG_NominalWidth, 	ScummScrWidth,
--- 475,478 ----
***************
*** 516,520 ****
  										 );
  		ScummDepth = depths[ i-1 ];
- 		}
  
  		if( mode == INVALID_ID )
--- 482,485 ----

Index: morphos_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos_sound.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** morphos_sound.cpp	4 Apr 2002 12:54:27 -0000	1.1
--- morphos_sound.cpp	4 Apr 2002 14:05:54 -0000	1.2
***************
*** 17,20 ****
--- 17,23 ----
   *
   * MorphOS sound support
+  *
+  * $Header$
+  *
   */
  
***************
*** 164,172 ****
  
  
- #ifdef __MORPHOS__
  int morphos_music_thread( Scumm *s, ULONG MidiUnit, bool NoMusic )
- #else
- int morphos_music_thread()
- #endif
  {
  	int  old_time, cur_time;
--- 167,171 ----
***************
*** 262,266 ****
  				req->ahir_Std.io_Length  = AHI_BUF_SIZE;
  				req->ahir_Type				 = AHIST_M16S;
! 				req->ahir_Frequency		 = SAMPLES_PER_SEC/2;
  				req->ahir_Position  		 = 0x8000;
  				req->ahir_Volume			 = 0x10000;
--- 261,265 ----
  				req->ahir_Std.io_Length  = AHI_BUF_SIZE;
  				req->ahir_Type				 = AHIST_M16S;
! 				req->ahir_Frequency		 = SAMPLES_PER_SEC;
  				req->ahir_Position  		 = 0x8000;
  				req->ahir_Volume			 = 0x10000;





More information about the Scummvm-git-logs mailing list