Merge pull request #389 from notaz/master

Merge upstream changes

diff --combined frontend/menu.c
index 47523b2,6d75373..f4a45ba
--- 1/frontend/menu.c
--- 2/frontend/menu.c
+++ b/frontend/menu.c
@@@ -101,10 -101,13 +101,10 @@@ int scanlines, scanline_level = 20
  int soft_scaling, analog_deadzone; // for Caanoo
  int soft_filter;
  
 -#ifndef HAVE_PRE_ARMV7
 -#define DEFAULT_PSX_CLOCK 57
 -#define DEFAULT_PSX_CLOCK_S "57"
 -#else
 -#define DEFAULT_PSX_CLOCK 50
 -#define DEFAULT_PSX_CLOCK_S "50"
 -#endif
 +// Default to 100% CPU speed as most hardware can handle it nowadays using the dynamic recompiler.
 +// If not, the option is in the advanced speed hacks menu, so in a logical place.
 +#define DEFAULT_PSX_CLOCK 100
 +#define DEFAULT_PSX_CLOCK_S "100"
  
  static const char *bioses[24];
  static const char *gpu_plugins[16];
@@@ -305,14 -308,14 +305,14 @@@ static void menu_sync_config(void
        cycle_multiplier = 10000 / psx_clock;
  
        switch (in_type_sel1) {
 -      case 1:  in_type1 = PSE_PAD_TYPE_ANALOGPAD; break;
 -      case 2:  in_type1 = PSE_PAD_TYPE_GUNCON;    break;
 -      default: in_type1 = PSE_PAD_TYPE_STANDARD;
 +      case 1:  in_type[0] = PSE_PAD_TYPE_ANALOGPAD; break;
 +      case 2:  in_type[0] = PSE_PAD_TYPE_NEGCON;    break;
 +      default: in_type[0] = PSE_PAD_TYPE_STANDARD;
        }
        switch (in_type_sel2) {
 -      case 1:  in_type2 = PSE_PAD_TYPE_ANALOGPAD; break;
 -      case 2:  in_type2 = PSE_PAD_TYPE_GUNCON;    break;
 -      default: in_type2 = PSE_PAD_TYPE_STANDARD;
 +      case 1:  in_type[1] = PSE_PAD_TYPE_ANALOGPAD; break;
 +      case 2:  in_type[1] = PSE_PAD_TYPE_NEGCON;    break;
 +      default: in_type[1] = PSE_PAD_TYPE_STANDARD;
        }
        if (in_evdev_allow_abs_only != allow_abs_only_old) {
                in_probe();
@@@ -422,12 -425,6 +422,12 @@@ static const struct 
        CE_INTVAL_V(frameskip, 3),
        CE_INTVAL_P(gpu_peops.iUseDither),
        CE_INTVAL_P(gpu_peops.dwActFixes),
 +      CE_INTVAL_P(gpu_unai.ilace_force),
 +      CE_INTVAL_P(gpu_unai.pixel_skip),
 +      CE_INTVAL_P(gpu_unai.lighting),
 +      CE_INTVAL_P(gpu_unai.fast_lighting),
 +      CE_INTVAL_P(gpu_unai.blending),
 +      CE_INTVAL_P(gpu_unai.dithering),
        CE_INTVAL_P(gpu_unai.lineskip),
        CE_INTVAL_P(gpu_unai.abe_hack),
        CE_INTVAL_P(gpu_unai.no_light),
@@@ -818,7 -815,7 +818,7 @@@ static void draw_savestate_bg(int slot
  
                // darken this so that menu text is visible
                if (g_menuscreen_w - w < 320)
-                       menu_darken_bg(d, d, w * 2, 0);
+                       menu_darken_bg(d, d, w, 0);
        }
  
  out:
@@@ -1364,16 -1361,10 +1364,16 @@@ static int menu_loop_plugin_gpu_neon(in
  
  static menu_entry e_menu_plugin_gpu_unai[] =
  {
 -      mee_onoff     ("Skip every 2nd line",        0, pl_rearmed_cbs.gpu_unai.lineskip, 1),
 -      mee_onoff     ("Abe's Odyssey hack",         0, pl_rearmed_cbs.gpu_unai.abe_hack, 1),
 -      mee_onoff     ("Disable lighting",           0, pl_rearmed_cbs.gpu_unai.no_light, 1),
 -      mee_onoff     ("Disable blending",           0, pl_rearmed_cbs.gpu_unai.no_blend, 1),
 +      //mee_onoff     ("Skip every 2nd line",        0, pl_rearmed_cbs.gpu_unai.lineskip, 1),
 +      //mee_onoff     ("Abe's Odyssey hack",         0, pl_rearmed_cbs.gpu_unai.abe_hack, 1),
 +      //mee_onoff     ("Disable lighting",           0, pl_rearmed_cbs.gpu_unai.no_light, 1),
 +      //mee_onoff     ("Disable blending",           0, pl_rearmed_cbs.gpu_unai.no_blend, 1),
 +      mee_onoff     ("Interlace",                  0, pl_rearmed_cbs.gpu_unai.ilace_force, 1),
 +      mee_onoff     ("Dithering",                  0, pl_rearmed_cbs.gpu_unai.dithering, 1),
 +      mee_onoff     ("Lighting",                   0, pl_rearmed_cbs.gpu_unai.lighting, 1),
 +      mee_onoff     ("Fast lighting",              0, pl_rearmed_cbs.gpu_unai.fast_lighting, 1),
 +      mee_onoff     ("Blending",                   0, pl_rearmed_cbs.gpu_unai.blending, 1),
 +      mee_onoff     ("Pixel skip",                 0, pl_rearmed_cbs.gpu_unai.pixel_skip, 1),
        mee_end,
  };