Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'h0tw1r3-master'

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-01-06 08:33:28 +01:00
commit fdce729bcc
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emu/emuopts.cpp
View File

@ -185,6 +185,7 @@ const options_entry emu_options::s_option_entries[] =
{ OPTION_AUTOBOOT_COMMAND ";ab", nullptr, OPTION_STRING, "command to execute after machine boot" },
{ OPTION_AUTOBOOT_DELAY, "2", OPTION_INTEGER, "timer delay in sec to trigger command execution on autoboot" },
{ OPTION_AUTOBOOT_SCRIPT ";script", nullptr, OPTION_STRING, "lua script to execute after machine boot" },
{ OPTION_CONSOLE, "0", OPTION_BOOLEAN, "enable emulator LUA console" },
{ nullptr }
};

4
src/emu/emuopts.h
View File

@ -189,6 +189,8 @@ enum
#define OPTION_AUTOBOOT_DELAY "autoboot_delay"
#define OPTION_AUTOBOOT_SCRIPT "autoboot_script"
#define OPTION_CONSOLE "console"
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@ -361,6 +363,8 @@ public:
int autoboot_delay() const { return int_value(OPTION_AUTOBOOT_DELAY); }
const char *autoboot_script() const { return value(OPTION_AUTOBOOT_SCRIPT); }
bool console() const { return bool_value(OPTION_CONSOLE); }
// FIXME: Couriersud: This should be in image_device_exit
void remove_device_options();

5
src/emu/luaengine.cpp
View File

@ -9,6 +9,7 @@
***************************************************************************/
#include <limits>
#include <thread>
#include "lua.hpp"
#include "luabridge/Source/LuaBridge/LuaBridge.h"
#include <signal.h>
@ -860,14 +861,12 @@ void lua_engine::serve_lua()
} while (1);
}
/*
static void *serve_lua(void *param)
{
lua_engine *engine = (lua_engine *)param;
engine->serve_lua();
return NULL;
}
*/
//-------------------------------------------------
// lua_engine - constructor
@ -1024,6 +1023,8 @@ void lua_engine::initialize()
void lua_engine::start_console()
{
std::thread th(::serve_lua, this);
th.detach();
}
//-------------------------------------------------

3
src/emu/mame.cpp
View File

@ -167,6 +167,9 @@ int machine_manager::execute()
int error = MAMERR_NONE;
m_lua->initialize();
if (m_options.console()) {
m_lua->start_console();
}
while (error == MAMERR_NONE && !exit_pending)
{
m_new_driver_pending = nullptr;