summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/main.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/main.h')
-rw-r--r--src/emu/main.h28
1 files changed, 8 insertions, 20 deletions
diff --git a/src/emu/main.h b/src/emu/main.h
index b13bdee5dc3..e1e9626747f 100644
--- a/src/emu/main.h
+++ b/src/emu/main.h
@@ -67,15 +67,6 @@ public:
// ======================> machine_manager
class ui_manager;
-namespace asio
-{
- class io_context;
-}
-namespace webpp
-{
- class http_server;
- class ws_server;
-}
class machine_manager
{
@@ -84,7 +75,7 @@ protected:
// construction/destruction
machine_manager(emu_options& options, osd_interface& osd);
public:
- virtual ~machine_manager();
+ virtual ~machine_manager() { }
osd_interface &osd() const { return m_osd; }
emu_options &options() const { return m_options; }
@@ -99,18 +90,15 @@ public:
virtual void ui_initialize(running_machine& machine) { }
virtual void update_machine() { }
-
+
+ http_manager *http() { return m_http.get(); }
void start_http_server();
- void start_context();
- webpp::http_server* http_server() const { return m_server.get(); }
+
protected:
- osd_interface & m_osd; // reference to OSD system
- emu_options & m_options; // reference to options
- running_machine * m_machine;
- std::shared_ptr<asio::io_context> m_io_context;
- std::unique_ptr<webpp::http_server> m_server;
- std::unique_ptr<webpp::ws_server> m_wsserver;
- std::thread m_server_thread;
+ osd_interface & m_osd; // reference to OSD system
+ emu_options & m_options; // reference to options
+ running_machine * m_machine;
+ std::unique_ptr<http_manager> m_http;
};