X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.h;h=a29dbc6119343f2edd1f1a8fdf81e45a36bc84b4;hb=56f80e7876367f9da3cff765b46e842270d45a0d;hp=b1fb71db106cdc1d92db116ab326541e1706d0f5;hpb=cdc64706c10d3fe005fecff5d000fe60b3980a3b;p=virtualjaguar

diff --git a/src/gui/mainwin.h b/src/gui/mainwin.h
index b1fb71d..a29dbc6 100644
--- a/src/gui/mainwin.h
+++ b/src/gui/mainwin.h
@@ -9,7 +9,10 @@
 #define __MAINWIN_H__
 
 //Hrm. uh??? I thought this wasn't the way to do this stuff...???
-#include <QtGui>
+#include <QtWidgets>
+#include "tom.h"
+
+#define RING_BUFFER_SIZE 32
 
 // Forward declarations
 class GLWidget;
@@ -19,6 +22,8 @@ class FilePickerWindow;
 class MemoryBrowserWindow;
 class CPUBrowserWindow;
 class OPBrowserWindow;
+class M68KDasmBrowserWindow;
+class RISCDasmBrowserWindow;
 
 class MainWin: public QMainWindow
 {
@@ -38,7 +43,7 @@ class MainWin: public QMainWindow
 
 	private slots:
 		void Open(void);
- 		void Configure(void);
+		void Configure(void);
 		void Timer(void);
 		void TogglePowerState(void);
 		void ToggleRunState(void);
@@ -60,9 +65,12 @@ class MainWin: public QMainWindow
 		void ShowMemoryBrowserWin(void);
 		void ShowCPUBrowserWin(void);
 		void ShowOPBrowserWin(void);
+		void ShowM68KDasmBrowserWin(void);
+		void ShowRISCDasmBrowserWin(void);
 
 	private:
 		void HandleKeys(QKeyEvent *, bool);
+		void HandleGamepads(void);
 		void SetFullScreen(bool state = true);
 		void ResizeMainWindow(void);
 		void ReadSettings(void);
@@ -77,12 +85,16 @@ class MainWin: public QMainWindow
 		MemoryBrowserWindow * memBrowseWin;
 		CPUBrowserWindow * cpuBrowseWin;
 		OPBrowserWindow * opBrowseWin;
+		M68KDasmBrowserWindow * m68kDasmBrowseWin;
+		RISCDasmBrowserWindow * riscDasmBrowseWin;
 		QTimer * timer;
 		bool running;
 		int zoomLevel;
 		bool powerButtonOn;
 		bool showUntunedTankCircuit;
+	public:
 		bool cartridgeLoaded;
+	private:
 		bool allowUnknownSoftware;
 		bool CDActive;
 //		bool alpineLoadSuccessful;
@@ -90,11 +102,16 @@ class MainWin: public QMainWindow
 		bool loadAndGo;
 		bool keyHeld[8];
 		bool fullScreen;
+		bool scannedSoftwareFolder;
 	public:
 		bool plzDontKillMyComputer;
+		uint32_t oldTimestamp;
+		uint32_t ringBufferPointer;
+		uint32_t ringBuffer[RING_BUFFER_SIZE];
 	private:
 		QPoint mainWinPosition;
 //		QSize mainWinSize;
+		int lastEditedProfile;
 		QMenu * fileMenu;
 		QMenu * helpMenu;
 		QMenu * debugMenu;
@@ -124,9 +141,13 @@ class MainWin: public QMainWindow
 		QAction * memBrowseAct;
 		QAction * cpuBrowseAct;
 		QAction * opBrowseAct;
+		QAction * m68kDasmBrowseAct;
+		QAction * riscDasmBrowseAct;
 
 		QIcon powerGreen;
 		QIcon powerRed;
+		uint32_t testPattern[VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_PAL];
+		uint32_t testPattern2[VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_PAL];
 };
 
 #endif	// __MAINWIN_H__