summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/monitor/monitor_common.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/monitor/monitor_common.h')
-rw-r--r--src/osd/modules/monitor/monitor_common.h36
1 files changed, 20 insertions, 16 deletions
diff --git a/src/osd/modules/monitor/monitor_common.h b/src/osd/modules/monitor/monitor_common.h
index 4316722c9bb..4b1d17d2f1f 100644
--- a/src/osd/modules/monitor/monitor_common.h
+++ b/src/osd/modules/monitor/monitor_common.h
@@ -4,11 +4,17 @@
* monitor_common.h
*
*/
-#ifndef __MONITOR_COMMON_H__
-#define __MONITOR_COMMON_H__
+#ifndef MAME_OSD_MONITOR_MONITOR_COMMON_H
+#define MAME_OSD_MONITOR_MONITOR_COMMON_H
-#include "modules/lib/osdobj_common.h"
+#pragma once
+
+#include "monitor_module.h"
+
+#include <cstdint>
#include <map>
+#include <memory>
+
//============================================================
// monitor_module_base
@@ -16,32 +22,30 @@
class monitor_module_base : public monitor_module
{
-private:
- std::map<std::uint64_t, std::shared_ptr<osd_monitor_info>> m_monitor_index;
-
-protected:
- bool m_initialized;
-
public:
- monitor_module_base(const char* type, const char* name)
- : monitor_module(type, name),
- m_initialized(false)
+ monitor_module_base(const char* type, const char* name) :
+ monitor_module(type, name),
+ m_initialized(false)
{
}
std::shared_ptr<osd_monitor_info> pick_monitor(osd_options& options, int index) override;
std::shared_ptr<osd_monitor_info> monitor_from_handle(std::uint64_t handle) override;
- int init(const osd_options& options) override;
+ int init(osd_interface &osd, const osd_options& options) override;
void exit() override;
protected:
- virtual int init_internal(const osd_options& options) = 0;
+ virtual int init_internal(const osd_options &options) = 0;
void add_monitor(std::shared_ptr<osd_monitor_info> monitor);
+ bool m_initialized;
+
private:
- std::shared_ptr<osd_monitor_info> pick_monitor_internal(osd_options& options, int index);
static float get_aspect(const char *defdata, const char *data, int report_error);
+
+ std::map<std::uint64_t, std::shared_ptr<osd_monitor_info> > m_monitor_index;
+ std::shared_ptr<osd_monitor_info> pick_monitor_internal(osd_options& options, int index);
};
-#endif
+#endif // MAME_OSD_MONITOR_MONITOR_COMMON_H