[VM][FP1100][HC40][SMB80TE] .

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

diff --git a/source/src/config.h b/source/src/config.h
index 386ff57..27a4ec7 100644 (file)
--- a/source/src/config.h
+++ b/source/src/config.h
@@ -101,8 +101,7 @@ enum {
 void DLL_PREFIX initialize_config();
 void DLL_PREFIX load_config(const _TCHAR* config_path);
 void DLL_PREFIX save_config(const _TCHAR* config_path);
-void DLL_PREFIX save_config_state(void *f);
-bool DLL_PREFIX load_config_state(void *f);
+bool DLL_PREFIX process_config_state(void *f, bool loading);
 
 /*
  * 20160407 Ohta:
@@ -177,6 +176,7 @@ typedef struct {
        #if defined(USE_SHARED_DLL) || defined(USE_HARD_DISK)
                _TCHAR initial_hard_disk_dir[_MAX_PATH];
                _TCHAR recent_hard_disk_path[USE_HARD_DISK_TMP][MAX_HISTORY][_MAX_PATH];
+               _TCHAR last_hard_disk_path[USE_HARD_DISK_TMP][_MAX_PATH];
        #endif
        #if defined(USE_SHARED_DLL) || defined(USE_TAPE)
                _TCHAR initial_tape_dir[_MAX_PATH];
@@ -188,9 +188,9 @@ typedef struct {
        #endif
        #if defined(USE_SHARED_DLL) || defined(USE_LASER_DISC)
                _TCHAR initial_laser_disc_dir[_MAX_PATH];
-               _TCHAR recent_compact_disc_path[USE_LASER_DISC_TMP][MAX_HISTORY][_MAX_PATH];
+               _TCHAR recent_laser_disc_path[USE_LASER_DISC_TMP][MAX_HISTORY][_MAX_PATH];
        #endif
-       #if defined(USE_SHARED_DLL) || defined(USE_BINARY_FILE1)
+       #if defined(USE_SHARED_DLL) || defined(USE_BINARY_FILE)
                _TCHAR initial_binary_dir[_MAX_PATH];
                _TCHAR recent_binary_path[USE_BINARY_FILE_TMP][MAX_HISTORY][_MAX_PATH];
        #endif
@@ -250,6 +250,8 @@ typedef struct {
        int sound_frequency;
        int sound_latency;
        bool sound_strict_rendering;
+       int sound_device_num;
+       
 #if defined(_USE_QT)   
        int general_sound_level;
 #endif
@@ -264,9 +266,17 @@ typedef struct {
        int sound_volume_l[MAX_VOLUME_TMP];
        int sound_volume_r[MAX_VOLUME_TMP];
 #endif
+       #if defined(USE_SHARED_DLL) || defined(_WIN32) && !defined(_USE_QT)
+               _TCHAR mame2151_dll_path[_MAX_PATH];
+               _TCHAR mame2608_dll_path[_MAX_PATH];
+       #endif
        // input
        #if defined(USE_FIXED_CONFIG) || defined(USE_JOYSTICK)
                int joy_buttons[4][16];
+               bool use_joy_to_key;
+               int joy_to_key_type; // Note: ADD "1235" as type 3.20181218 K.O
+               bool joy_to_key_numpad5;
+               int joy_to_key_buttons[16];
        #endif
        #if defined(USE_FIXED_CONFIG) || defined(USE_AUTO_KEY)
                bool romaji_to_kana;
@@ -281,7 +291,6 @@ typedef struct {
        bool print_statistics;
 
 #if defined(_WIN32) && !defined(_USE_QT)
-       _TCHAR fmgen_dll_path[_MAX_PATH];
        bool use_direct_input;
        bool disable_dwm;
 
@@ -320,6 +329,10 @@ typedef struct {
        bool dev_log_to_console[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1][8];
        bool dev_log_recording[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1][8];
 
+       bool state_log_to_console;
+       bool state_log_to_syslog;
+       bool state_log_to_recording;
+       
        int rendering_type;
 
        int virtual_media_position; // -1 = none, 1, 2, 3, 4 = LRUD
@@ -327,7 +340,7 @@ typedef struct {
        
 } config_t;
 
-extern DLL_PREFIX config_t config;
+extern config_t config;
 
 #if defined(_USE_QT)
 # include <string>