diff options
Diffstat (limited to 'src/emu/machine.cpp')
-rw-r--r-- | src/emu/machine.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 6979b2cfec5..c9b72fde6e4 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -119,7 +119,6 @@ running_machine::running_machine(const machine_config &_config, machine_manager primary_screen(nullptr), debug_flags(0), romload_data(nullptr), - ui_input_data(nullptr), debugcpu_data(nullptr), m_config(_config), m_system(_config.gamedrv()), @@ -216,9 +215,9 @@ TIMER_CALLBACK_MEMBER(running_machine::autoboot_callback) void running_machine::start() { // initialize basic can't-fail systems here - config_init(*this); + m_configuration = std::make_unique<configuration_manager>(*this); m_input = std::make_unique<input_manager>(*this); - output_init(*this); + m_output = std::make_unique<output_manager>(*this); m_render = std::make_unique<render_manager>(*this); m_bookkeeping = std::make_unique<bookkeeping_manager>(*this); @@ -243,7 +242,7 @@ void running_machine::start() m_base_time = newbase; // intialize UI input - ui_input_init(*this); + m_ui_input = std::make_unique<ui_input_manager>(*this); // initialize the streams engine before the sound devices start m_sound = std::make_unique<sound_manager>(*this); @@ -334,7 +333,7 @@ int running_machine::run(bool firstrun) start(); // load the configuration settings and NVRAM - config_load_settings(*this); + m_configuration->load_settings(); // disallow save state registrations starting here. // Don't do it earlier, config load can create network @@ -389,7 +388,7 @@ int running_machine::run(bool firstrun) // save the NVRAM and configuration sound().ui_mute(true); nvram_save(); - config_save_settings(*this); + m_configuration->save_settings(); } catch (emu_fatalerror &fatal) { |