diff options
author | Vas Crabb <vas@vastheman.com> | 2015-06-15 12:50:03 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2015-06-15 13:58:04 +1000 |
commit | 8ea36b999d6a4bedddc754aea0256be8460a6551 (patch) | |
tree | df0a311c3b2c7d4b4dd767c4dc1041216b1fd886 /src/osd/modules/lib/osdobj_common.h | |
parent | 2f800d231551b409225860aca5cde84ab182d749 (diff) |
Move UI mode key out of SDL options into generic options
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.h')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index d46463b414d..ddbc8c974d4 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -26,6 +26,8 @@ // Defines //============================================================ +#define OSDOPTION_UIMODEKEY "uimodekey" + #define OSDCOMMAND_LIST_MIDI_DEVICES "listmidi" #define OSDCOMMAND_LIST_NETWORK_ADAPTERS "listnetwork" @@ -54,9 +56,6 @@ #define OSDOPTION_SWITCHRES "switchres" -#define OSDOPTION_SOUND "sound" -#define OSDOPTION_AUDIO_LATENCY "audio_latency" - #define OSDOPTION_FILTER "filter" #define OSDOPTION_PRESCALE "prescale" @@ -69,6 +68,9 @@ #define OSDOPTION_GL_NOTEXTURERECT "gl_notexturerect" #define OSDOPTION_GL_FORCEPOW2TEXTURE "gl_forcepow2texture" +#define OSDOPTION_SOUND "sound" +#define OSDOPTION_AUDIO_LATENCY "audio_latency" + #define OSDOPTION_AUDIO_OUTPUT "audio_output" #define OSDOPTION_AUDIO_EFFECT "audio_effect" @@ -87,6 +89,9 @@ public: // construction/destruction osd_options(); + // keyboard mapping + const char *ui_mode_key() const { return value(OSDOPTION_UIMODEKEY); } + // debugging options const char *debugger() const { return value(OSDOPTION_DEBUGGER); } const char *debugger_font() const { return value(OSDOPTION_DEBUGGER_FONT); } @@ -121,11 +126,7 @@ public: // full screen options bool switch_res() const { return bool_value(OSDOPTION_SWITCHRES); } - // sound options - const char *sound() const { return value(OSDOPTION_SOUND); } - int audio_latency() const { return int_value(OSDOPTION_AUDIO_LATENCY); } - - // video options + // accelerated video options bool filter() const { return bool_value(OSDOPTION_FILTER); } int prescale() const { return int_value(OSDOPTION_PRESCALE); } @@ -139,6 +140,10 @@ public: const char *shader_mame(int index) const { std::string temp; strprintf(temp, "%s%d", OSDOPTION_SHADER_MAME, index); return value(temp.c_str()); } const char *shader_screen(int index) const { std::string temp; strprintf(temp, "%s%d", OSDOPTION_SHADER_SCREEN, index); return value(temp.c_str()); } + // sound options + const char *sound() const { return value(OSDOPTION_SOUND); } + int audio_latency() const { return int_value(OSDOPTION_AUDIO_LATENCY); } + // CoreAudio specific options const char *audio_output() const { return value(OSDOPTION_AUDIO_OUTPUT); } const char *audio_effect(int index) const { std::string temp; strprintf(temp, "%s%d", OSDOPTION_AUDIO_EFFECT, index); return value(temp.c_str()); } |