X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fmz2800%2Fmz2800.h;h=43d0dee5e065dd37ed7c99cf1c9dc4ef27ab13d1;hb=ef7e2d55278936e3e2a6fea6440dd46a783137b6;hp=ddef7afe7ec96f325512e9f89189af6cad918e5b;hpb=2370ee98cc13bb67ddc4d80966a50c39f05c1283;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/mz2800/mz2800.h b/source/src/vm/mz2800/mz2800.h
index ddef7afe7..43d0dee5e 100644
--- a/source/src/vm/mz2800/mz2800.h
+++ b/source/src/vm/mz2800/mz2800.h
@@ -20,6 +20,7 @@
 #define CPU_CLOCKS		8000000
 #define SCREEN_WIDTH		640
 #define SCREEN_HEIGHT		400
+#define WINDOW_HEIGHT_ASPECT	480
 #define MAX_DRIVE		4
 #define HAS_I286
 #define I8259_MAX_CHIPS		2
@@ -53,9 +54,6 @@
 static const _TCHAR *sound_device_caption[] = {
 	_T("OPN (FM)"), _T("OPN (PSG)"), _T("Beep"),
 };
-static const bool sound_device_monophonic[] = {
-	true, true, false,
-};
 #endif
 
 class EMU;
@@ -146,23 +144,23 @@ public:
 	
 	// draw screen
 	void draw_screen();
-	int access_lamp();
+	int get_access_lamp_status();
 	
 	// sound generation
 	void initialize_sound(int rate, int samples);
 	uint16* create_sound(int* extra_frames);
-	int sound_buffer_ptr();
+	int get_sound_buffer_ptr();
 #ifdef USE_SOUND_VOLUME
 	void set_sound_device_volume(int ch, int decibel_l, int decibel_r);
 #endif
 	
 	// user interface
-	void open_disk(int drv, const _TCHAR* file_path, int bank);
-	void close_disk(int drv);
-	bool disk_inserted(int drv);
-	void set_disk_protected(int drv, bool value);
-	bool get_disk_protected(int drv);
-	bool now_skip();
+	void open_floppy_disk(int drv, const _TCHAR* file_path, int bank);
+	void close_floppy_disk(int drv);
+	bool is_floppy_disk_inserted(int drv);
+	void is_floppy_disk_protected(int drv, bool value);
+	bool is_floppy_disk_protected(int drv);
+	bool is_frame_skippable();
 	
 	void update_config();
 	void save_state(FILEIO* state_fio);