From adf36239447f2584b990e61ff67402ce57d6bbbc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 11 Jan 2015 01:34:08 +0100 Subject: [PATCH] Move some enums to retroarch.h --- general.h | 101 +-------------------------------------------- menu/menu_action.c | 1 + retroarch.h | 99 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 99 deletions(-) diff --git a/general.h b/general.h index 1225336fa5..5dddfb0c0f 100644 --- a/general.h +++ b/general.h @@ -80,106 +80,9 @@ extern "C" { #endif +#ifndef MAX_USERS #define MAX_USERS 16 - -enum basic_event -{ - RARCH_CMD_NONE = 0, - RARCH_CMD_RESET, - RARCH_CMD_LOAD_CONTENT, - RARCH_CMD_LOAD_CONTENT_PERSIST, - RARCH_CMD_LOAD_CORE, - RARCH_CMD_LOAD_STATE, - RARCH_CMD_SAVE_STATE, - RARCH_CMD_TAKE_SCREENSHOT, - RARCH_CMD_PREPARE_DUMMY, - RARCH_CMD_QUIT, - RARCH_CMD_REINIT, - RARCH_CMD_REWIND_DEINIT, - RARCH_CMD_REWIND_INIT, - RARCH_CMD_REWIND_TOGGLE, - RARCH_CMD_AUTOSAVE_DEINIT, - RARCH_CMD_AUTOSAVE_INIT, - RARCH_CMD_AUTOSAVE_STATE, - RARCH_CMD_AUDIO_STOP, - RARCH_CMD_AUDIO_START, - RARCH_CMD_AUDIO_MUTE_TOGGLE, - RARCH_CMD_OVERLAY_INIT, - RARCH_CMD_OVERLAY_DEINIT, - RARCH_CMD_OVERLAY_SET_SCALE_FACTOR, - RARCH_CMD_OVERLAY_SET_ALPHA_MOD, - RARCH_CMD_OVERLAY_NEXT, - RARCH_CMD_DSP_FILTER_INIT, - RARCH_CMD_DSP_FILTER_DEINIT, - RARCH_CMD_GPU_RECORD_DEINIT, - RARCH_CMD_RECORD_INIT, - RARCH_CMD_RECORD_DEINIT, - RARCH_CMD_HISTORY_DEINIT, - RARCH_CMD_HISTORY_INIT, - RARCH_CMD_CORE_INFO_DEINIT, - RARCH_CMD_CORE_INFO_INIT, - RARCH_CMD_CORE_DEINIT, - RARCH_CMD_CORE_INIT, - RARCH_CMD_AUDIO_SET_BLOCKING_STATE, - RARCH_CMD_AUDIO_SET_NONBLOCKING_STATE, - RARCH_CMD_VIDEO_APPLY_STATE_CHANGES, - RARCH_CMD_VIDEO_SET_BLOCKING_STATE, - RARCH_CMD_VIDEO_SET_NONBLOCKING_STATE, - RARCH_CMD_VIDEO_SET_ASPECT_RATIO, - RARCH_CMD_RESET_CONTEXT, - RARCH_CMD_RESTART_RETROARCH, - RARCH_CMD_QUIT_RETROARCH, - RARCH_CMD_RESUME, - RARCH_CMD_PAUSE_TOGGLE, - RARCH_CMD_UNPAUSE, - RARCH_CMD_PAUSE, - RARCH_CMD_PAUSE_CHECKS, - RARCH_CMD_MENU_SAVE_CONFIG, - RARCH_CMD_MENU_PAUSE_LIBRETRO, - RARCH_CMD_MENU_TOGGLE, - RARCH_CMD_SHADERS_APPLY_CHANGES, - RARCH_CMD_SHADER_DIR_INIT, - RARCH_CMD_SHADER_DIR_DEINIT, - RARCH_CMD_CONTROLLERS_INIT, - RARCH_CMD_SAVEFILES, - RARCH_CMD_SAVEFILES_INIT, - RARCH_CMD_SAVEFILES_DEINIT, - RARCH_CMD_MSG_QUEUE_INIT, - RARCH_CMD_MSG_QUEUE_DEINIT, - RARCH_CMD_CHEATS_INIT, - RARCH_CMD_CHEATS_DEINIT, - RARCH_CMD_NETPLAY_INIT, - RARCH_CMD_NETPLAY_DEINIT, - RARCH_CMD_NETPLAY_FLIP_PLAYERS, - RARCH_CMD_BSV_MOVIE_INIT, - RARCH_CMD_BSV_MOVIE_DEINIT, - RARCH_CMD_COMMAND_INIT, - RARCH_CMD_COMMAND_DEINIT, - RARCH_CMD_DRIVERS_DEINIT, - RARCH_CMD_DRIVERS_INIT, - RARCH_CMD_AUDIO_REINIT, - RARCH_CMD_RESIZE_WINDOWED_SCALE, - RARCH_CMD_TEMPORARY_CONTENT_DEINIT, - RARCH_CMD_SUBSYSTEM_FULLPATHS_DEINIT, - RARCH_CMD_LOG_FILE_DEINIT, - RARCH_CMD_DISK_EJECT_TOGGLE, - RARCH_CMD_DISK_NEXT, - RARCH_CMD_DISK_PREV, - RARCH_CMD_RUMBLE_STOP, - RARCH_CMD_GRAB_MOUSE_TOGGLE, - RARCH_CMD_FULLSCREEN_TOGGLE, - RARCH_CMD_PERFCNT_REPORT_FRONTEND_LOG, -}; - -enum action_state -{ - RARCH_ACTION_STATE_NONE = 0, - RARCH_ACTION_STATE_LOAD_CONTENT, - RARCH_ACTION_STATE_MENU_RUNNING, - RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, - RARCH_ACTION_STATE_QUIT, - RARCH_ACTION_STATE_FORCE_QUIT, -}; +#endif enum sound_mode_enums { diff --git a/menu/menu_action.c b/menu/menu_action.c index 0c1e35684d..cfa452c507 100644 --- a/menu/menu_action.c +++ b/menu/menu_action.c @@ -16,6 +16,7 @@ #include "menu_action.h" #include "menu_entries.h" +#include "../retroarch.h" static int setting_extra_handler(rarch_setting_t *setting) { diff --git a/retroarch.h b/retroarch.h index 4e64bc6fef..211a6c2bf4 100644 --- a/retroarch.h +++ b/retroarch.h @@ -23,6 +23,105 @@ extern "C" { #endif +enum basic_event +{ + RARCH_CMD_NONE = 0, + RARCH_CMD_RESET, + RARCH_CMD_LOAD_CONTENT, + RARCH_CMD_LOAD_CONTENT_PERSIST, + RARCH_CMD_LOAD_CORE, + RARCH_CMD_LOAD_STATE, + RARCH_CMD_SAVE_STATE, + RARCH_CMD_TAKE_SCREENSHOT, + RARCH_CMD_PREPARE_DUMMY, + RARCH_CMD_QUIT, + RARCH_CMD_REINIT, + RARCH_CMD_REWIND_DEINIT, + RARCH_CMD_REWIND_INIT, + RARCH_CMD_REWIND_TOGGLE, + RARCH_CMD_AUTOSAVE_DEINIT, + RARCH_CMD_AUTOSAVE_INIT, + RARCH_CMD_AUTOSAVE_STATE, + RARCH_CMD_AUDIO_STOP, + RARCH_CMD_AUDIO_START, + RARCH_CMD_AUDIO_MUTE_TOGGLE, + RARCH_CMD_OVERLAY_INIT, + RARCH_CMD_OVERLAY_DEINIT, + RARCH_CMD_OVERLAY_SET_SCALE_FACTOR, + RARCH_CMD_OVERLAY_SET_ALPHA_MOD, + RARCH_CMD_OVERLAY_NEXT, + RARCH_CMD_DSP_FILTER_INIT, + RARCH_CMD_DSP_FILTER_DEINIT, + RARCH_CMD_GPU_RECORD_DEINIT, + RARCH_CMD_RECORD_INIT, + RARCH_CMD_RECORD_DEINIT, + RARCH_CMD_HISTORY_DEINIT, + RARCH_CMD_HISTORY_INIT, + RARCH_CMD_CORE_INFO_DEINIT, + RARCH_CMD_CORE_INFO_INIT, + RARCH_CMD_CORE_DEINIT, + RARCH_CMD_CORE_INIT, + RARCH_CMD_AUDIO_SET_BLOCKING_STATE, + RARCH_CMD_AUDIO_SET_NONBLOCKING_STATE, + RARCH_CMD_VIDEO_APPLY_STATE_CHANGES, + RARCH_CMD_VIDEO_SET_BLOCKING_STATE, + RARCH_CMD_VIDEO_SET_NONBLOCKING_STATE, + RARCH_CMD_VIDEO_SET_ASPECT_RATIO, + RARCH_CMD_RESET_CONTEXT, + RARCH_CMD_RESTART_RETROARCH, + RARCH_CMD_QUIT_RETROARCH, + RARCH_CMD_RESUME, + RARCH_CMD_PAUSE_TOGGLE, + RARCH_CMD_UNPAUSE, + RARCH_CMD_PAUSE, + RARCH_CMD_PAUSE_CHECKS, + RARCH_CMD_MENU_SAVE_CONFIG, + RARCH_CMD_MENU_PAUSE_LIBRETRO, + RARCH_CMD_MENU_TOGGLE, + RARCH_CMD_SHADERS_APPLY_CHANGES, + RARCH_CMD_SHADER_DIR_INIT, + RARCH_CMD_SHADER_DIR_DEINIT, + RARCH_CMD_CONTROLLERS_INIT, + RARCH_CMD_SAVEFILES, + RARCH_CMD_SAVEFILES_INIT, + RARCH_CMD_SAVEFILES_DEINIT, + RARCH_CMD_MSG_QUEUE_INIT, + RARCH_CMD_MSG_QUEUE_DEINIT, + RARCH_CMD_CHEATS_INIT, + RARCH_CMD_CHEATS_DEINIT, + RARCH_CMD_NETPLAY_INIT, + RARCH_CMD_NETPLAY_DEINIT, + RARCH_CMD_NETPLAY_FLIP_PLAYERS, + RARCH_CMD_BSV_MOVIE_INIT, + RARCH_CMD_BSV_MOVIE_DEINIT, + RARCH_CMD_COMMAND_INIT, + RARCH_CMD_COMMAND_DEINIT, + RARCH_CMD_DRIVERS_DEINIT, + RARCH_CMD_DRIVERS_INIT, + RARCH_CMD_AUDIO_REINIT, + RARCH_CMD_RESIZE_WINDOWED_SCALE, + RARCH_CMD_TEMPORARY_CONTENT_DEINIT, + RARCH_CMD_SUBSYSTEM_FULLPATHS_DEINIT, + RARCH_CMD_LOG_FILE_DEINIT, + RARCH_CMD_DISK_EJECT_TOGGLE, + RARCH_CMD_DISK_NEXT, + RARCH_CMD_DISK_PREV, + RARCH_CMD_RUMBLE_STOP, + RARCH_CMD_GRAB_MOUSE_TOGGLE, + RARCH_CMD_FULLSCREEN_TOGGLE, + RARCH_CMD_PERFCNT_REPORT_FRONTEND_LOG, +}; + +enum action_state +{ + RARCH_ACTION_STATE_NONE = 0, + RARCH_ACTION_STATE_LOAD_CONTENT, + RARCH_ACTION_STATE_MENU_RUNNING, + RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, + RARCH_ACTION_STATE_QUIT, + RARCH_ACTION_STATE_FORCE_QUIT, +}; + struct rarch_main_wrap { const char *content_path;