--- hatari/src/includes/configuration.h	2019/04/01 07:13:07	1.1.1.8
+++ hatari/src/includes/configuration.h	2019/04/09 08:49:32	1.1.1.14
@@ -8,15 +8,26 @@
 #ifndef HATARI_CONFIGURATION_H
 #define HATARI_CONFIGURATION_H
 
-/* Logging */
+/* Logging and tracing */
 typedef struct
 {
   char sLogFileName[FILENAME_MAX];
+  char sTraceFileName[FILENAME_MAX];
   int nTextLogLevel;
   int nAlertDlgLogLevel;
+  bool bConfirmQuit;
 } CNF_LOG;
 
 
+/* debugger */
+typedef struct
+{
+  int nNumberBase;
+  int nDisasmLines;
+  int nMemdumpLines;
+} CNF_DEBUGGER;
+
+
 /* ROM (TOS + cartridge) configuration */
 typedef struct
 {
@@ -26,18 +37,14 @@ typedef struct
 
 
 /* Sound configuration */
-typedef enum
-{
-  PLAYBACK_LOW,
-  PLAYBACK_MEDIUM,
-  PLAYBACK_HIGH
-} SOUND_QUALITIY;
-
 typedef struct
 {
-  BOOL bEnableSound;
-  SOUND_QUALITIY nPlaybackQuality;
+  bool bEnableMicrophone;
+  bool bEnableSound;
+  int nPlaybackFreq;
+  int SdlAudioBufferSize;
   char szYMCaptureFileName[FILENAME_MAX];
+  int YmVolumeMixing;
 } CNF_SOUND;
 
 
@@ -45,7 +52,7 @@ typedef struct
 /* RS232 configuration */
 typedef struct
 {
-  BOOL bEnableRS232;
+  bool bEnableRS232;
   char szOutFileName[FILENAME_MAX];
   char szInFileName[FILENAME_MAX];
 } CNF_RS232;
@@ -61,7 +68,7 @@ typedef enum
 
 typedef struct
 {
-  BOOL bDisableKeyRepeat;
+  bool bDisableKeyRepeat;
   KEYMAPTYPE nKeymapType;
   char szMappingFileName[FILENAME_MAX];
 } CNF_KEYBOARD;
@@ -70,17 +77,22 @@ typedef struct
 typedef enum {
   SHORTCUT_OPTIONS,
   SHORTCUT_FULLSCREEN,
-  SHORTCUT_MOUSEMODE,
+  SHORTCUT_MOUSEGRAB,
   SHORTCUT_COLDRESET,
   SHORTCUT_WARMRESET,
   SHORTCUT_SCREENSHOT,
   SHORTCUT_BOSSKEY,
   SHORTCUT_CURSOREMU,
-  SHORTCUT_MAXSPEED,
+  SHORTCUT_FASTFORWARD,
   SHORTCUT_RECANIM,
   SHORTCUT_RECSOUND,
   SHORTCUT_SOUND,
+  SHORTCUT_DEBUG,
+  SHORTCUT_PAUSE,
   SHORTCUT_QUIT,
+  SHORTCUT_LOADMEM,
+  SHORTCUT_SAVEMEM,
+  SHORTCUT_INSERTDISKA,
   SHORTCUT_KEYS,  /* number of shortcuts */
   SHORTCUT_NONE
 } SHORTCUTKEYIDX;
@@ -95,7 +107,9 @@ typedef struct
 typedef struct
 {
   int nMemorySize;
+  bool bAutoSave;
   char szMemoryCaptureFileName[FILENAME_MAX];
+  char szAutoSaveFileName[FILENAME_MAX];
 } CNF_MEMORY;
 
 
@@ -110,7 +124,8 @@ typedef enum
 typedef struct
 {
   JOYSTICKMODE nJoystickMode;
-  BOOL bEnableAutoFire;
+  bool bEnableAutoFire;
+  bool bEnableJumpOnFire2;
   int nJoyId;
   int nKeyCodeUp, nKeyCodeDown, nKeyCodeLeft, nKeyCodeRight, nKeyCodeFire;
 } JOYSTICK;
@@ -132,16 +147,21 @@ typedef enum
   WRITEPROT_AUTO
 } WRITEPROTECTION;
 
