/*
- * (C) notaz, 2010
+ * (C) notaz, 2010-2011
*
* This work is licensed under the terms of the GNU GPLv2 or later.
* See the COPYING file in the top-level directory.
#include "common/input.h"
#include "omap.h"
#include "menu.h"
+#include "main.h"
#include "pcnt.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../libpcsxcore/psemu_plugin_defs.h"
void *pl_fbdev_buf;
int pl_frame_interval;
-int in_type, in_keystate, in_a1[2], in_a2[2];
+int in_type, in_keystate, in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp;
static int flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
static float vsps_cur;
return ret;
}
+static void print_hud(void)
+{
+ if (pl_fbdev_bpp == 16)
+ pl_text_out16(2, pl_fbdev_h - 10, "%s", hud_msg);
+}
+
static void print_fps(void)
{
if (pl_fbdev_bpp == 16)
flip_cnt++;
if (pl_fbdev_buf != NULL) {
- if (g_opts & OPT_SHOWFPS)
+ if (hud_msg[0] != 0)
+ print_hud();
+ else if (g_opts & OPT_SHOWFPS)
print_fps();
+
if (g_opts & OPT_SHOWCPU)
print_cpu_usage();
}
static void update_input(void)
{
int actions[IN_BINDTYPE_COUNT] = { 0, };
+ unsigned int emu_act;
in_update(actions);
if (in_type == PSE_PAD_TYPE_ANALOGPAD)
in_update_analogs();
- if (actions[IN_BINDTYPE_EMU] & PEV_MENU)
- stop = 1;
+ emu_act = actions[IN_BINDTYPE_EMU];
+ if (emu_act) {
+ int which = 0;
+ for (; !(emu_act & 1); emu_act >>= 1, which++)
+ ;
+ emu_act = which;
+ }
+ emu_set_action(emu_act);
+
in_keystate = actions[IN_BINDTYPE_PLAYER12];
#ifdef X11
tv_old = now;
if (g_opts & OPT_SHOWCPU)
tick_per_sec = get_cpu_ticks();
+
+ if (hud_new_msg > 0) {
+ hud_new_msg--;
+ if (hud_new_msg == 0)
+ hud_msg[0] = 0;
+ }
}
#ifdef PCNT
static int ya_vsync_count;
usleep(diff - pl_frame_interval / 2);
}
- plugin_skip_advice = 0;
- if (UseFrameSkip && diff < -pl_frame_interval) {
- // P.E.Op.S. makes skip decision based on this
- fps_skip = 1.0f;
- plugin_skip_advice = 1;
+ if (UseFrameSkip) {
+ if (diff < -pl_frame_interval) {
+ // P.E.Op.S. makes skip decision based on this
+ fps_skip = 1.0f;
+ plugin_skip_advice = 1;
+ }
+ else if (diff >= 0) {
+ fps_skip = 100.0f;
+ plugin_skip_advice = 0;
+ }
}
pcnt_start(PCNT_ALL);