Add kFreeBSD support in jaguarcore.mak

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 8eb1285b4fa303a752e6c8d6e1bf52748208396e..f4dda13e411a9ad2443e79d107e0aba3fdd96a07 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -663,6 +663,16 @@ void MainWin::Configure(void)
 //
 void MainWin::Timer(void)
 {
+#if 0
+static uint32_t ntscTickCount;
+       if (vjs.hardwareTypeNTSC)
+       {
+               ntscTickCount++;
+               ntscTickCount %= 3;
+               timer->start(16 + (ntscTickCount == 0 ? 1 : 0));
+       }
+#endif
+
        if (!running)
                return;
 
@@ -1112,8 +1122,8 @@ void MainWin::ReadSettings(void)
        vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
        vjs.biosType         = settings.value("biosType", BT_M_SERIES).toInt();
        vjs.useFastBlitter   = settings.value("useFastBlitter", false).toBool();
-       strcpy(vjs.EEPROMPath, settings.value("EEPROMs", "./eeproms/").toString().toAscii().data());
-       strcpy(vjs.ROMPath, settings.value("ROMs", "./software/").toString().toAscii().data());
+       strcpy(vjs.EEPROMPath, settings.value("EEPROMs", QDesktopServices::storageLocation(QDesktopServices::DataLocation).append("/eeproms/")).toString().toAscii().data());
+       strcpy(vjs.ROMPath, settings.value("ROMs", QDesktopServices::storageLocation(QDesktopServices::DataLocation).append("/software/")).toString().toAscii().data());
        strcpy(vjs.alpineROMPath, settings.value("DefaultROM", "").toString().toAscii().data());
        strcpy(vjs.absROMPath, settings.value("DefaultABS", "").toString().toAscii().data());