switch to INI for settings (easier), make settings a singleton thingy, slightly simplify core pause/stop/reset. Drop support for remappable inputs for now
This commit is contained in:
@@ -7,8 +7,8 @@ EmuThread::EmuThread(const std::shared_ptr<n64::Core> &core, double &fps, Render
|
||||
renderWidget(renderWidget), core(core), settings(settings), fps(fps) {}
|
||||
|
||||
void EmuThread::run() noexcept {
|
||||
isRunning = true;
|
||||
|
||||
if(!core->romLoaded) return;
|
||||
|
||||
auto lastSample = std::chrono::high_resolution_clock::now();
|
||||
auto avgFps = 16.667;
|
||||
auto sampledFps = 0;
|
||||
@@ -49,15 +49,11 @@ void EmuThread::TogglePause() const noexcept {
|
||||
}
|
||||
|
||||
void EmuThread::Reset() const noexcept {
|
||||
core->pause = true;
|
||||
core->Stop();
|
||||
core->LoadROM(core->rom);
|
||||
core->pause = false;
|
||||
}
|
||||
|
||||
void EmuThread::Stop() const noexcept {
|
||||
Util::RPC::GetInstance().Update(Util::RPC::Idling);
|
||||
core->rom = {};
|
||||
core->pause = true;
|
||||
core->Stop();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user