X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=frontend%2Flibretro.c;h=92bf1b9b9c3eaad527ed6ee7366980430fe63f88;hb=49c61096e871833d8e77397f1d3072b58b943887;hp=4527f863aadc9846b07b7bd598c93acaae44fc10;hpb=358a8764ccdab8d5228c0c8c958fa7c0ff45f4a0;p=pcsx_rearmed.git

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4527f863..92bf1b9b 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -54,6 +54,8 @@ static retro_input_state_t input_state_cb;
 static retro_environment_t environ_cb;
 static retro_audio_sample_batch_t audio_batch_cb;
 static struct retro_rumble_interface rumble;
+static struct retro_log_callback logging;
+static retro_log_printf_t log_cb;
 
 static void *vout_buf;
 static void * vout_buf_ptr;
@@ -129,24 +131,26 @@ static void init_memcard(char *mcd_data)
 	}
 }
 
-static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
+static void set_vout_fb()
 {
-	vout_width = w;
-	vout_height = h;
-
   struct retro_framebuffer fb = {0};
 
   fb.width           = vout_width;
   fb.height          = vout_height;
   fb.access_flags    = RETRO_MEMORY_ACCESS_WRITE;
 
-  vout_buf_ptr = vout_buf;
-
   if (environ_cb(RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER, &fb) && fb.format == RETRO_PIXEL_FORMAT_RGB565)
-  {
-     vout_buf_ptr  = (uint16_t*)fb.data;
-  }
+     vout_buf_ptr = (uint16_t*)fb.data;
+  else
+     vout_buf_ptr = vout_buf;
+}
+
+static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
+{
+  vout_width = w;
+  vout_height = h;
 
+  set_vout_fb();
 }
 
 #ifndef FRONTEND_SUPPORTS_RGB565
@@ -435,7 +439,7 @@ void retro_set_environment(retro_environment_t cb)
 {
    static const struct retro_variable vars[] = {
       { "pcsx_rearmed_frameskip", "Frameskip; 0|1|2|3" },
-      { "pcsx_rearmed_region", "Region; Auto|NTSC|PAL" },
+      { "pcsx_rearmed_region", "Region; auto|NTSC|PAL" },
       { "pcsx_rearmed_pad1type", "Pad 1 Type; default|none|standard|analog|negcon" },
       { "pcsx_rearmed_pad2type", "Pad 2 Type; default|none|standard|analog|negcon" },
       { "pcsx_rearmed_pad3type", "Pad 3 Type; default|none|standard|analog|negcon" },
@@ -465,6 +469,9 @@ void retro_set_environment(retro_environment_t cb)
       { NULL, NULL },
    };
 
+    if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
+        log_cb = logging.log;
+
    environ_cb = cb;
 
    cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
@@ -1219,7 +1226,7 @@ bool retro_load_game(const struct retro_game_info *info)
 
 	if (is_m3u) {
 		if (!read_m3u(info->path)) {
-			SysPrintf("failed to read m3u file\n");
+			log_cb(RETRO_LOG_INFO, "failed to read m3u file\n");
 			return false;
 		}
 	} else {
@@ -1231,7 +1238,7 @@ bool retro_load_game(const struct retro_game_info *info)
 
 	/* have to reload after set_cd_image for correct cdr plugin */
 	if (LoadPlugins() == -1) {
-		SysPrintf("failed to load plugins\n");
+		log_cb(RETRO_LOG_INFO, "failed to load plugins\n");
 		return false;
 	}
 
@@ -1239,23 +1246,22 @@ bool retro_load_game(const struct retro_game_info *info)
 	NetOpened = 0;
 
 	if (OpenPlugins() == -1) {
-		SysPrintf("failed to open plugins\n");
+		log_cb(RETRO_LOG_INFO, "failed to open plugins\n");
 		return false;
 	}
 
 	plugin_call_rearmed_cbs();
 	dfinput_activate();
 
-	Config.PsxAuto = 1;
 	if (CheckCdrom() == -1) {
-		SysPrintf("unsupported/invalid CD image: %s\n", info->path);
+        log_cb(RETRO_LOG_INFO, "unsupported/invalid CD image: %s\n", info->path);
 		return false;
 	}
 
 	SysReset();
 
 	if (LoadCdrom() == -1) {
-		SysPrintf("could not load CD-ROM!\n");
+		log_cb(RETRO_LOG_INFO, "could not load CD\n");
 		return false;
 	}
 	emu_on_new_cd(0);
@@ -1335,7 +1341,7 @@ static void update_variables(bool in_flight)
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
    {
       Config.PsxAuto = 0;
-      if (strcmp(var.value, "Automatic") == 0)
+      if (strcmp(var.value, "auto") == 0)
          Config.PsxAuto = 1;
       else if (strcmp(var.value, "NTSC") == 0)
          Config.PsxType = 0;
@@ -1571,6 +1577,8 @@ void retro_run(void)
 	video_cb((vout_fb_dirty || !vout_can_dupe || !duping_enable) ? vout_buf_ptr : NULL,
 		vout_width, vout_height, vout_width * 2);
 	vout_fb_dirty = 0;
+
+    set_vout_fb();
 }
 
 static bool try_use_bios(const char *path)
@@ -1615,7 +1623,7 @@ static bool find_any_bios(const char *dirpath, char *path, size_t path_size)
 		if (strncasecmp(ent->d_name, "scph", 4) != 0)
 			continue;
 
-		snprintf(path, path_size, "%s/%s", dirpath, ent->d_name);
+		snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name);
 		ret = try_use_bios(path);
 		if (ret)
 			break;
@@ -1635,7 +1643,10 @@ static void check_system_specs(void)
 
 void retro_init(void)
 {
-	const char *bios[] = { "SCPH101", "SCPH7001", "SCPH5501", "SCPH1001" };
+	const char *bios[] = {
+		"SCPH101", "SCPH7001", "SCPH5501", "SCPH1001",
+		"scph101", "scph7001", "scph5501", "scph1001"
+	};
 	const char *dir;
 	char path[256];
 	int i, ret;
@@ -1685,7 +1696,7 @@ void retro_init(void)
 		snprintf(Config.BiosDir, sizeof(Config.BiosDir), "%s", dir);
 
 		for (i = 0; i < sizeof(bios) / sizeof(bios[0]); i++) {
-			snprintf(path, sizeof(path), "%s/%s.bin", dir, bios[i]);
+			snprintf(path, sizeof(path), "%s%c%s.bin", dir, SLASH, bios[i]);
 			found_bios = try_use_bios(path);
 			if (found_bios)
 				break;