aboutsummaryrefslogtreecommitdiff
path: root/src/frontend/qt_sdl
diff options
context:
space:
mode:
authorArisotura <thetotalworm@gmail.com>2020-04-27 22:02:45 +0200
committerArisotura <thetotalworm@gmail.com>2020-04-27 22:02:45 +0200
commit931da1c66fb50138109f8bf4cb157db8f1e79c64 (patch)
tree637acbceabf7de82bb6a8828d218034b32bf9249 /src/frontend/qt_sdl
parentd6efb03248e3c7751b0c7e5d3b6398ea671325b0 (diff)
add a bunch of code
Diffstat (limited to 'src/frontend/qt_sdl')
-rw-r--r--src/frontend/qt_sdl/main.cpp19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 4999d94..648cd99 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -49,11 +49,6 @@
char* EmuDirectory;
bool RunningSomething;
-char ROMPath[2][1024];
-char SRAMPath[2][1024];
-char PrevSRAMPath[2][1024]; // for savestate 'undo load'
-
-bool SavestateLoaded;
MainWindow* mainWindow;
EmuThread* emuThread;
@@ -334,8 +329,8 @@ void EmuThread::emuPause(bool refresh)
{
int status = refresh ? 2:3;
PrevEmuStatus = EmuRunning;
- EmuRunning = status;printf("emuPause %d -> %d %d\n", PrevEmuStatus, EmuRunning, EmuStatus);
- while (EmuStatus != status);printf("wait done\n");
+ EmuRunning = status;
+ while (EmuStatus != status);
}
void EmuThread::emuUnpause()
@@ -370,7 +365,7 @@ void MainWindowPanel::paintEvent(QPaintEvent* event)
MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
{
- setWindowTitle("melonDS - assfucking Qt version");
+ setWindowTitle("melonDS " MELONDS_VERSION);
QMenuBar* menubar = new QMenuBar();
{
@@ -569,6 +564,7 @@ int main(int argc, char** argv)
emuThread->start();
emuThread->emuPause(true);
+ #if 0
if (argc > 1)
{
char* file = argv[1];
@@ -601,11 +597,12 @@ int main(int argc, char** argv)
}
}
}
+ #endif
int ret = melon.exec();
-printf("melon over\n");
- emuThread->emuStop();printf("STOP\n");
- emuThread->wait();printf("farked\n");
+
+ emuThread->emuStop();
+ emuThread->wait();
Config::Save();