[Emulator] Removed legacy title re-launching code
This commit is contained in:
parent
ec267c348a
commit
c004d669c2
|
@ -642,14 +642,7 @@ void EmulatorApp::EmulatorThread() {
|
||||||
// Now, we're going to use this thread to drive events related to emulation.
|
// Now, we're going to use this thread to drive events related to emulation.
|
||||||
while (!emulator_thread_quit_requested_.load(std::memory_order_relaxed)) {
|
while (!emulator_thread_quit_requested_.load(std::memory_order_relaxed)) {
|
||||||
xe::threading::Wait(emulator_thread_event_.get(), false);
|
xe::threading::Wait(emulator_thread_event_.get(), false);
|
||||||
while (true) {
|
emulator_->WaitUntilExit();
|
||||||
emulator_->WaitUntilExit();
|
|
||||||
if (emulator_->TitleRequested()) {
|
|
||||||
emulator_->LaunchNextTitle();
|
|
||||||
} else {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -905,20 +905,6 @@ bool Emulator::RestoreFromFile(const std::filesystem::path& path) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Emulator::TitleRequested() {
|
|
||||||
auto xam = kernel_state()->GetKernelModule<kernel::xam::XamModule>("xam.xex");
|
|
||||||
return xam->loader_data().launch_data_present;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Emulator::LaunchNextTitle() {
|
|
||||||
auto xam = kernel_state()->GetKernelModule<kernel::xam::XamModule>("xam.xex");
|
|
||||||
auto next_title = xam->loader_data().launch_path;
|
|
||||||
|
|
||||||
// Swap disk doesn't require reloading
|
|
||||||
// This function should be purged?
|
|
||||||
CompleteLaunch("", next_title);
|
|
||||||
}
|
|
||||||
|
|
||||||
const std::filesystem::path Emulator::GetNewDiscPath(
|
const std::filesystem::path Emulator::GetNewDiscPath(
|
||||||
std::string window_message) {
|
std::string window_message) {
|
||||||
std::filesystem::path path = "";
|
std::filesystem::path path = "";
|
||||||
|
|
|
@ -248,8 +248,6 @@ class Emulator {
|
||||||
bool RestoreFromFile(const std::filesystem::path& path);
|
bool RestoreFromFile(const std::filesystem::path& path);
|
||||||
|
|
||||||
// The game can request another title to be loaded.
|
// The game can request another title to be loaded.
|
||||||
bool TitleRequested();
|
|
||||||
void LaunchNextTitle();
|
|
||||||
const std::filesystem::path GetNewDiscPath(std::string window_message = "");
|
const std::filesystem::path GetNewDiscPath(std::string window_message = "");
|
||||||
|
|
||||||
void WaitUntilExit();
|
void WaitUntilExit();
|
||||||
|
|
Loading…
Reference in New Issue