Added BIOS and DSP options to configure dialog.

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 82a4010160e8503f2969ff4c732ddccff2aa02cd..b313f66c6eba21bc35b76fd25b5af6151668a565 100644 (file)
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -10,6 +10,7 @@
 // ---  ----------  -------------------------------------------------------------
 // JLH  12/23/2009  Created this file
 // JLH  01/21/2011  Added SDL initialization
+// JLH  06/26/2011  Added fix to keep SDL from hijacking main() on win32
 //
 
 #include "app.h"

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index f9b3fe40de6fac0053d7ffd6a0401c45d36bd032..886cb0548e1c791b26514c76b709e2f42f06aefc 100644 (file)
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -52,6 +52,9 @@ void ConfigDialog::LoadDialogFromSettings(void)
        generalTab->edit2->setText(vjs.CDBootPath);
        generalTab->edit3->setText(vjs.EEPROMPath);
        generalTab->edit4->setText(vjs.ROMPath);
+
+       generalTab->useBIOS->setChecked(vjs.useJaguarBIOS);
+       generalTab->useDSP->setChecked(vjs.DSPEnabled);
 }
 
 void ConfigDialog::UpdateVJSettings(void)
@@ -60,4 +63,7 @@ void ConfigDialog::UpdateVJSettings(void)
        strcpy(vjs.CDBootPath,  generalTab->edit2->text().toAscii().data());
        strcpy(vjs.EEPROMPath,  generalTab->edit3->text().toAscii().data());
        strcpy(vjs.ROMPath,     generalTab->edit4->text().toAscii().data());
+
+       vjs.useJaguarBIOS = generalTab->useBIOS->isChecked();
+       vjs.DSPEnabled    = generalTab->useDSP->isChecked();
 }

diff --git a/src/gui/generaltab.cpp b/src/gui/generaltab.cpp
index 8cc7441dde0835f1bee2e39057ca306e46a460cc..21304b5a5ac8e947cdbcea26a9d822693da8db10 100644 (file)
--- a/src/gui/generaltab.cpp
+++ b/src/gui/generaltab.cpp
@@ -50,7 +50,17 @@ GeneralTab::GeneralTab(QWidget * parent/*= 0*/): QWidget(parent)
        layout3->addLayout(layout1);
        layout3->addLayout(layout2);
 
-       setLayout(layout3);
+       QVBoxLayout * layout4 = new QVBoxLayout;
+       layout4->addLayout(layout3);
+
+       // Checkboxes...
+       useBIOS = new QCheckBox(tr("Enable Jaguar BIOS"));
+       useDSP  = new QCheckBox(tr("Enable DSP"));
+
+       layout4->addWidget(useBIOS);
+       layout4->addWidget(useDSP);
+
+       setLayout(layout4);
 }
 
 GeneralTab::~GeneralTab()

diff --git a/src/gui/generaltab.h b/src/gui/generaltab.h
index 07129dcee3ba9f11046dadc203dfc46057720d06..8584b7b745a7fa019a8b2e97d3b8dc6710e32135 100644 (file)
--- a/src/gui/generaltab.h
+++ b/src/gui/generaltab.h
@@ -16,6 +16,9 @@ class GeneralTab: public QWidget
                QLineEdit * edit2;
                QLineEdit * edit3;
                QLineEdit * edit4;
+
+               QCheckBox * useBIOS;
+               QCheckBox * useDSP;
 };
 
 #endif // __GENERALTAB_H__