Fixed software loading to load independently of Jaguar ROM space, added new

[virtualjaguar] / src / gui / configdialog.cpp

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 886cb0548e1c791b26514c76b709e2f42f06aefc..3ee9a92108e31649770992c7022f113962a86460 100644 (file)
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -16,6 +16,7 @@
 
 #include "generaltab.h"
 #include "controllertab.h"
+#include "alpinetab.h"
 #include "settings.h"
 
 
@@ -24,9 +25,16 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
        tabWidget = new QTabWidget;
        generalTab = new GeneralTab(this);
        controllerTab = new ControllerTab(this);
+
+       if (vjs.hardwareTypeAlpine)
+               alpineTab = new AlpineTab(this);
+
        tabWidget->addTab(generalTab, tr("General"));
        tabWidget->addTab(controllerTab, tr("Controller"));
 
+       if (vjs.hardwareTypeAlpine)
+               tabWidget->addTab(alpineTab, tr("Alpine"));
+
        buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
        connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
@@ -55,6 +63,13 @@ void ConfigDialog::LoadDialogFromSettings(void)
 
        generalTab->useBIOS->setChecked(vjs.useJaguarBIOS);
        generalTab->useDSP->setChecked(vjs.DSPEnabled);
+       generalTab->useHostAudio->setChecked(vjs.audioEnabled);
+
+       if (vjs.hardwareTypeAlpine)
+       {
+               alpineTab->edit1->setText(vjs.alpineROMPath);
+               alpineTab->writeROM->setChecked(vjs.allowWritesToROM);
+       }
 }
 
 void ConfigDialog::UpdateVJSettings(void)
@@ -66,4 +81,11 @@ void ConfigDialog::UpdateVJSettings(void)
 
        vjs.useJaguarBIOS = generalTab->useBIOS->isChecked();
        vjs.DSPEnabled    = generalTab->useDSP->isChecked();
+       vjs.audioEnabled  = generalTab->useHostAudio->isChecked();
+
+       if (vjs.hardwareTypeAlpine)
+       {
+               strcpy(vjs.alpineROMPath, alpineTab->edit1->text().toAscii().data());
+               vjs.allowWritesToROM = alpineTab->writeROM->isChecked();
+       }
 }