[VM][General] Merge upstream 2016-02-13. Still don't implement OSD/Gui part of joysti...

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

diff --git a/source/src/vm/gamegear/gamegear.h b/source/src/vm/gamegear/gamegear.h
index c8568ed..d625228 100644 (file)
--- a/source/src/vm/gamegear/gamegear.h
+++ b/source/src/vm/gamegear/gamegear.h
@@ -27,22 +27,27 @@
 #define USE_CART1
 #define USE_FD1
 #define USE_TAPE
-#define USE_KEY_TO_JOY
-#define KEY_TO_JOY_BUTTON_D    0x5a
-#define KEY_TO_JOY_BUTTON_1    0x58
-#define KEY_TO_JOY_BUTTON_2    0x43
-#define KEY_TO_JOY_BUTTON_3    0x0d
 #define USE_ALT_F10_KEY
 #define USE_AUTO_KEY                   5
 #define USE_AUTO_KEY_RELEASE   8
 #define USE_AUTO_KEY_CAPS
 #define USE_ACCESS_LAMP
+#define USE_SOUND_VOLUME 2
 #define USE_DEBUGGER
 #define USE_JOYSTICK
 
 #include "../../common.h"
 #include "../../fileio.h"
 
+#ifdef USE_SOUND_VOLUME
+static const _TCHAR *sound_device_caption[] = {
+       _T("PSG"), _T("CMT"),
+};
+static const bool sound_device_monophonic[] = {
+       false, false,
+};
+#endif
+
 class EMU;
 class DEVICE;
 class EVENT;
@@ -111,6 +116,9 @@ public:
        void initialize_sound(int rate, int samples);
        uint16* create_sound(int* extra_frames);
        int 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_cart(int drv, const _TCHAR* file_path);