menu: file browser fixes

[pcsx_rearmed.git] / frontend / menu.c

diff --git a/frontend/menu.c b/frontend/menu.c
index b25e192..2823a23 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -26,6 +26,7 @@
 #include "plugin_lib.h"
 #include "plat.h"
 #include "pcnt.h"
+#include "cspace.h"
 #include "libpicofe/plat.h"
 #include "libpicofe/input.h"
 #include "libpicofe/linux/in_evdev.h"
@@ -36,7 +37,7 @@
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/externals.h"
-#include "../plugins/gpulib/cspace.h"
+#include "../plugins/dfsound/spu_config.h"
 #include "psemu_plugin_defs.h"
 #include "revision.h"
 
@@ -102,12 +103,6 @@ int soft_filter;
 #define DEFAULT_PSX_CLOCK_S "50"
 #endif
 
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iXAPitch;
-extern int iVolume;
-
 static const char *bioses[24];
 static const char *gpu_plugins[16];
 static const char *spu_plugins[16];
@@ -214,6 +209,9 @@ static int optional_cdimg_filter(struct dirent **namelist, int count,
        struct stat64 statf;
        FILE *f;
 
+       if (count <= 1)
+               return count;
+
        for (i = 1; i < count; i++) {
                if (namelist[i] == NULL || namelist[i]->d_type == DT_DIR)
                        continue;
@@ -318,7 +316,7 @@ static void menu_sync_config(void)
                allow_abs_only_old = in_evdev_allow_abs_only;
        }
 
-       iVolume = 768 + 128 * volume_boost;
+       spu_config.iVolume = 768 + 128 * volume_boost;
        pl_rearmed_cbs.frameskip = frameskip - 1;
        pl_timing_prepare(Config.PsxType);
 }
@@ -431,9 +429,10 @@ static const struct {
        CE_INTVAL_P(gpu_peopsgl.iVRamSize),
        CE_INTVAL_P(gpu_peopsgl.iTexGarbageCollection),
        CE_INTVAL_P(gpu_peopsgl.dwActFixes),
-       CE_INTVAL_V(iUseReverb, 3),
-       CE_INTVAL_V(iXAPitch, 3),
-       CE_INTVAL_V(iUseInterpolation, 3),
+       CE_INTVAL(spu_config.iUseReverb),
+       CE_INTVAL(spu_config.iXAPitch),
+       CE_INTVAL(spu_config.iUseInterpolation),
+       CE_INTVAL(spu_config.iTempo),
        CE_INTVAL(config_save_counter),
        CE_INTVAL(in_evdev_allow_abs_only),
        CE_INTVAL(volume_boost),
@@ -1400,13 +1399,16 @@ static int menu_loop_plugin_gpu_peopsgl(int id, int keys)
 
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
 static const char h_spu_volboost[]  = "Large values cause distortion";
+static const char h_spu_tempo[]     = "Slows down audio if emu is too slow\n"
+                                     "This is inaccurate and breaks games";
 
 static menu_entry e_menu_plugin_spu[] =
 {
        mee_range_h   ("Volume boost",              0, volume_boost, -5, 30, h_spu_volboost),
-       mee_onoff     ("Reverb",                    0, iUseReverb, 2),
-       mee_enum      ("Interpolation",             0, iUseInterpolation, men_spu_interp),
-       mee_onoff     ("Adjust XA pitch",           0, iXAPitch, 1),
+       mee_onoff     ("Reverb",                    0, spu_config.iUseReverb, 1),
+       mee_enum      ("Interpolation",             0, spu_config.iUseInterpolation, men_spu_interp),
+       mee_onoff     ("Adjust XA pitch",           0, spu_config.iXAPitch, 1),
+       mee_onoff_h   ("Adjust tempo",              0, spu_config.iTempo, 1, h_spu_tempo),
        mee_end,
 };
 
@@ -2080,12 +2082,12 @@ static int swap_cd_multidisk(void)
 
 static void load_pcsx_cht(void)
 {
-       const char *exts[] = { "cht", NULL };
+       static const char *exts[] = { "cht", NULL };
        const char *fname;
-       char path[256];
+       char msg[64];
 
-       path[0] = 0;
-       fname = menu_loop_romsel(path, sizeof(path), exts, NULL);
+       fname = menu_loop_romsel(last_selected_fname,
+                       sizeof(last_selected_fname), exts, NULL);
        if (fname == NULL)
                return;
 
@@ -2095,8 +2097,8 @@ static void load_pcsx_cht(void)
        if (NumCheats == 0 && NumCodes == 0)
                menu_update_msg("failed to load cheats");
        else {
-               snprintf(path, sizeof(path), "%d cheat(s) loaded", NumCheats + NumCodes);
-               menu_update_msg(path);
+               snprintf(msg, sizeof(msg), "%d cheat(s) loaded", NumCheats + NumCodes);
+               menu_update_msg(msg);
        }
        me_enable(e_menu_main, MA_MAIN_CHEATS, ready_to_go && NumCheats);
 }