notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://github.com/notaz/pcsx_rearmed
[pcsx_rearmed.git]
/
frontend
/
main.h
diff --git
a/frontend/main.h
b/frontend/main.h
index
ffed68b
..
7ce9e5d
100644
(file)
--- a/
frontend/main.h
+++ b/
frontend/main.h
@@
-16,8
+16,8
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
*/
-#ifndef __
LINUX
_H__
-#define __
LINUX
_H__
+#ifndef __
FRONTEND_MAIN
_H__
+#define __
FRONTEND_MAIN
_H__
#include "config.h"
#include "config.h"
@@
-35,7
+35,17
@@
extern char cfgfile_basename[MAXPATHLEN];
extern int state_slot;
extern char cfgfile_basename[MAXPATHLEN];
extern int state_slot;
+
+/* emu_core_preinit - must be the very first call
+ * emu_core_init - to be called after platform-specific setup */
+int emu_core_preinit(void);
+int emu_core_init(void);
+
+void emu_core_ask_exit(void);
+
void emu_set_default_config(void);
void emu_set_default_config(void);
+void emu_on_new_cd(int show_hud_msg);
+
int get_state_filename(char *buf, int size, int i);
int emu_check_state(int slot);
int emu_save_state(int slot);
int get_state_filename(char *buf, int size, int i);
int emu_check_state(int slot);
int emu_save_state(int slot);
@@
-44,7
+54,7
@@
int emu_load_state(int slot);
void set_cd_image(const char *fname);
extern unsigned long gpuDisp;
void set_cd_image(const char *fname);
extern unsigned long gpuDisp;
-extern int ready_to_go;
+extern int ready_to_go
, g_emu_want_quit, g_emu_resetting
;
extern char hud_msg[64];
extern int hud_new_msg;
extern char hud_msg[64];
extern int hud_new_msg;
@@
-57,7
+67,14
@@
enum sched_action {
SACTION_NEXT_SSLOT,
SACTION_PREV_SSLOT,
SACTION_TOGGLE_FSKIP,
SACTION_NEXT_SSLOT,
SACTION_PREV_SSLOT,
SACTION_TOGGLE_FSKIP,
+ SACTION_SWITCH_DISPMODE,
+ SACTION_FAST_FORWARD,
SACTION_SCREENSHOT,
SACTION_SCREENSHOT,
+ SACTION_VOLUME_UP, // 10
+ SACTION_VOLUME_DOWN,
+ SACTION_MINIMIZE,
+ SACTION_TOGGLE_FPS,
+ SACTION_TOGGLE_FULLSCREEN,
SACTION_GUN_TRIGGER = 16,
SACTION_GUN_A,
SACTION_GUN_B,
SACTION_GUN_TRIGGER = 16,
SACTION_GUN_A,
SACTION_GUN_B,
@@
-78,4
+95,4
@@
static inline void emu_set_action(enum sched_action action_)
emu_action = action_;
}
emu_action = action_;
}
-#endif /* __
LINUX
_H__ */
+#endif /* __
FRONTEND_MAIN
_H__ */