diff options
Diffstat (limited to 'src/emu/main.h')
-rw-r--r-- | src/emu/main.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/emu/main.h b/src/emu/main.h index 609985a48bf..78553ca5236 100644 --- a/src/emu/main.h +++ b/src/emu/main.h @@ -6,18 +6,17 @@ Controls execution of the core emulator system. ***************************************************************************/ +#ifndef MAME_EMU_MAIN_H +#define MAME_EMU_MAIN_H #pragma once -#ifndef __EMU_H__ -#error Dont include this file directly; include emu.h instead. -#endif +#include "emufwd.h" -#ifndef MAME_EMU_MAIN_H -#define MAME_EMU_MAIN_H +#include <memory> +#include <string> +#include <vector> -#include <thread> -#include <ctime> //************************************************************************** // CONSTANTS @@ -55,23 +54,24 @@ public: static void display_ui_chooser(running_machine &machine); static int start_frontend(emu_options &options, osd_interface &osd, std::vector<std::string> &args); static int start_frontend(emu_options &options, osd_interface &osd, int argc, char *argv[]); - static void draw_user_interface(running_machine& machine); + static bool draw_user_interface(running_machine& machine); static void periodic_check(); static bool frame_hook(); static void sound_hook(); - static void layout_file_cb(util::xml::data_node const &layout); + static void layout_script_cb(layout_file &file, const char *script); static bool standalone(); }; class machine_manager { - DISABLE_COPYING(machine_manager); protected: // construction/destruction - machine_manager(emu_options& options, osd_interface& osd); + machine_manager(emu_options &options, osd_interface &osd); + machine_manager(machine_manager const &) = delete; + public: - virtual ~machine_manager() { } + virtual ~machine_manager(); osd_interface &osd() const { return m_osd; } emu_options &options() const { return m_options; } @@ -88,7 +88,7 @@ public: virtual void update_machine() { } - http_manager *http() { return m_http.get(); } + http_manager *http(); void start_http_server(); protected: |