summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/main.cpp')
-rw-r--r--src/emu/main.cpp23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/emu/main.cpp b/src/emu/main.cpp
index 9255d9f7c67..12cde5cf299 100644
--- a/src/emu/main.cpp
+++ b/src/emu/main.cpp
@@ -2,24 +2,39 @@
// copyright-holders:Nicola Salmoria, Aaron Giles
/***************************************************************************
-main.cpp
+ main.cpp
-Controls execution of the core MAME system.
+ Controls execution of the core MAME system.
***************************************************************************/
#include "emu.h"
+#include "main.h"
+
#include "emuopts.h"
+#include "http.h"
+
-machine_manager::machine_manager(emu_options& options, osd_interface& osd)
- : m_osd(osd),
+machine_manager::machine_manager(emu_options& options, osd_interface& osd) :
+ m_osd(osd),
m_options(options),
m_machine(nullptr)
{
}
+
+machine_manager::~machine_manager()
+{
+}
+
+
void machine_manager::start_http_server()
{
m_http = std::make_unique<http_manager>(options().http(), options().http_port(), options().http_root());
}
+
+http_manager *machine_manager::http()
+{
+ return m_http.get();
+}