[Atsoft-commit] CVS: dcgen/main gensoundp-kos.c,1.2,1.3 ui-kos.c,1.4,1.5

[Mike D. <at...@us...>]

Update of /cvsroot/atsoft/dcgen/main
In directory usw-pr-cvs1:/tmp/cvs-serv5206/main

Modified Files:
	gensoundp-kos.c ui-kos.c 
Log Message:
See ChangeLog


Index: gensoundp-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/gensoundp-kos.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gensoundp-kos.c	26 Jan 2002 03:51:44 -0000	1.2
--- gensoundp-kos.c	12 Feb 2002 05:56:20 -0000	1.3
***************
*** 129,132 ****
--- 129,135 ----
    buffered_samples = 0;
    sound_playing = 0;
+ 	// For right now the sound is entirely disabled.
+ 	// The sound is to be worked on again in the near future.
+   return;
    if(audio_buffer == NULL)
    {
***************
*** 152,155 ****
--- 155,161 ----
  void soundp_stop(void)
  {
+ 	// For right now the sound is entirely disabled.
+ 	// The sound is to be worked on again in the near future.
+   return;
    if(sound_playing)
    {
***************
*** 165,169 ****
  int soundp_samplesbuffered(void)
  {
!   return buffered_samples;
  }
  
--- 171,179 ----
  int soundp_samplesbuffered(void)
  {
! 	// Right now this is hacked to return a value that will not force
! 	// a wait situation for the audio to catch up.  For right now the
! 	// sound is entirely disabled.  The sound is to be worked on again
! 	// in the near future.
!   return 6;
  }
  
***************
*** 171,174 ****
--- 181,187 ----
  {
    unsigned int i;
+ 	// For right now the sound is entirely disabled.
+ 	// The sound is to be worked on again in the near future.
+   return;
    //printf("received %u samples\n", samples);
    /* device is odd and is different to host endianness */

Index: ui-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ui-kos.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ui-kos.c	10 Feb 2002 22:41:06 -0000	1.4
--- ui-kos.c	12 Feb 2002 05:56:20 -0000	1.5
***************
*** 11,15 ****
  #include "event.h"
  #include "state.h"
- #include "initcart.h"
  
  // General Video options:
--- 11,14 ----
***************
*** 41,45 ****
  enum 
  {
! 	SCREEN_100, SCREEN_200, SCREEN_FULL
  } ui_screenmode = SCREEN_200;
  
--- 40,44 ----
  enum 
  {
! 	SCREEN_100, SCREEN_200
  } ui_screenmode = SCREEN_200;
  
***************
*** 167,170 ****
--- 166,171 ----
      if(!cond.ltrig && cond.rtrig)
      {
+       ui_vdpsimple = !ui_vdpsimple;
+       /*
        if(ui_rendermode == PALETTED_TXR)
        {
***************
*** 175,178 ****
--- 176,180 ----
          ui_rendermode = PALETTED_TXR; 
        }
+       */
      }
      else if(cond.ltrig && !cond.rtrig)
***************
*** 220,223 ****
--- 222,226 ----
  		pals[i + 64] = (r << 10) | (g << 5) | (b) | 0x510;
  		pals[i + 128] = (r << 10) | (g << 5) | (b);
+ 		vdp_cramf[i] = 0;
  	}
  	if(ui_rendermode != PALETTED_TXR) return;
***************
*** 244,248 ****
    unsigned char *s = (unsigned char *)src;
    unsigned int *d = (unsigned int *)(void *)
!     (0xe0000000 | (((unsigned long)dest) & 0x03ffffc0));
    QACR0 = ((0xa4000000>>26)<<2)&0x1c;
    QACR1 = ((0xa4000000>>26)<<2)&0x1c;
--- 247,251 ----
    unsigned char *s = (unsigned char *)src;
    unsigned int *d = (unsigned int *)(void *)
!     (0xe0000000 | (((unsigned long)dest) & 0x03ffffe0));
    QACR0 = ((0xa4000000>>26)<<2)&0x1c;
    QACR1 = ((0xa4000000>>26)<<2)&0x1c;
***************
*** 311,328 ****
  		vdp_renderframe(&screen[0], 512);
  	}
! 	if(ui_screenmode == SCREEN_200)
  	{
! 		y_size <<= 1;
! 		x_size <<= 1;
  	}
! 	else if(ui_screenmode == SCREEN_FULL)
  	{
  		y_size = 480;
  		x_size = 640;
- 	}
- 	else
- 	{
- 		x = 160;
- 		y = 80;
  	}
  	// on a VGA cable we need to offset by 40.
--- 314,326 ----
  		vdp_renderframe(&screen[0], 512);
  	}
! 	if(ui_screenmode == SCREEN_100)
  	{
! 		x = 160;
! 		y = 80;
  	}
! 	else
  	{
  		y_size = 480;
  		x_size = 640;
  	}
  	// on a VGA cable we need to offset by 40.