[EMU][OSD][MOUSE][JOYSTICK][OOPS] Fix FTBFS.

diff --git a/source/src/emu.cpp b/source/src/emu.cpp
index 385d3ee..50f7787 100644 (file)
--- a/source/src/emu.cpp
+++ b/source/src/emu.cpp
@@ -210,9 +210,9 @@ int EMU::run()
 #ifdef USE_AUTO_KEY
        update_auto_key();
 #endif
-#ifdef USE_JOYSTICK
-       update_joystick();
-#endif
+//#ifdef USE_JOYSTICK
+//     update_joystick();
+//#endif
        
 #ifdef USE_SOCKET
 #if !defined(_USE_QT) // Temporally
@@ -1552,7 +1552,7 @@ const int32_t* EMU::get_mouse_buffer()
 void EMU::release_mouse_buffer(const int32_t* ptr)
 {
        // ToDo: Unlock buffer.
-       osd->release_mouse_buffer(ptr);
+       osd->release_mouse_buffer((int32_t*)ptr);
 }
 const int32_t EMU::get_mouse_button()
 {

diff --git a/source/src/emu.h b/source/src/emu.h
index 6ad4d85..9b90a22 100644 (file)
--- a/source/src/emu.h
+++ b/source/src/emu.h
@@ -187,7 +187,7 @@ public:
        // Mouse buffer should be with locking and sampling.
        const int32_t* get_mouse_buffer();
        const int32_t  get_mouse_button();
-       void release_mouse_buffer(const uint32_t* ptr);
+       void release_mouse_buffer(const int32_t* ptr);
        void enable_mouse();
        void disable_mouse();
        void toggle_mouse();

diff --git a/source/src/emu_template.h b/source/src/emu_template.h
index de159d1..e6d2fe9 100644 (file)
--- a/source/src/emu_template.h
+++ b/source/src/emu_template.h
@@ -221,7 +221,7 @@ public:
        // Mouse buffer should be with locking and sampling.
        virtual const int32_t* get_mouse_buffer() { return dummy_mouse_buffer; }
        virtual const int32_t  get_mouse_button() { return 0; }
-       virtual void release_mouse_buffer(const int* ptr) { };
+       virtual void release_mouse_buffer(const int32_t* ptr) { };
        virtual void enable_mouse() {}
        virtual void disable_mouse() {}
        virtual void toggle_mouse() {}

diff --git a/source/src/qt/osd_base.h b/source/src/qt/osd_base.h
index d392cb2..03353d8 100644 (file)
--- a/source/src/qt/osd_base.h
+++ b/source/src/qt/osd_base.h
@@ -356,6 +356,7 @@ protected:
        virtual int get_screen_width(void);
        virtual int get_screen_height(void);
        virtual int get_vm_buttons_code(int num);
+       virtual void update_input_mouse();
 
 public:
        OSD_BASE(USING_FLAGS *p, CSP_Logger *logger);

diff --git a/source/src/qt/osd_input.cpp b/source/src/qt/osd_input.cpp
index 3d4bc8e..3c98d77 100644 (file)
--- a/source/src/qt/osd_input.cpp
+++ b/source/src/qt/osd_input.cpp
@@ -285,7 +285,7 @@ void OSD_BASE::update_input()
        lost_focus = false;
 
        // update mouse status
-       update_input_mouse();
+       //update_input_mouse();
        
 }