I forgot what were the changes exactly... Oh well.

gameblabla · Dec 3, 2020 · e16426d · e16426d
1 parent 2587ba2
commit e16426d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/shell/audio/alsa/sound_output.c b/shell/audio/alsa/sound_output.c
@@ -38,6 +38,8 @@ uint32_t Audio_Init()
 
 #ifdef FRAMESKIP
 	snd_pcm_nonblock(handle, 1);
+#else
+	snd_pcm_nonblock(handle, 0);
 #endif
 
 	/* Allocate a hardware parameters object. */

diff --git a/shell/emu/core.c b/shell/emu/core.c
@@ -113,7 +113,7 @@ void reset(void)
 
 static int LoadGame_NGP(const char *name)
 {
-	long size;
+	size_t size;
 	FILE* fp;
 
 	fp = fopen(name, "rb");
@@ -271,7 +271,7 @@ static uint32_t Timer_Read(void)
   	gettimeofday(&tval, 0);
 	return (((tval.tv_sec*1000000) + (tval.tv_usec)));
 }
-static long lastTick = 0, newTick;
+static uint32_t lastTick = 0, newTick;
 static uint32_t SkipCnt = 0, FPS = 60, FrameSkip = 0;
 static const uint32_t TblSkip[5][5] = {
     {0, 0, 0, 0, 0},

diff --git a/shell/headers/shared.h b/shell/headers/shared.h
@@ -6,28 +6,28 @@
 #define SOUND_SAMPLES_SIZE 1024
 #define DEADZONE_AXIS 8192
 #elif defined(RS97)
-#define SOUND_OUTPUT_FREQUENCY 22050
-#define SOUND_SAMPLES_SIZE 1024
+#define SOUND_OUTPUT_FREQUENCY 44100
+#define SOUND_SAMPLES_SIZE 2048
 #define DEADZONE_AXIS 8192
 #elif defined(ARCADEMINI)
-#define SOUND_OUTPUT_FREQUENCY 22050
-#define SOUND_SAMPLES_SIZE 1024
+#define SOUND_OUTPUT_FREQUENCY 44100
+#define SOUND_SAMPLES_SIZE 2048
 #define DEADZONE_AXIS 8192
 #elif defined(RETROSTONE_1)
 #define SOUND_OUTPUT_FREQUENCY 48000
-#define SOUND_SAMPLES_SIZE 2048
+#define SOUND_SAMPLES_SIZE 4096
 #define DEADZONE_AXIS 8192
 #elif defined(RETROSTONE_2)
 #define SOUND_OUTPUT_FREQUENCY 48000
-#define SOUND_SAMPLES_SIZE 2048
+#define SOUND_SAMPLES_SIZE 4096
 #define DEADZONE_AXIS 8192
 #elif defined(GCW0)
 #define SOUND_OUTPUT_FREQUENCY 44100
-#define SOUND_SAMPLES_SIZE 1024
+#define SOUND_SAMPLES_SIZE 2048
 #define DEADZONE_AXIS 8192
 #else
 #define SOUND_OUTPUT_FREQUENCY 48000
-#define SOUND_SAMPLES_SIZE 2048
+#define SOUND_SAMPLES_SIZE 4096
 #define DEADZONE_AXIS 8192
 #endif
 

diff --git a/shell/menu/generic/menu.c b/shell/menu/generic/menu.c
@@ -241,8 +241,7 @@ static void Input_Remapping()
                 default:
 					SDL_FillRect( backbuffer, NULL, 0 );
 					print_string("Please press button for mapping", TextWhite, TextBlue, 37, 108, backbuffer->pixels);
-					bitmap_scale(0,0,320,240,HOST_WIDTH_RESOLUTION,HOST_HEIGHT_RESOLUTION,backbuffer->w,0,(uint16_t* restrict)backbuffer->pixels,(uint16_t* restrict)sdl_screen->pixels);
-					SDL_Flip(sdl_screen);
+					Update_Video_Menu();
 					exit_map = 0;
 					while( !exit_map )
 					{

diff --git a/shell/video/rs97/video_blit.c b/shell/video/rs97/video_blit.c
@@ -38,9 +38,6 @@ void Init_Video()
 	SDL_ShowCursor(0);
 
 	sdl_screen = SDL_SetVideoMode(320, 240, 16, SDL_HWSURFACE
-	#ifdef SDL_TRIPLEBUF
-	| SDL_TRIPLEBUF
-	#endif
 	);
 
 	backbuffer = SDL_CreateRGBSurface(SDL_SWSURFACE, HOST_WIDTH_RESOLUTION, HOST_HEIGHT_RESOLUTION, 16, 0,0,0,0);