diff options
author | 2017-07-05 17:27:34 +0100 | |
---|---|---|
committer | 2017-07-05 17:27:34 +0100 | |
commit | 0206314395c7dcf7b51311e635588778f6d9cca3 (patch) | |
tree | ab242d5e87d9c1f2578edda08c7f150b841831e6 /src/emu/machine.cpp | |
parent | 2924e3c17470291a520492d68189dda16e99e2a4 (diff) |
Add an external panel for the Ensoniq VFX family of keyboards, with a websocket interface and an HTML/Javascript implementation that can be served over HTTP.
Diffstat (limited to 'src/emu/machine.cpp')
-rw-r--r-- | src/emu/machine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 36e107e838d..1e0f4323a7e 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -344,8 +344,6 @@ int running_machine::run(bool quiet) export_http_api(); - m_manager.http()->update(); - // run the CPUs until a reset or exit m_hard_reset_pending = false; while ((!m_hard_reset_pending && !m_exit_pending) || m_saveload_schedule != saveload_schedule::NONE) @@ -1193,7 +1191,7 @@ running_machine::logerror_callback_item::logerror_callback_item(logerror_callbac void running_machine::export_http_api() { - m_manager.http()->add("/api/machine", [this](std::string) + m_manager.http()->add_http_handler("/api/machine", [this](http_manager::http_request_ptr request, http_manager::http_response_ptr response) { rapidjson::StringBuffer s; rapidjson::Writer<rapidjson::StringBuffer> writer(s); @@ -1210,8 +1208,10 @@ void running_machine::export_http_api() writer.EndArray(); writer.EndObject(); - - return std::make_tuple(std::string(s.GetString()), 200, "application/json"); + + response->set_status(200); + response->set_content_type("application/json"); + response->set_body(s.GetString()); }); } |