merge doublemelon (#2067)

non-exhaustive (but exhausting) list of changes:

* base laid for multiple window support, but will likely require more work to work correctly
* encapsulation of frontend state for proper multi-instance support
* (JIT still needs a fix for the NDS::Current workaround but we can get there later)
* new, more flexible configuration system
This commit is contained in:
Arisotura
2024-06-15 13:52:47 +02:00
committed by GitHub
parent 8e9b88d01d
commit 25a7b1ca1d
111 changed files with 16802 additions and 5042 deletions

View File

@ -28,6 +28,8 @@
namespace Ui { class CameraSettingsDialog; }
class CameraSettingsDialog;
class EmuInstance;
class CameraPreviewPanel : public QWidget
{
Q_OBJECT
@ -92,15 +94,22 @@ private slots:
private:
Ui::CameraSettingsDialog* ui;
EmuInstance* emuInstance;
QButtonGroup* grpInputType;
CameraPreviewPanel* previewPanel;
int currentId;
Config::CameraConfig* currentCfg;
Config::Table* currentCfg;
CameraManager* currentCam;
Config::CameraConfig oldCamSettings[2];
struct
{
int InputType; // 0=blank 1=image 2=camera
std::string ImagePath;
std::string CamDeviceName;
bool XFlip;
} oldCamSettings[2];
void populateCamControls(int id);
};