summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/lib/osdobj_common.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-07-20 08:11:41 +0200
committer ImJezze <jezze@gmx.net>2015-07-20 08:11:41 +0200
commit4bcb0c13f50ddb1cd3fd0341b4bb31d9c3c7fc7a (patch)
tree55eccacfca0e69435d0d4e6615205310ca11f271 /src/osd/modules/lib/osdobj_common.h
parentd132946c6f45aa8d271c6180e86f72dd08243048 (diff)
parent229785f695b26c702c8490792611f59d0366a933 (diff)
Merge pull request #5 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.h')
-rw-r--r--src/osd/modules/lib/osdobj_common.h21
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()); }