diff options
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.h')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.h | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index 3be82fd2ee9..a013e2506ae 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -13,19 +13,12 @@ #ifndef MAME_OSD_LIB_OSDOBJ_COMMON_H #define MAME_OSD_LIB_OSDOBJ_COMMON_H +#include "osdcore.h" #include "osdepend.h" -#include "watchdog.h" #include "modules/osdmodule.h" -#include "modules/font/font_module.h" -#include "modules/input/input_module.h" -#include "modules/sound/sound_module.h" -#include "modules/debugger/debug_module.h" -#include "modules/netdev/netdev_module.h" -#include "modules/midi/midi_module.h" #include "modules/output/output_module.h" -#include "modules/monitor/monitor_module.h" #include "emuopts.h" -#include "../frontend/mame/ui/menuitem.h" +#include "strformat.h" #include <list> //============================================================ @@ -130,10 +123,10 @@ public: const char *aspect() const { return value(OSDOPTION_ASPECT); } const char *resolution() const { return value(OSDOPTION_RESOLUTION); } const char *view() const { return value(OSDOPTION_VIEW); } - const char *screen(int index) const { return value(string_format("%s%d", OSDOPTION_SCREEN, index)); } - const char *aspect(int index) const { return value(string_format("%s%d", OSDOPTION_ASPECT, index)); } - const char *resolution(int index) const { return value(string_format("%s%d", OSDOPTION_RESOLUTION, index)); } - const char *view(int index) const { return value(string_format("%s%d", OSDOPTION_VIEW, index)); } + const char *screen(int index) const { return value(util::string_format("%s%d", OSDOPTION_SCREEN, index)); } + const char *aspect(int index) const { return value(util::string_format("%s%d", OSDOPTION_ASPECT, index)); } + const char *resolution(int index) const { return value(util::string_format("%s%d", OSDOPTION_RESOLUTION, index)); } + const char *view(int index) const { return value(util::string_format("%s%d", OSDOPTION_VIEW, index)); } // full screen options bool switch_res() const { return bool_value(OSDOPTION_SWITCHRES); } @@ -149,8 +142,8 @@ public: bool gl_pbo() const { return bool_value(OSDOPTION_GL_PBO); } bool gl_glsl() const { return bool_value(OSDOPTION_GL_GLSL); } int glsl_filter() const { return int_value(OSDOPTION_GLSL_FILTER); } - const char *shader_mame(int index) const { return value(string_format("%s%d", OSDOPTION_SHADER_MAME, index)); } - const char *shader_screen(int index) const { return value(string_format("%s%d", OSDOPTION_SHADER_SCREEN, index)); } + const char *shader_mame(int index) const { return value(util::string_format("%s%d", OSDOPTION_SHADER_MAME, index)); } + const char *shader_screen(int index) const { return value(util::string_format("%s%d", OSDOPTION_SHADER_SCREEN, index)); } // sound options const char *sound() const { return value(OSDOPTION_SOUND); } @@ -158,7 +151,7 @@ public: // CoreAudio specific options const char *audio_output() const { return value(OSDOPTION_AUDIO_OUTPUT); } - const char *audio_effect(int index) const { return value(string_format("%s%d", OSDOPTION_AUDIO_EFFECT, index)); } + const char *audio_effect(int index) const { return value(util::string_format("%s%d", OSDOPTION_AUDIO_EFFECT, index)); } // BGFX specific options const char *bgfx_path() const { return value(OSDOPTION_BGFX_PATH); } @@ -178,6 +171,15 @@ public: }; // ======================> osd_interface + +class font_module; +class sound_module; +class debug_module; +class midi_module; +class input_module; +class output_module; +class monitor_module; +class osd_watchdog; class osd_window; // description of the currently-running machine @@ -214,10 +216,10 @@ public: // command option overrides virtual bool execute_command(const char *command) override; - virtual osd_font::ptr font_alloc() override { return m_font_module->font_alloc(); } - virtual bool get_font_families(std::string const &font_path, std::vector<std::pair<std::string, std::string> > &result) override { return m_font_module->get_font_families(font_path, result); } + virtual osd_font::ptr font_alloc() override; + virtual bool get_font_families(std::string const &font_path, std::vector<std::pair<std::string, std::string> > &result) override; - virtual std::unique_ptr<osd_midi_device> create_midi_device() override { return m_midi->create_midi_device(); } + virtual std::unique_ptr<osd_midi_device> create_midi_device() override; // FIXME: everything below seems to be osd specific and not part of // this INTERFACE but part of the osd IMPLEMENTATION |