}
else
{
+ int pos;
char buff[256];
+ pos = plat_get_skin_dir(buff, 256);
+ strcpy(buff + pos, "background.png");
// should really only happen once, on startup..
- emu_make_path(buff, "skin/background.png", sizeof(buff));
- if (readpng(g_menubg_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h) < 0)
+ if (readpng(g_menubg_ptr, buff, READPNG_BG,
+ g_menuscreen_w, g_menuscreen_h) < 0)
memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
}
// ------------ SCD options menu ------------
-static const char *mgn_cdopt_ra(int id, int *offs)
-{
- *offs = -5;
- if (PicoCDBuffers <= 0)
- return " OFF";
- sprintf(static_buff, "%5iK", PicoCDBuffers * 2);
- return static_buff;
-}
-
-static int mh_cdopt_ra(int id, int keys)
-{
- if (keys & PBTN_LEFT) {
- PicoCDBuffers >>= 1;
- if (PicoCDBuffers < 2)
- PicoCDBuffers = 0;
- } else {
- if (PicoCDBuffers <= 0)
- PicoCDBuffers = 1;
- PicoCDBuffers <<= 1;
- if (PicoCDBuffers > 8*1024)
- PicoCDBuffers = 8*1024; // 16M
- }
- return 0;
-}
-
static const char h_cdleds[] = "Show power/CD LEDs of emulated console";
static const char h_cdda[] = "Play audio tracks from mp3s/wavs/bins";
static const char h_cdpcm[] = "Emulate PCM audio chip for effects/voices/music";
mee_onoff_h("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS, h_cdleds),
mee_onoff_h("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA, h_cdda),
mee_onoff_h("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM, h_cdpcm),
- mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra),
mee_onoff_h("SaveRAM cart", MA_CDOPT_SAVERAM, PicoOpt, POPT_EN_MCD_RAMCART, h_srcart),
- mee_onoff_h("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),
+ mee_onoff_h("Scale/Rot. fx", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),
mee_end,
};
break;
case MA_MAIN_CHANGE_CD:
if (PicoAHW & PAHW_MCD) {
- if (!Stop_CD())
+ // if cd is loaded, cdd_unload() triggers eject and
+ // returns 1, else we'll select and load new CD here
+ if (!cdd_unload())
menu_loop_tray();
return 1;
}