mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-26 15:50:00 -06:00
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:
@ -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);
|
||||
};
|
||||
|
Reference in New Issue
Block a user