summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7011147)
The DSP is now running in the host audio IRQ, so turning it off will
turn off the host audio IRQ as well. Also fixed DAC to reflect this
change. Added a few minor fixups to a few files as well.
src/m68000/obj/
src/version.h
virtualjaguar
src/m68000/obj/
src/version.h
virtualjaguar
+virtualjaguar.log
+src/*~
+src/m68000/*~
+eeproms/*.eep
+software/
+*~
rm makefile-qt
make CROSS=i686-pc-mingw32-
#rel=`svn info | grep Revision | cut -f 2 -d ' '`
rm makefile-qt
make CROSS=i686-pc-mingw32-
#rel=`svn info | grep Revision | cut -f 2 -d ' '`
-#rel=`git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`
+rel=`git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`
cd release && upx -9v virtualjaguar.exe && zip -9v vj-$rel.zip virtualjaguar.exe
cd release && upx -9v virtualjaguar.exe && zip -9v vj-$rel.zip virtualjaguar.exe
{
SDLSoundInitialized = false;
{
SDLSoundInitialized = false;
+// if (!vjs.audioEnabled)
+ if (!vjs.DSPEnabled)
- WriteLog("DAC: Host audio playback disabled.\n");
+ WriteLog("DAC: DSP/host audio playback disabled.\n");
generalTab->useBIOS->setChecked(vjs.useJaguarBIOS);
generalTab->useGPU->setChecked(vjs.GPUEnabled);
generalTab->useDSP->setChecked(vjs.DSPEnabled);
generalTab->useBIOS->setChecked(vjs.useJaguarBIOS);
generalTab->useGPU->setChecked(vjs.GPUEnabled);
generalTab->useDSP->setChecked(vjs.DSPEnabled);
- generalTab->useHostAudio->setChecked(vjs.audioEnabled);
+// generalTab->useHostAudio->setChecked(vjs.audioEnabled);
if (vjs.hardwareTypeAlpine)
{
if (vjs.hardwareTypeAlpine)
{
vjs.useJaguarBIOS = generalTab->useBIOS->isChecked();
vjs.GPUEnabled = generalTab->useGPU->isChecked();
vjs.DSPEnabled = generalTab->useDSP->isChecked();
vjs.useJaguarBIOS = generalTab->useBIOS->isChecked();
vjs.GPUEnabled = generalTab->useGPU->isChecked();
vjs.DSPEnabled = generalTab->useDSP->isChecked();
- vjs.audioEnabled = generalTab->useHostAudio->isChecked();
+// vjs.audioEnabled = generalTab->useHostAudio->isChecked();
if (vjs.hardwareTypeAlpine)
{
if (vjs.hardwareTypeAlpine)
{
// I'm thinking we should scan the bios folder for the 5 known BIOSes, and
// just present a radio button to choose between them...
// (BIOS is built-in now...)
// I'm thinking we should scan the bios folder for the 5 known BIOSes, and
// just present a radio button to choose between them...
// (BIOS is built-in now...)
- QLabel * label1 = new QLabel("Boot ROM:");
- QLabel * label2 = new QLabel("CD Boot ROM:");
+// QLabel * label1 = new QLabel("Boot ROM:");
+// QLabel * label2 = new QLabel("CD Boot ROM:");
QLabel * label3 = new QLabel("EEPROMs:");
QLabel * label4 = new QLabel("Software:");
QLabel * label3 = new QLabel("EEPROMs:");
QLabel * label4 = new QLabel("Software:");
- edit1 = new QLineEdit("");
- edit2 = new QLineEdit("");
+// edit1 = new QLineEdit("");
+// edit2 = new QLineEdit("");
edit3 = new QLineEdit("");
edit4 = new QLineEdit("");
edit3 = new QLineEdit("");
edit4 = new QLineEdit("");
- edit1->setPlaceholderText("Boot ROM location");
- edit2->setPlaceholderText("CD Boot ROM location");
+// edit1->setPlaceholderText("Boot ROM location");
+// edit2->setPlaceholderText("CD Boot ROM location");
edit3->setPlaceholderText("EEPROM path");
edit4->setPlaceholderText("Software path");
edit3->setPlaceholderText("EEPROM path");
edit4->setPlaceholderText("Software path");
useBIOS = new QCheckBox(tr("Enable Jaguar BIOS"));
useGPU = new QCheckBox(tr("Enable GPU"));
useDSP = new QCheckBox(tr("Enable DSP"));
useBIOS = new QCheckBox(tr("Enable Jaguar BIOS"));
useGPU = new QCheckBox(tr("Enable GPU"));
useDSP = new QCheckBox(tr("Enable DSP"));
- useHostAudio = new QCheckBox(tr("Enable audio playback (requires DSP)"));
+// useHostAudio = new QCheckBox(tr("Enable audio playback (requires DSP)"));
useUnknownSoftware = new QCheckBox(tr("Show all files in file chooser"));
layout4->addWidget(useBIOS);
layout4->addWidget(useGPU);
layout4->addWidget(useDSP);
useUnknownSoftware = new QCheckBox(tr("Show all files in file chooser"));
layout4->addWidget(useBIOS);
layout4->addWidget(useGPU);
layout4->addWidget(useDSP);
- layout4->addWidget(useHostAudio);
+// layout4->addWidget(useHostAudio);
layout4->addWidget(useUnknownSoftware);
setLayout(layout4);
layout4->addWidget(useUnknownSoftware);
setLayout(layout4);
QString before = vjs.ROMPath;
QString alpineBefore = vjs.alpineROMPath;
QString absBefore = vjs.absROMPath;
QString before = vjs.ROMPath;
QString alpineBefore = vjs.alpineROMPath;
QString absBefore = vjs.absROMPath;
- bool audioBefore = vjs.audioEnabled;
+// bool audioBefore = vjs.audioEnabled;
+ bool audioBefore = vjs.DSPEnabled;
dlg.UpdateVJSettings();
QString after = vjs.ROMPath;
QString alpineAfter = vjs.alpineROMPath;
QString absAfter = vjs.absROMPath;
dlg.UpdateVJSettings();
QString after = vjs.ROMPath;
QString alpineAfter = vjs.alpineROMPath;
QString absAfter = vjs.absROMPath;
- bool audioAfter = vjs.audioEnabled;
+// bool audioAfter = vjs.audioEnabled;
+ bool audioAfter = vjs.DSPEnabled;
bool allowOld = allowUnknownSoftware;
//ick.
bool allowOld = allowUnknownSoftware;
//ick.
- // If the "Enable audio" checkbox changed, then we have to re-init the DAC...
+ // If the "Enable DSP" checkbox changed, then we have to re-init the DAC,
+ // since it's running in the host audio IRQ...
if (audioBefore != audioAfter)
{
DACDone();
if (audioBefore != audioAfter)
{
DACDone();
+#warning "!!! Fix lockup in OPDiscoverObjects() !!!"
//temp, to keep the following function from locking up on bad/weird OLs
return;
//temp, to keep the following function from locking up on bad/weird OLs
return;