summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-15 16:08:28 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-15 16:08:28 +0200
commit0bcc96406d187ce2907b05bd54c71ec7ef4085ed (patch)
tree1cf51aba9ab17cd5427b6ebb32aca5d5376f98df
parent1a83c84eaeede7f5a735ac1f299bb43a47ca4a47 (diff)
renamed class to osd_watchdog (nw)
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp2
-rw-r--r--src/osd/modules/lib/osdobj_common.h2
-rw-r--r--src/osd/watchdog.cpp8
-rw-r--r--src/osd/watchdog.h6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index adc202ce4db..c9d4a37798d 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -428,7 +428,7 @@ void osd_common_t::init(running_machine &machine)
if (watchdog_timeout != 0)
{
- m_watchdog = std::make_unique<watchdog>();
+ m_watchdog = std::make_unique<osd_watchdog>();
m_watchdog->setTimeout(watchdog_timeout);
}
}
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 9afce249eb1..00778fac569 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -282,7 +282,7 @@ protected:
input_module* m_lightgun_input;
input_module* m_joystick_input;
output_module* m_output;
- std::unique_ptr<watchdog> m_watchdog;
+ std::unique_ptr<osd_watchdog> m_watchdog;
std::vector<ui_menu_item> m_sliders;
private:
diff --git a/src/osd/watchdog.cpp b/src/osd/watchdog.cpp
index 8a86464cb56..f963ef13f07 100644
--- a/src/osd/watchdog.cpp
+++ b/src/osd/watchdog.cpp
@@ -17,7 +17,7 @@
static void *watchdog_thread(void *param)
{
- watchdog *thiz = (watchdog *) param;
+ osd_watchdog *thiz = (osd_watchdog *) param;
while (TRUE)
{
@@ -41,7 +41,7 @@ static void *watchdog_thread(void *param)
return nullptr;
}
-watchdog::watchdog(void)
+osd_watchdog::osd_watchdog(void)
: m_event(1,0)
{
m_do_exit = 0;
@@ -49,7 +49,7 @@ watchdog::watchdog(void)
m_timeout = 60 * osd_ticks_per_second();
}
-watchdog::~watchdog(void)
+osd_watchdog::~osd_watchdog(void)
{
m_do_exit = 1;
m_event.set();
@@ -57,7 +57,7 @@ watchdog::~watchdog(void)
delete m_thread;
}
-void watchdog::setTimeout(int timeout)
+void osd_watchdog::setTimeout(int timeout)
{
m_timeout = timeout * osd_ticks_per_second();
this->reset();
diff --git a/src/osd/watchdog.h b/src/osd/watchdog.h
index f9c06e72bb0..dbcccf43abf 100644
--- a/src/osd/watchdog.h
+++ b/src/osd/watchdog.h
@@ -14,11 +14,11 @@
#include <atomic>
#include <thread>
-class watchdog
+class osd_watchdog
{
public:
- watchdog(void);
- ~watchdog(void);
+ osd_watchdog(void);
+ ~osd_watchdog(void);
void reset() { m_event.set(); }