[EMU] Update VM.

diff --git a/source/src/emu.cpp b/source/src/emu.cpp
index 2f3b584..5189dc9 100644 (file)
--- a/source/src/emu.cpp
+++ b/source/src/emu.cpp
@@ -94,7 +94,8 @@ EMU::EMU()
 #endif
        osd->initialize(sound_rate, sound_samples);
        // initialize vm
-       osd->vm = vm = new VM(this);
+       vm = new VM(this);
+       osd->vm = vm;
 # if defined(_USE_QT)
        osd->reset_vm_node();
 # endif        
@@ -251,7 +252,8 @@ void EMU::reset()
                // reinitialize virtual machine
                osd->lock_vm();         
                delete vm;
-               osd->vm = vm = new VM(this);
+               vm = new VM(this);
+               osd->vm = vm;;
 #if defined(_USE_QT)
                osd->reset_vm_node();
 #endif
@@ -2920,7 +2922,8 @@ bool EMU::load_state_tmp(const _TCHAR* file_path)
                                        // reinitialize virtual machine
                                        osd->stop_sound();
                                        delete vm;
-                                       osd->vm = vm = new VM(this);
+                                       vm = new VM(this);
+                                       osd->vm = vm;
 # if defined(_USE_QT)
                                        osd->reset_vm_node();
 # endif        

diff --git a/source/src/emu.h b/source/src/emu.h
index 1eb0092..448f604 100644 (file)
--- a/source/src/emu.h
+++ b/source/src/emu.h
@@ -25,7 +25,7 @@
 #include <assert.h>
 #include "common.h"
 #include "config.h"
-#include "vm/vm.h"
+//#include "vm/vm_template.h"
 
 #if defined(_USE_QT)
 #include <pthread.h>
@@ -58,6 +58,7 @@
 #define MAX_B77_BANKS 16
 #endif
 
+class VM;
 class VM_TEMPLATE;
 class EMU;
 class FIFO;
@@ -88,7 +89,7 @@ class DrawThreadClass;
 class EMU
 {
 protected:
-       VM_TEMPLATE* vm;
+       VM* vm;
        OSD* osd;
 private:
        _TCHAR app_path[_MAX_PATH];
@@ -198,7 +199,7 @@ public:
        void set_parent_handler(EmuThreadClass *p, DrawThreadClass *q);
        VM_TEMPLATE *get_vm()
        {
-               return vm;
+               return (VM_TEMPLATE *)vm;
        }
        OSD *get_osd()
        {

diff --git a/source/src/qt/CMakeLists.txt b/source/src/qt/CMakeLists.txt
index 7e40a56..b802168 100644 (file)
--- a/source/src/qt/CMakeLists.txt
+++ b/source/src/qt/CMakeLists.txt
@@ -1,5 +1,5 @@
 message("* qt/osd")
-SET(THIS_LIB_VERSION 2.13.2)
+SET(THIS_LIB_VERSION 2.13.3)
 
 set(s_qt_osd_headers
        osd_base.h

diff --git a/source/src/qt/osd_base.h b/source/src/qt/osd_base.h
index 40b4491..d2d9a7e 100644 (file)
--- a/source/src/qt/osd_base.h
+++ b/source/src/qt/osd_base.h
@@ -53,7 +53,7 @@ class EmuThreadClass;
 class DrawThreadClass;
 class Ui_MainWindow;
 class EMU;
-class VM;
+class VM_TEMPLATE;
 class FIFO;
 class FILEIO;
 class CSP_KeyTables;
@@ -270,7 +270,7 @@ public:
        ~OSD_BASE();
        
        // common
-       VM* vm;
+       VM_TEMPLATE* vm;
        //EMU* emu;
        class Ui_MainWindow *main_window_handle;
        GLDrawClass *glv;

diff --git a/source/src/qt/osd_types.h b/source/src/qt/osd_types.h
index 45685ca..c03755c 100644 (file)
--- a/source/src/qt/osd_types.h
+++ b/source/src/qt/osd_types.h
@@ -67,7 +67,7 @@ public:
 #ifdef USE_MOVIE_PLAYER
 class CMySampleGrabberCB : public ISampleGrabberCB {
 private:
-       VM *vm;
+       VM_TEMPLATE *vm;
 public:
        CMySampleGrabberCB(VM *vm_ptr)
        {