diff options
Diffstat (limited to 'src/osd/modules')
-rw-r--r-- | src/osd/modules/input/input_common.h | 9 | ||||
-rw-r--r-- | src/osd/modules/input/input_module.h | 3 | ||||
-rw-r--r-- | src/osd/modules/lib/osdobj_common.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/lib/osdobj_common.h | 4 | ||||
-rw-r--r-- | src/osd/modules/osdwindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/chainmanager.cpp | 20 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/chainmanager.h | 4 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/inputpair.cpp | 8 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/inputpair.h | 4 | ||||
-rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.cpp | 14 | ||||
-rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.h | 6 | ||||
-rw-r--r-- | src/osd/modules/render/drawbgfx.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/render/drawbgfx.h | 2 |
13 files changed, 44 insertions, 38 deletions
diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h index 094f3873f05..56607d88d4d 100644 --- a/src/osd/modules/input/input_common.h +++ b/src/osd/modules/input/input_common.h @@ -11,9 +11,14 @@ #ifndef INPUT_COMMON_H_ #define INPUT_COMMON_H_ -#include <memory> +#include "input_module.h" + #include <chrono> +#include <memory> +#include <mutex> #include <queue> +#include <string> + //============================================================ // PARAMETERS @@ -618,4 +623,4 @@ inline static INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawma } } -#endif +#endif // INPUT_COMMON_H_ diff --git a/src/osd/modules/input/input_module.h b/src/osd/modules/input/input_module.h index f031bbb6fad..7f98ff6fb93 100644 --- a/src/osd/modules/input/input_module.h +++ b/src/osd/modules/input/input_module.h @@ -10,8 +10,10 @@ #define INPUT_MODULE_H_ #include "osdepend.h" + #include "modules/osdmodule.h" + class input_module : public osd_module { public: @@ -24,7 +26,6 @@ public: virtual void poll_if_necessary(running_machine &machine) = 0; virtual void pause() = 0; virtual void resume() = 0; - virtual void exit() override {}; }; //============================================================ diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index 7695611b445..a709a9a8c52 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -554,7 +554,7 @@ void osd_common_t::customize_input_type_list(simple_list<input_type_entry> &type // list of OS-dependent slider values. //------------------------------------------------- -std::vector<ui_menu_item> osd_common_t::get_slider_list() +std::vector<ui::menu_item> osd_common_t::get_slider_list() { return m_sliders; } diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index d9083815fa0..5bb2fc994ec 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -194,7 +194,7 @@ public: // video overridables virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) override; - virtual std::vector<ui_menu_item> get_slider_list() override; + virtual std::vector<ui::menu_item> get_slider_list() override; // command option overrides virtual bool execute_command(const char *command) override; @@ -285,7 +285,7 @@ protected: input_module* m_joystick_input; output_module* m_output; std::unique_ptr<osd_watchdog> m_watchdog; - std::vector<ui_menu_item> m_sliders; + std::vector<ui::menu_item> m_sliders; private: std::vector<const char *> m_video_names; diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h index cd602b089f4..5e2b3f54eb4 100644 --- a/src/osd/modules/osdwindow.h +++ b/src/osd/modules/osdwindow.h @@ -238,7 +238,7 @@ public: virtual render_primitive_list *get_primitives() = 0; virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) { } - virtual std::vector<ui_menu_item> get_slider_list() { return m_sliders; } + virtual std::vector<ui::menu_item> get_slider_list() { return m_sliders; } virtual int draw(const int update) = 0; virtual int xy_to_render_target(const int x, const int y, int *xt, int *yt) { return 0; }; virtual void save() { }; @@ -254,7 +254,7 @@ protected: /* Internal flags */ static const int FI_CHANGED = 0x010000; bool m_sliders_dirty; - std::vector<ui_menu_item> m_sliders; + std::vector<ui::menu_item> m_sliders; private: std::weak_ptr<osd_window> m_window; diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp index 6a7875547e4..6160bb2ccd0 100644 --- a/src/osd/modules/render/bgfx/chainmanager.cpp +++ b/src/osd/modules/render/bgfx/chainmanager.cpp @@ -404,12 +404,12 @@ void chain_manager::create_selection_slider(uint32_t screen_index) state->id = screen_index; strcpy(state->description, description.c_str()); - ui_menu_item item; + ui::menu_item item; item.text = state->description; item.subtext = ""; item.flags = 0; item.ref = state; - item.type = ui_menu_item_type::SLIDER; + item.type = ui::menu_item_type::SLIDER; m_selection_sliders.push_back(item); } @@ -519,9 +519,9 @@ std::vector<std::vector<float>> chain_manager::slider_settings() return curr; } -std::vector<ui_menu_item> chain_manager::get_slider_list() +std::vector<ui::menu_item> chain_manager::get_slider_list() { - std::vector<ui_menu_item> sliders; + std::vector<ui::menu_item> sliders; if (!needs_sliders()) { @@ -544,8 +544,8 @@ std::vector<ui_menu_item> chain_manager::get_slider_list() std::vector<bgfx_input_pair*> entry_inputs = entry->inputs(); for (bgfx_input_pair* input : entry_inputs) { - std::vector<ui_menu_item> input_sliders = input->get_slider_list(); - for (ui_menu_item slider : input_sliders) + std::vector<ui::menu_item> input_sliders = input->get_slider_list(); + for (ui::menu_item slider : input_sliders) { sliders.push_back(slider); } @@ -557,12 +557,12 @@ std::vector<ui_menu_item> chain_manager::get_slider_list() { slider_state* core_slider = slider->core_slider(); - ui_menu_item item; + ui::menu_item item; item.text = core_slider->description; item.subtext = ""; item.flags = 0; item.ref = core_slider; - item.type = ui_menu_item_type::SLIDER; + item.type = ui::menu_item_type::SLIDER; m_selection_sliders.push_back(item); sliders.push_back(item); @@ -570,12 +570,12 @@ std::vector<ui_menu_item> chain_manager::get_slider_list() if (chain_sliders.size() > 0) { - ui_menu_item item; + ui::menu_item item; item.text = MENU_SEPARATOR_ITEM; item.subtext = ""; item.flags = 0; item.ref = nullptr; - item.type = ui_menu_item_type::SEPARATOR; + item.type = ui::menu_item_type::SEPARATOR; sliders.push_back(item); } diff --git a/src/osd/modules/render/bgfx/chainmanager.h b/src/osd/modules/render/bgfx/chainmanager.h index 997be246073..9d9714e7957 100644 --- a/src/osd/modules/render/bgfx/chainmanager.h +++ b/src/osd/modules/render/bgfx/chainmanager.h @@ -65,7 +65,7 @@ public: bgfx_chain* screen_chain(uint32_t screen); bgfx_chain* load_chain(std::string name, uint32_t screen_index); bool has_applicable_chain(uint32_t screen); - std::vector<ui_menu_item> get_slider_list(); + std::vector<ui::menu_item> get_slider_list(); std::vector<std::vector<float>> slider_settings(); // Setters @@ -100,7 +100,7 @@ private: std::vector<chain_desc> m_available_chains; std::vector<bgfx_chain*> m_screen_chains; std::vector<std::string> m_chain_names; - std::vector<ui_menu_item> m_selection_sliders; + std::vector<ui::menu_item> m_selection_sliders; std::vector<int32_t> m_current_chain; static const uint32_t CHAIN_NONE; diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp index e19789b89ba..b859667899e 100644 --- a/src/osd/modules/render/bgfx/inputpair.cpp +++ b/src/osd/modules/render/bgfx/inputpair.cpp @@ -111,12 +111,12 @@ void bgfx_input_pair::create_selection_slider(uint32_t screen_index) state->id = screen_index; strcpy(state->description, description.c_str()); - ui_menu_item item; + ui::menu_item item; item.text = state->description; item.subtext = ""; item.flags = 0; item.ref = state; - item.type = ui_menu_item_type::SLIDER; + item.type = ui::menu_item_type::SLIDER; m_selection_slider = item; } @@ -125,9 +125,9 @@ bool bgfx_input_pair::needs_sliders() return chains().screen_count() > 0 && m_available_textures.size() > 1; } -std::vector<ui_menu_item> bgfx_input_pair::get_slider_list() +std::vector<ui::menu_item> bgfx_input_pair::get_slider_list() { - std::vector<ui_menu_item> sliders; + std::vector<ui::menu_item> sliders; if (!needs_sliders()) { diff --git a/src/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h index 1f5c4f59dfc..4ec81552f19 100644 --- a/src/osd/modules/render/bgfx/inputpair.h +++ b/src/osd/modules/render/bgfx/inputpair.h @@ -33,7 +33,7 @@ public: chain_manager& chains() const { return m_chains; } std::string sampler() const { return m_sampler; } std::string texture() const { return m_texture; } - std::vector<ui_menu_item> get_slider_list(); + std::vector<ui::menu_item> get_slider_list(); private: void create_selection_slider(uint32_t screen_index); @@ -46,7 +46,7 @@ private: std::string m_selection; chain_manager& m_chains; int32_t m_current_texture; - ui_menu_item m_selection_slider; + ui::menu_item m_selection_slider; }; #endif // __DRAWBGFX_INPUT_PAIR__ diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index 27718202ac4..a2496408d8d 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -389,7 +389,7 @@ void shaders::end_avi_recording() // shaders::toggle //============================================================ -void shaders::toggle(std::vector<ui_menu_item>& sliders) +void shaders::toggle(std::vector<ui::menu_item>& sliders) { if (master_enable) { @@ -824,7 +824,7 @@ void shaders::init_fsfx_quad(void *vertbuf) // shaders::create_resources //============================================================ -int shaders::create_resources(bool reset, std::vector<ui_menu_item>& sliders) +int shaders::create_resources(bool reset, std::vector<ui::menu_item>& sliders) { if (!master_enable || !d3dintf->post_fx_available) { @@ -1000,7 +1000,7 @@ int shaders::create_resources(bool reset, std::vector<ui_menu_item>& sliders) initialized = true; - std::vector<ui_menu_item> my_sliders = init_slider_list(); + std::vector<ui::menu_item> my_sliders = init_slider_list(); sliders.insert(sliders.end(), my_sliders.begin(), my_sliders.end()); return 0; @@ -2497,9 +2497,9 @@ void *shaders::get_slider_option(int id, int index) return nullptr; } -std::vector<ui_menu_item> shaders::init_slider_list() +std::vector<ui::menu_item> shaders::init_slider_list() { - std::vector<ui_menu_item> sliders; + std::vector<ui::menu_item> sliders; for (slider* slider : internal_sliders) { @@ -2560,12 +2560,12 @@ std::vector<ui_menu_item> shaders::init_slider_list() slider_state* core_slider = slider_alloc(*machine, desc->id, name.c_str(), desc->minval, desc->defval, desc->maxval, desc->step, slider_update_trampoline, slider_arg); - ui_menu_item item; + ui::menu_item item; item.text = core_slider->description; item.subtext = ""; item.flags = 0; item.ref = core_slider; - item.type = ui_menu_item_type::SLIDER; + item.type = ui::menu_item_type::SLIDER; sliders.push_back(item); } } diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h index 794045db25b..96491c9491b 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.h +++ b/src/osd/modules/render/d3d/d3dhlsl.h @@ -303,7 +303,7 @@ public: void init(d3d_base *d3dintf, running_machine *machine, renderer_d3d9 *renderer); bool enabled() { return master_enable; } - void toggle(std::vector<ui_menu_item>& sliders); + void toggle(std::vector<ui::menu_item>& sliders); bool vector_enabled() { return master_enable && vector_enable; } d3d_render_target* get_vector_target(render_primitive *prim); @@ -338,11 +338,11 @@ public: void remove_render_target(int source_width, int source_height, UINT32 screen_index, UINT32 page_index); void remove_render_target(d3d_render_target *rt); - int create_resources(bool reset, std::vector<ui_menu_item>& sliders); + int create_resources(bool reset, std::vector<ui::menu_item>& sliders); void delete_resources(bool reset); // slider-related functions - std::vector<ui_menu_item> init_slider_list(); + std::vector<ui::menu_item> init_slider_list(); void *get_slider_option(int id, int index = 0); private: diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index ca6de0ea608..e4119c9bacd 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -1158,7 +1158,7 @@ void renderer_bgfx::allocate_buffer(render_primitive *prim, UINT32 blend, bgfx:: } } -std::vector<ui_menu_item> renderer_bgfx::get_slider_list() +std::vector<ui::menu_item> renderer_bgfx::get_slider_list() { m_sliders_dirty = false; return m_chains->get_slider_list(); diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h index 76169834760..95d793ba931 100644 --- a/src/osd/modules/render/drawbgfx.h +++ b/src/osd/modules/render/drawbgfx.h @@ -43,7 +43,7 @@ public: virtual int draw(const int update) override; virtual void add_audio_to_recording(const INT16 *buffer, int samples_this_frame) override; - virtual std::vector<ui_menu_item> get_slider_list() override; + virtual std::vector<ui::menu_item> get_slider_list() override; virtual void set_sliders_dirty() override; #ifdef OSD_SDL |