[VM][General][WIP] Apply new (Upstream 2016-02-21) APIs to VMs.

[csp-qt/common_source_project-fm7.git] / source / src / vm / fm7 / fm7.h

diff --git a/source/src/vm/fm7/fm7.h b/source/src/vm/fm7/fm7.h
index fba05cb..2fdc3fe 100644 (file)
--- a/source/src/vm/fm7/fm7.h
+++ b/source/src/vm/fm7/fm7.h
@@ -25,10 +25,6 @@
 #define USE_PRINTER_TYPE 4
 
 // 4:3
-#define SCREEN_WIDTH_ASPECT 640 
-#define SCREEN_HEIGHT_ASPECT 400
-#define WINDOW_WIDTH_ASPECT 640 
-#define WINDOW_HEIGHT_ASPECT 400
 #define USE_CRT_MONITOR_4_3 1
 
 #define NOTIFY_KEY_DOWN
@@ -246,6 +242,7 @@
 
 #define SCREEN_WIDTH           640
 #define SCREEN_HEIGHT          400
+#define WINDOW_HEIGHT_ASPECT 480
 #define MAX_DRIVE              4
 #define HAS_MC6809              
 #define MB8877_MAX_CHIPS       1
@@ -321,17 +318,6 @@ static const _TCHAR *sound_device_caption[] = {
        _T("Beep"), _T("CMT"),
 #endif 
 };
-static const bool sound_device_monophonic[] = {
-#if defined(_FM8)
-       true,
-       false, false,
-#else  
-# if !defined(_FM77AV_VARIANTS)
-       true,
-# endif
-       true, true, true, true, true, true, false, false,
-#endif 
-};
 #endif
 
 class EMU;
@@ -438,7 +424,7 @@ public:
        void reset();
        void special_reset();
        void run();
-       double frame_rate();
+       double get_frame_rate();
 #if defined(SUPPORT_DUMMY_DEVICE_LED)
        uint32 get_led_status();
 #endif
@@ -453,12 +439,12 @@ public:
        void update_dipswitch(void);
        // 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
@@ -468,21 +454,21 @@ public:
        void key_up(int code);
        
        // user interface
-       void open_disk(int drv, const _TCHAR* file_path, int offset);
-       void close_disk(int drv);
-       bool disk_inserted(int drv);
-       void set_disk_protected(int drv, bool value);
-       bool get_disk_protected(int drv);
+       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);
        
        void play_tape(const _TCHAR* file_path);
        void rec_tape(const _TCHAR* file_path);
        void close_tape();
-       bool tape_inserted();
-       bool tape_playing();
-       bool tape_recording();
-       int tape_position();
+       bool is_tape_inserted();
+       bool is_tape_playing();
+       bool is_tape_recording();
+       int get_tape_position();
        
-       bool now_skip();
+       bool is_frame_skippable();
        void push_play();
        void push_stop();
        void push_fast_forward();
@@ -497,7 +483,7 @@ public:
        void get_screen_resolution(int *w, int *h);
 #endif
 #if defined(USE_MINIMUM_RENDERING)     
-       bool screen_changed(void);
+       bool is_screen_changed(void);
 #endif 
        // ----------------------------------------
        // for each device