piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 15:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

integrate local MP comm within the IPC module

Browse Source
This commit is contained in:
Arisotura
2023-03-11 21:16:37 +01:00
parent d296ce3f5e
commit 6fed0f8d75
4 changed files with 571 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/qt_sdl/main.cpp
View File

@ -317,6 +317,9 @@ void EmuThread::run()
{
u32 mainScreenPos[3];
IPC::InitSema();
IPC::SetMPRecvTimeout(Config::MPRecvTimeout);
NDS::Init();
mainScreenPos[0] = 0;
@ -359,7 +362,7 @@ void EmuThread::run()
while (EmuRunning != emuStatus_Exit)
{
IPC::Process();
IPC::ProcessCommands();
if (IPC::CommandReceived(IPC::Cmd_Pause)) emit windowIPCPause();
@ -658,6 +661,7 @@ void EmuThread::run()
GPU::DeInitRenderer();
NDS::DeInit();
IPC::DeInitSema();
//Platform::LAN_DeInit();
}
@ -2965,7 +2969,8 @@ void MainWindow::onOpenMPSettings()
void MainWindow::onMPSettingsFinished(int res)
{
AudioInOut::AudioMute(mainWindow);
LocalMP::SetRecvTimeout(Config::MPRecvTimeout);
//LocalMP::SetRecvTimeout(Config::MPRecvTimeout);
IPC::SetMPRecvTimeout(Config::MPRecvTimeout);
emuThread->emuUnpause();
}
@ -3272,6 +3277,8 @@ int main(int argc, char** argv)
MelonApplication melon(argc, argv);
IPC::Init();
CLI::CommandLineOptions* options = CLI::ManageArgs(melon);
// http://stackoverflow.com/questions/14543333/joystick-wont-work-using-sdl
@ -3386,6 +3393,7 @@ int main(int argc, char** argv)
SDL_Quit();
Platform::DeInit();
IPC::DeInit();
return ret;
}