[Draw][OpenGL][OSD] Prepare to direct update vram.

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

diff --git a/source/src/qt/osd_base.h b/source/src/qt/osd_base.h
index b3d4b80..94bcc7b 100644 (file)
--- a/source/src/qt/osd_base.h
+++ b/source/src/qt/osd_base.h
@@ -11,31 +11,24 @@
 #define _QT_OSD_BASE_H_
 
 
-#include <QWidget>
+#include <QList>
 #include <QThread>
-#include <QMutex>
-#include <QSemaphore>
-#include <QPainter>
-#include <QElapsedTimer>
 #include <QString>
-#include <QQueue>
 #include <QImage>
-#include <QList>
-
 #include <SDL.h>
-#include "simd_types.h"
+//#include "simd_types.h"
 
-#include <ctime>
-#include <limits>
-#include <osd_base.h>
+//#include <ctime>
+//#include <limits>
+//#include <osd_base.h>
 
 //#include "../vm/vm.h"
 //#include "../emu.h"
 #include "../config.h"
-#include "../fileio.h"
-#include "../fifo.h"
+//#include "../fileio.h"
+//#include "../fifo.h"
 //#if !defined(Q_OS_WIN32)
-#include "qt_input.h"
+//#include "qt_input.h"
 //#endif
 #define SOCKET_MAX 4
 #define SOCKET_BUFFER_MAX 0x100000
@@ -53,9 +46,7 @@
 #define MAX_CAPTURE_DEVS 8
 //#endif
 
-#include "qt_main.h"
-//#include "mainwidget.h"
-#include "config.h"
+//#include "qt_main.h"
 
 class GLDrawClass;
 class EmuThreadClass;
@@ -64,9 +55,12 @@ class Ui_MainWindow;
 class EMU;
 class VM;
 class FIFO;
+class FILEIO;
 class CSP_KeyTables;
 class USING_FLAGS;
-class CSP_LOGGER;
+class CSP_logger;
+class QMutex;
+
 QT_BEGIN_NAMESPACE
 
 typedef struct {
@@ -90,7 +84,7 @@ protected:
        sdl_snddata_t snddata;
        USING_FLAGS *using_flags;
        config_t *p_config;
-       CSP_Logger *csp_logger;
+       CSP_Logger *p_logger;
 
        QList<supportedlist_t> SupportedFeatures;
        
@@ -199,7 +193,7 @@ protected:
        int sound_write_pos;
        bool sound_exit;
        bool sound_debug;
-       SDL_sem *snd_apply_sem;
+       bool sound_initialized;
        Sint16 *sound_buf_ptr;
        Uint8 snd_total_volume;
 #if defined(USE_SDL2)   
@@ -213,6 +207,10 @@ protected:
        virtual void initialize_video();
        virtual void release_video();
   
+       scrntype_t *mapped_screen_pointer;
+       int mapped_screen_width;
+       int mapped_screen_height;
+       bool mapped_screen_status;
        bitmap_t dshow_screen_buffer;
        int direct_show_width, direct_show_height;
        bool direct_show_mute[2];
@@ -471,7 +469,12 @@ public:
        void debug_log(int level, const char *fmt, ...);
        void debug_log(int level, int domain_num, const char *fmt, ...);
        virtual void debug_log(int level, int domain_num, char *strbuf);
- 
+
+       USING_FLAGS *get_config_flags(void) { return using_flags; }
+
+       // Special
+       CSP_Logger *get_logger(void) { return p_logger; }
+       
 public slots:
        void do_write_inputdata(QString s);
        void do_set_input_string(QString s);
@@ -488,6 +491,7 @@ public slots:
        int draw_screen();
        int no_draw_screen();
        void do_draw(bool flag);
+       void do_set_screen_map_texture_address(scrntype_t *p, int width, int height);
 
 signals:
        int sig_update_screen(bitmap_t *);
@@ -518,6 +522,7 @@ signals:
        int sig_close_console(void);
 
        int sig_move_mouse_to_center(void);
+       
 };
 QT_END_NAMESPACE