summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame/mame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend/mame/mame.cpp')
-rw-r--r--src/frontend/mame/mame.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/frontend/mame/mame.cpp b/src/frontend/mame/mame.cpp
index c162e5ff12a..83c4a6cf2b7 100644
--- a/src/frontend/mame/mame.cpp
+++ b/src/frontend/mame/mame.cpp
@@ -12,12 +12,14 @@
#include "mame.h"
#include "emuopts.h"
#include "mameopts.h"
+#include "pluginopts.h"
#include "osdepend.h"
#include "validity.h"
#include "clifront.h"
#include "drivenum.h"
#include "luaengine.h"
#include <time.h>
+#include "ui/ui.h"
#include "ui/selgame.h"
#include "ui/simpleselgame.h"
#include "cheat.h"
@@ -272,7 +274,7 @@ ui_manager* mame_machine_manager::create_ui(running_machine& machine)
machine.add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(mame_machine_manager::reset), this));
// start the inifile manager
- m_inifile = std::make_unique<inifile_manager>(machine);
+ m_inifile = std::make_unique<inifile_manager>(machine, m_ui->options());
m_ui->set_startup_text("Initializing...", true);
@@ -280,10 +282,10 @@ ui_manager* mame_machine_manager::create_ui(running_machine& machine)
m_autoboot_timer = machine.scheduler().timer_alloc(timer_expired_delegate(FUNC(mame_machine_manager::autoboot_callback), this));
// start datfile manager
- m_datfile = std::make_unique<datfile_manager>(machine);
+ m_datfile = std::make_unique<datfile_manager>(machine, m_ui->options());
// start favorite manager
- m_favorite = std::make_unique<favorite_manager>(machine);
+ m_favorite = std::make_unique<favorite_manager>(machine, m_ui->options());
return m_ui.get();
}
@@ -308,12 +310,12 @@ const char * emulator_info::get_build_version() { return build_version; }
void emulator_info::display_ui_chooser(running_machine& machine)
{
// force the UI to show the game select screen
- if (strcmp(machine.options().ui(), "simple") == 0) {
- ui_simple_menu_select_game::force_game_select(machine, &machine.render().ui_container());
- }
- else {
- ui_menu_select_game::force_game_select(machine, &machine.render().ui_container());
- }
+ mame_ui_manager &mui = mame_machine_manager::instance()->ui();
+ render_container *container = &machine.render().ui_container();
+ if (strcmp(machine.options().ui(), "simple") == 0)
+ ui_simple_menu_select_game::force_game_select(mui, container);
+ else
+ ui_menu_select_game::force_game_select(mui, container);
}
int emulator_info::start_frontend(emu_options &options, osd_interface &osd, int argc, char *argv[])