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

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

diff --git a/source/src/vm/pasopia/pasopia.h b/source/src/vm/pasopia/pasopia.h
index 3f9a0ec..fcff1fc 100644 (file)
--- a/source/src/vm/pasopia/pasopia.h
+++ b/source/src/vm/pasopia/pasopia.h
@@ -47,6 +47,7 @@
 #else
 #define SCREEN_WIDTH           640
 #define SCREEN_HEIGHT          400
+#define WINDOW_HEIGHT_ASPECT   480
 #define USE_CRT_MONITOR_4_3 1
 #endif
 #define MAX_DRIVE              4
@@ -81,9 +82,6 @@
 static const _TCHAR *sound_device_caption[] = {
        _T("Beep"), _T("CMT"),
 };
-static const bool sound_device_monophonic[] = {
-       false, false,
-};
 #endif
 
 class EMU;
@@ -153,7 +151,7 @@ public:
        // drive virtual machine
        void reset();
        void run();
-       double frame_rate();
+       double get_frame_rate();
        
 #ifdef USE_DEBUGGER
        // debugger
@@ -162,32 +160,32 @@ 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);
+       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();
        void load_binary(int drv, const _TCHAR* file_path);
        void save_binary(int drv, const _TCHAR* file_path) {}
-       bool now_skip();
+       bool is_frame_skippable();
        
        void update_config();
        void save_state(FILEIO* state_fio);