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

Backport LAN (#2131)

Browse Source 
backport the old LAN feature to the modern melonDS codebase.
This commit is contained in:
Arisotura
2024-08-10 23:20:50 +02:00
committed by GitHub
parent ec71b15505
commit 8d31875902
34 changed files with 4163 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,18 +22,14 @@
#include <string.h>
#include <optional>
#include <vector>
#include <string>
#include <algorithm>
#include <QProcess>
#include <QApplication>
#include <QStyle>
#include <QMessageBox>
#include <QMenuBar>
#include <QMimeDatabase>
#include <QFileDialog>
#include <QInputDialog>
#include <QPaintEvent>
#include <QPainter>
#include <QKeyEvent>
#include <QMimeData>
@ -57,24 +53,14 @@
#include "duckstation/gl/context.h"
#include "main.h"
#include "CheatsDialog.h"
#include "DateTimeDialog.h"
#include "EmuSettingsDialog.h"
#include "InputConfig/InputConfigDialog.h"
#include "VideoSettingsDialog.h"
#include "ROMInfoDialog.h"
#include "RAMInfoDialog.h"
#include "PowerManagement/PowerManagementDialog.h"
#include "version.h"
#include "Config.h"
#include "DSi.h"
#include "EmuInstance.h"
#include "ArchiveUtil.h"
#include "CameraManager.h"
#include "LocalMP.h"
#include "MPInterface.h"
#include "Net.h"
#include "CLI.h"
@ -87,7 +73,6 @@ using namespace melonDS;
QString* systemThemeName;
QString emuDirectory;
const int kMaxEmuInstances = 16;
@ -95,10 +80,14 @@ EmuInstance* emuInstances[kMaxEmuInstances];
CameraManager* camManager[2];
bool camStarted[2];
LocalMP localMp;
std::optional<LibPCap> pcap;
Net net;
QElapsedTimer sysTimer;
void NetInit()
{
Config::Table cfg = Config::GetGlobalTable();
@ -159,12 +148,25 @@ void deleteEmuInstance(int id)
emuInstances[id] = nullptr;
}
void deleteAllEmuInstances()
void deleteAllEmuInstances(int first)
{
for (int i = 0; i < kMaxEmuInstances; i++)
for (int i = first; i < kMaxEmuInstances; i++)
deleteEmuInstance(i);
}
int numEmuInstances()
{
int ret = 0;
for (int i = 0; i < kMaxEmuInstances; i++)
{
if (emuInstances[i])
ret++;
}
return ret;
}
void pathInit()
{
@ -203,6 +205,28 @@ void pathInit()
}
void setMPInterface(MPInterfaceType type)
{
// switch to the requested MP interface
MPInterface::Set(type);
// set receive timeout
// TODO: different settings per interface?
MPInterface::Get().SetRecvTimeout(Config::GetGlobalTable().GetInt("MP.RecvTimeout"));
// update UI appropriately
// TODO: decide how to deal with multi-window when it becomes a thing
for (int i = 0; i < kMaxEmuInstances; i++)
{
EmuInstance* inst = emuInstances[i];
if (!inst) continue;
MainWindow* win = inst->getMainWindow();
if (win) win->updateMPInterface(type);
}
}
MelonApplication::MelonApplication(int& argc, char** argv)
: QApplication(argc, argv)
@ -237,6 +261,7 @@ bool MelonApplication::event(QEvent *event)
int main(int argc, char** argv)
{
sysTimer.start();
srand(time(nullptr));
for (int i = 0; i < kMaxEmuInstances; i++)
@ -308,7 +333,10 @@ int main(int argc, char** argv)
}
}
// localMp is initialized at this point
// default MP interface type is local MP
// this will be changed if a LAN or netplay session is initiated
setMPInterface(MPInterface_Local);
NetInit();
createEmuInstance();