Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-05-03 10:44:49 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
wheremyfoodat 2024-03-20 18:25:12 +02:00
parent e576e64736
commit 1a934fc2c7
7 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

0
include/mappings.hpp → include/input_mappings.hpp
View file

6
include/panda_qt/main_window.hpp
View file

@ -11,7 +11,7 @@
#include <vector>
#include "emulator.hpp"
#include "mappings.hpp"
#include "input_mappings.hpp"
#include "panda_qt/about_window.hpp"
#include "panda_qt/config_window.hpp"
#include "panda_qt/cheats_window.hpp"
@ -81,7 +81,6 @@ class MainWindow : public QMainWindow {
// This would normally be an std::unique_ptr but it's shared between threads so definitely not
Emulator* emu = nullptr;
InputMappings keyboardMappings;
std::thread emuThread;
std::atomic<bool> appRunning = true; // Is the application itself running?
@ -89,7 +88,8 @@ class MainWindow : public QMainWindow {
std::mutex messageQueueMutex;
std::vector<EmulatorMessage> messageQueue;
ScreenWidget screen;
InputMappings keyboardMappings;
ScreenWidget screen;
AboutWindow* aboutWindow;
ConfigWindow* configWindow;
CheatsWindow* cheatsEditor;

5
include/panda_sdl/frontend_sdl.hpp
View file

@ -5,11 +5,10 @@
#include <filesystem>
#include "emulator.hpp"
#include "mappings.hpp"
#include "input_mappings.hpp"
class FrontendSDL {
Emulator emu;
InputMappings keyboardMappings;
#ifdef PANDA3DS_ENABLE_OPENGL
SDL_GLContext glContext;
#endif
@ -22,6 +21,8 @@ class FrontendSDL {
SDL_Window* window = nullptr;
SDL_GameController* gameController = nullptr;
InputMappings keyboardMappings;
int gameControllerID;
bool programRunning = true;