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

actually complete the input config dialog

Browse Source
This commit is contained in:
Arisotura
2020-05-19 20:48:52 +02:00
parent 920ff9778d
commit 34506ff2bb
7 changed files with 434 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,10 +27,12 @@
#include <QFileDialog>
#include <QPaintEvent>
#include <QPainter>
#include <QKeyEvent>
#include <SDL2/SDL.h>
#include "main.h"
#include "Input.h"
#include "EmuSettingsDialog.h"
#include "InputConfigDialog.h"
@ -136,12 +138,6 @@ void EmuThread::run()
}
/*Touching = false;
KeyInputMask = 0xFFF;
JoyInputMask = 0xFFF;
KeyHotkeyMask = 0;
JoyHotkeyMask = 0;
HotkeyMask = 0;
LastHotkeyMask = 0;
LidStatus = false;*/
u32 nframes = 0;
@ -154,6 +150,7 @@ void EmuThread::run()
while (EmuRunning != 0)
{
Input::Process();
/*ProcessInput();
if (HotkeyPressed(HK_FastForwardToggle))
@ -999,6 +996,9 @@ int main(int argc, char** argv)
Frontend::Init_ROM();
Frontend::Init_Audio(audioFreq);
Input::JoystickID = Config::JoystickID;
Input::OpenJoystick();
mainWindow = new MainWindow();
mainWindow->show();
@ -1047,7 +1047,8 @@ int main(int argc, char** argv)
emuThread->wait();
delete emuThread;
//if (Joystick) SDL_JoystickClose(Joystick);
Input::CloseJoystick();
if (audioDevice) SDL_CloseAudioDevice(audioDevice);
//if (MicDevice) SDL_CloseAudioDevice(MicDevice);