+#define MAX_FLOPPYDRIVES 2
+
 typedef struct
 {
-  BOOL bAutoInsertDiskB;
+  bool bAutoInsertDiskB;
+  bool bSlowFloppy;                  /* true to slow down FDC emulation */
   WRITEPROTECTION nWriteProtection;
+  char szDiskZipPath[MAX_FLOPPYDRIVES][FILENAME_MAX];
+  char szDiskFileName[MAX_FLOPPYDRIVES][FILENAME_MAX];
   char szDiskImageDirectory[FILENAME_MAX];
 } CNF_DISKIMAGE;
 
 
 /* Hard drives configuration */
-#define MAX_HARDDRIVES  1
+#define MAX_HARDDRIVES  23
 
 typedef enum
 {
@@ -153,37 +173,66 @@ typedef enum
 
 typedef struct
 {
-  BOOL bBootFromHardDisk;
   int nHardDiskDir;
-  BOOL bUseHardDiskDirectories;
-  BOOL bUseHardDiskImage;
+  bool bUseHardDiskDirectories;
+  bool bUseHardDiskImage;
+  bool bUseIdeMasterHardDiskImage;
+  bool bUseIdeSlaveHardDiskImage;
+  WRITEPROTECTION nWriteProtection;
+  bool bBootFromHardDisk;
   char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
   char szHardDiskImage[FILENAME_MAX];
+  char szIdeMasterHardDiskImage[FILENAME_MAX];
+  char szIdeSlaveHardDiskImage[FILENAME_MAX];
 } CNF_HARDDISK;
 
+/* Falcon register $FFFF8006 bits 6 & 7 (mirrored in $FFFF82C0 bits 0 & 1):
+ * 00 Monochrome
+ * 01 RGB - Colormonitor
+ * 10 VGA - Colormonitor
+ * 11 TV
+ */
+#define FALCON_MONITOR_MONO 0x00  /* SM124 */
+#define FALCON_MONITOR_RGB  0x40
+#define FALCON_MONITOR_VGA  0x80
+#define FALCON_MONITOR_TV   0xC0
+
+typedef enum
+{
+  MONITOR_TYPE_MONO,
+  MONITOR_TYPE_RGB,
+  MONITOR_TYPE_VGA,
+  MONITOR_TYPE_TV
+} MONITORTYPE;
 
 /* Screen configuration */
 typedef struct
 {
-  BOOL bFullScreen;
-  BOOL bFrameSkip;
-  BOOL bAllowOverscan;
-  BOOL bInterleavedScreen;
-  int ChosenDisplayMode;
-  BOOL bUseHighRes;
-  BOOL bUseExtVdiResolutions;
-  int nVdiResolution;
+  MONITORTYPE nMonitorType;
+  int nFrameSkips;
+  bool bFullScreen;
+  bool bKeepResolution;
+  bool bAllowOverscan;
+  bool bAspectCorrect;
+  bool bUseExtVdiResolutions;
+  int nSpec512Threshold;
+  int nForceBpp;
   int nVdiColors;
-  BOOL bCaptureChange;
-  int nFramesPerSecond;
+  int nVdiWidth;
+  int nVdiHeight;
+  bool bShowStatusbar;
+  bool bShowDriveLed;
+  bool bCrop;
+  int nMaxWidth;
+  int nMaxHeight;
 } CNF_SCREEN;
 
 
 /* Printer configuration */
 typedef struct
 {
-  BOOL bEnablePrinting;
-  BOOL bPrintToFile;
+  bool bEnablePrinting;
+  bool bPrintToFile;
   char szPrintToFileName[FILENAME_MAX];
 } CNF_PRINTER;
 
@@ -191,42 +240,66 @@ typedef struct
 /* Midi configuration */
 typedef struct
 {
-  BOOL bEnableMidi;
-  char szMidiOutFileName[FILENAME_MAX];
+  bool bEnableMidi;
+  char sMidiInFileName[FILENAME_MAX];
+  char sMidiOutFileName[FILENAME_MAX];
 } CNF_MIDI;
 
 
 /* Dialog System */
 typedef enum
 {
-  MINMAXSPEED_MIN,
-  MINMAXSPEED_1,
-  MINMAXSPEED_2,
-  MINMAXSPEED_3,
-  MINMAXSPEED_MAX
-} MINMAXSPEED_TYPE;
-
-typedef enum
-{
   MACHINE_ST,
   MACHINE_STE,
-  MACHINE_TT
+  MACHINE_TT,
+  MACHINE_FALCON,
+  MACHINE_MEGA_STE,
 } MACHINETYPE;
 
+typedef enum
+{
+  DSP_TYPE_NONE,
+  DSP_TYPE_DUMMY,
+  DSP_TYPE_EMU
+} DSPTYPE;
+
+#if ENABLE_WINUAE_CPU
+typedef enum
+{
+  FPU_NONE,
+  FPU_68881,
+  FPU_68882,
+  FPU_CPU
+} FPUTYPE;
+#endif
+
 typedef struct
 {
   int nCpuLevel;
   int nCpuFreq;
-  BOOL bCompatibleCpu;
-  /*BOOL bAddressSpace24;*/
+  bool bCompatibleCpu;            /* Prefetch mode */
   MACHINETYPE nMachineType;
-  BOOL bBlitter;                  /* TRUE if blitter is enabled */
-  BOOL bRealTimeClock;
-  BOOL bPatchTimerD;
-  BOOL bSlowFDC;                  /* TRUE to slow down FDC emulation */
-  MINMAXSPEED_TYPE nMinMaxSpeed;
+  bool bBlitter;                  /* TRUE if Blitter is enabled */
+  DSPTYPE nDSPType;               /* how to "emulate" DSP */
+  bool bRealTimeClock;
+  bool bPatchTimerD;
+  bool bFastForward;
+  
+#if ENABLE_WINUAE_CPU
+  bool bAddressSpace24;
+  bool bCycleExactCpu;
+  FPUTYPE n_FPUType;
+  bool bCompatibleFPU;            /* More compatible FPU */
+  bool bMMU;                      /* TRUE if MMU is enabled */
+#endif
 } CNF_SYSTEM;
 
+typedef struct
+{
+  int AviRecordVcodec;
+  int AviRecordFps;
+  char AviRecordFile[FILENAME_MAX];
+} CNF_VIDEO;
 
 /* State of system is stored in this structure */
 /* On reset, variables are copied into system globals and used. */
@@ -234,6 +307,7 @@ typedef struct
 {
   /* Configure */
   CNF_LOG Log;
+  CNF_DEBUGGER Debugger;
   CNF_SCREEN Screen;
   CNF_JOYSTICKS Joysticks;
   CNF_KEYBOARD Keyboard;
@@ -247,16 +321,17 @@ typedef struct
   CNF_PRINTER Printer;
   CNF_MIDI Midi;
   CNF_SYSTEM System;
+  CNF_VIDEO Video;
 } CNF_PARAMS;
 
 
-extern BOOL bFirstTimeInstall;
 extern CNF_PARAMS ConfigureParams;
 extern char sConfigFileName[FILENAME_MAX];
 
 extern void Configuration_SetDefault(void);
-extern void Configuration_WorkOnDetails(BOOL bReset);
+extern void Configuration_Apply(bool bReset);
 extern void Configuration_Load(const char *psFileName);
 extern void Configuration_Save(void);
+extern void Configuration_MemorySnapShot_Capture(bool bSave);
 
 #endif