X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fpc2001%2Fpc2001.h;h=2b936211129809ca20298f5a7a787e5d18b8f50b;hb=e3aaa3868623d92a6662f1ce339d6c33da6f7830;hp=ce7d61bbe243325fdc33e752f75694351aafd58b;hpb=e590abe9f83d4f08ead01737b7f2c77582d274ab;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/pc2001/pc2001.h b/source/src/vm/pc2001/pc2001.h
index ce7d61bbe..2b9362111 100644
--- a/source/src/vm/pc2001/pc2001.h
+++ b/source/src/vm/pc2001/pc2001.h
@@ -26,32 +26,30 @@
 
 // device informations for win32
 #define WINDOW_MODE_BASE	2
-#define USE_TAPE
+#define USE_TAPE		1
+#define USE_TAPE_BUTTON
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY		6
 #define USE_AUTO_KEY_RELEASE	10
 #define USE_AUTO_KEY_CAPS_LOCK	(0xf2 | 0x100)
+#define USE_AUTO_KEY_NUMPAD
 #define DONT_KEEEP_KEY_PRESSED
-#define USE_SOUND_FILES		3
-#if defined(USE_SOUND_FILES)
 #define USE_SOUND_VOLUME	3
-#else
-#define USE_SOUND_VOLUME	2
-#endif
 #define USE_DEBUGGER
 #define USE_STATE
+#define USE_CPU_UPD7810
 
 #include "../../common.h"
+#include "../../fileio.h"
+#include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
 static const _TCHAR *sound_device_caption[] = {
-	_T("Beep"), _T("CMT"),
-#if defined(USE_SOUND_FILES)
-	_T("CMT Buttons"),
-#endif
+	_T("Beep"), _T("CMT (Signal)"), _T("Noise (CMT)"),
 };
 #endif
 
+//class csp_state_utils;
 class EMU;
 class DEVICE;
 class EVENT;
@@ -64,16 +62,14 @@ class UPD1990A;
 class UPD7810;
 
 class IO;
-
-#include "../../fileio.h"
-
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
-	EMU* emu;
+	//EMU* emu;
+	//csp_state_utils *state_entry;
 	
 	// devices
-	EVENT* event;
+	//EVENT* event;
 	
 	DATAREC* drec;
 	MEMORY* memory;
@@ -122,16 +118,24 @@ public:
 #endif
 	
 	// user interface
-	void play_tape(const _TCHAR* file_path);
-	void rec_tape(const _TCHAR* file_path);
-	void close_tape();
-	bool is_tape_inserted();
-	bool is_tape_playing();
-	bool is_tape_recording();
-	int get_tape_position();
+	void play_tape(int drv, const _TCHAR* file_path);
+	void rec_tape(int drv, const _TCHAR* file_path);
+	void close_tape(int drv);
+	bool is_tape_inserted(int drv);
+	bool is_tape_playing(int drv);
+	bool is_tape_recording(int drv);
+	int get_tape_position(int drv);
+	const _TCHAR* get_tape_message(int drv);
+	void push_play(int drv);
+	void push_stop(int drv);
+	void push_fast_forward(int drv);
+	void push_fast_rewind(int drv);
+	void push_apss_forward(int drv) {}
+	void push_apss_rewind(int drv) {}
 	bool is_frame_skippable();
 	
 	void update_config();
+	void decl_state();
 	void save_state(FILEIO* state_fio);
 	bool load_state(FILEIO* state_fio);
 	
@@ -141,9 +145,9 @@ public:
 	
 	// devices
 	DEVICE* get_device(int id);
-	DEVICE* dummy;
-	DEVICE* first_device;
-	DEVICE* last_device;
+	//DEVICE* dummy;
+	//DEVICE* first_device;
+	//DEVICE* last_device;
 };
 
 #endif