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

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

diff --git a/source/src/vm/jx/jx.cpp b/source/src/vm/jx/jx.cpp
index 03a9b30..66f1b25 100644 (file)
--- a/source/src/vm/jx/jx.cpp
+++ b/source/src/vm/jx/jx.cpp
@@ -240,7 +240,7 @@ void VM::draw_screen()
        display->draw_screen();
 }
 
-int VM::access_lamp()
+int VM::get_access_lamp_status()
 {
        uint32 status = fdc->read_signal(0);
        return (status & (1 | 4)) ? 1 : (status & (2 | 8)) ? 2 : 0;
@@ -256,8 +256,8 @@ void VM::initialize_sound(int rate, int samples)
        event->initialize_sound(rate, samples);
        
        // init sound gen
-       pcm->init(rate, 8000);
-       psg->init(rate, 3579545, 8000);
+       pcm->initialize_sound(rate, 8000);
+       psg->initialize_sound(rate, 3579545, 8000);
 }
 
 uint16* VM::create_sound(int* extra_frames)
@@ -265,9 +265,9 @@ uint16* VM::create_sound(int* extra_frames)
        return event->create_sound(extra_frames);
 }
 
-int VM::sound_buffer_ptr()
+int VM::get_sound_buffer_ptr()
 {
-       return event->sound_buffer_ptr();
+       return event->get_sound_buffer_ptr();
 }
 
 #ifdef USE_SOUND_VOLUME
@@ -297,34 +297,34 @@ void VM::key_up(int code)
 // user interface
 // ----------------------------------------------------------------------------
 
-void VM::open_disk(int drv, const _TCHAR* file_path, int bank)
+void VM::open_floppy_disk(int drv, const _TCHAR* file_path, int bank)
 {
        fdc->open_disk(drv, file_path, bank);
 }
 
-void VM::close_disk(int drv)
+void VM::close_floppy_disk(int drv)
 {
        fdc->close_disk(drv);
 }
 
-bool VM::disk_inserted(int drv)
+bool VM::is_floppy_disk_inserted(int drv)
 {
-       return fdc->disk_inserted(drv);
+       return fdc->is_disk_inserted(drv);
 }
 
-void VM::set_disk_protected(int drv, bool value)
+void VM::is_floppy_disk_protected(int drv, bool value)
 {
-       fdc->set_disk_protected(drv, value);
+       fdc->is_disk_protected(drv, value);
 }
 
-bool VM::get_disk_protected(int drv)
+bool VM::is_floppy_disk_protected(int drv)
 {
-       return fdc->get_disk_protected(drv);
+       return fdc->is_disk_protected(drv);
 }
 
-bool VM::now_skip()
+bool VM::is_frame_skippable()
 {
-       return event->now_skip();
+       return event->is_frame_skippable();
 }
 
 void VM::update_config()