ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into camera_betterer

This commit is contained in:
Arisotura 2022-09-26 21:27:41 +02:00 committed by GitHub
parent 308ea6289a 37e5e2c3c0
commit 5239e42698
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NDS.cpp
View File

@ -2012,7 +2012,7 @@ void debug(u32 param)
fclose(shit);
/*FILE*
shit = fopen("debug/camera9.bin", "wb");
shit = fopen("debug/directboot9.bin", "wb");
for (u32 i = 0x02000000; i < 0x04000000; i+=4)
{
u32 val = DSi::ARM9Read32(i);

15
src/frontend/qt_sdl/Platform.cpp
View File

@ -41,10 +41,10 @@
std::string EmuDirectory;
void emuStop();
extern CameraManager* camManager[2];
void emuStop();
namespace Platform
{
@ -103,7 +103,6 @@ void IPCDeInit()
IPCBuffer->detach();
delete IPCBuffer;
}
IPCBuffer = nullptr;
}
@ -496,6 +495,16 @@ u16 MP_RecvReplies(u8* data, u64 timestamp, u16 aidmask)
return LocalMP::RecvReplies(data, timestamp, aidmask);
}
int MP_RecvHostPacket(u8* data, u64* timestamp)
{
return LocalMP::RecvHostPacket(data, timestamp);
}
u16 MP_RecvReplies(u8* data, u64 timestamp, u16 aidmask)
{
return LocalMP::RecvReplies(data, timestamp, aidmask);
}
bool LAN_Init()
{
if (Config::DirectLAN)

4
src/frontend/qt_sdl/main.h
View File

@ -271,13 +271,13 @@ private slots:
void onOpenAudioSettings();
void onUpdateAudioSettings();
void onAudioSettingsFinished(int res);
void onOpenFirmwareSettings();
void onOpenPathSettings();
void onOpenMPSettings();
void onMPSettingsFinished(int res);
void onOpenWifiSettings();
void onWifiSettingsFinished(int res);
void onOpenFirmwareSettings();
void onFirmwareSettingsFinished(int res);
void onOpenPathSettings();
void onPathSettingsFinished(int res);
void onOpenInterfaceSettings();
void onInterfaceSettingsFinished(int res);