--- hatari/src/includes/configuration.h	2019/04/01 07:13:41	1.1.1.9
+++ hatari/src/includes/configuration.h	2019/04/01 07:14:47	1.1.1.10
@@ -12,9 +12,10 @@
 typedef struct
 {
   char sLogFileName[FILENAME_MAX];
+  char sTraceFileName[FILENAME_MAX];
   int nTextLogLevel;
   int nAlertDlgLogLevel;
-  BOOL bConfirmQuit;
+  bool bConfirmQuit;
 } CNF_LOG;
 
 
@@ -36,7 +37,7 @@ typedef enum
 
 typedef struct
 {
-  BOOL bEnableSound;
+  bool bEnableSound;
   SOUND_QUALITY nPlaybackQuality;
   char szYMCaptureFileName[FILENAME_MAX];
 } CNF_SOUND;
@@ -46,7 +47,7 @@ typedef struct
 /* RS232 configuration */
 typedef struct
 {
-  BOOL bEnableRS232;
+  bool bEnableRS232;
   char szOutFileName[FILENAME_MAX];
   char szInFileName[FILENAME_MAX];
 } CNF_RS232;
@@ -62,7 +63,7 @@ typedef enum
 
 typedef struct
 {
-  BOOL bDisableKeyRepeat;
+  bool bDisableKeyRepeat;
   KEYMAPTYPE nKeymapType;
   char szMappingFileName[FILENAME_MAX];
 } CNF_KEYBOARD;
@@ -77,13 +78,15 @@ typedef enum {
   SHORTCUT_SCREENSHOT,
   SHORTCUT_BOSSKEY,
   SHORTCUT_CURSOREMU,
-  SHORTCUT_MAXSPEED,
+  SHORTCUT_FASTFORWARD,
   SHORTCUT_RECANIM,
   SHORTCUT_RECSOUND,
   SHORTCUT_SOUND,
+  SHORTCUT_PAUSE,
   SHORTCUT_QUIT,
   SHORTCUT_LOADMEM,
   SHORTCUT_SAVEMEM,
+  SHORTCUT_INSERTDISKA,
   SHORTCUT_KEYS,  /* number of shortcuts */
   SHORTCUT_NONE
 } SHORTCUTKEYIDX;
@@ -98,7 +101,7 @@ typedef struct
 typedef struct
 {
   int nMemorySize;
-  BOOL bAutoSave;
+  bool bAutoSave;
   char szMemoryCaptureFileName[FILENAME_MAX];
   char szAutoSaveFileName[FILENAME_MAX];
 } CNF_MEMORY;
@@ -115,7 +118,7 @@ typedef enum
 typedef struct
 {
   JOYSTICKMODE nJoystickMode;
-  BOOL bEnableAutoFire;
+  bool bEnableAutoFire;
   int nJoyId;
   int nKeyCodeUp, nKeyCodeDown, nKeyCodeLeft, nKeyCodeRight, nKeyCodeFire;
 } JOYSTICK;
@@ -137,10 +140,14 @@ typedef enum
   WRITEPROT_AUTO
 } WRITEPROTECTION;
 
+#define MAX_FLOPPYDRIVES 2
+
 typedef struct
 {
-  BOOL bAutoInsertDiskB;
+  bool bAutoInsertDiskB;
   WRITEPROTECTION nWriteProtection;
+  char szDiskZipPath[MAX_FLOPPYDRIVES][FILENAME_MAX];
+  char szDiskFileName[MAX_FLOPPYDRIVES][FILENAME_MAX];
   char szDiskImageDirectory[FILENAME_MAX];
 } CNF_DISKIMAGE;
 
@@ -158,13 +165,13 @@ typedef enum
 
 typedef struct
 {
-  BOOL bBootFromHardDisk;
+  bool bBootFromHardDisk;
   int nHardDiskDir;
-  BOOL bUseHardDiskDirectories;
-  BOOL bUseHardDiskImage;
+  bool bUseHardDiskDirectories;
+  bool bUseHardDiskImage;
   char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
   char szHardDiskImage[FILENAME_MAX];
-  BOOL bUseIdeHardDiskImage;
+  bool bUseIdeHardDiskImage;
   char szIdeHardDiskImage[FILENAME_MAX];
 } CNF_HARDDISK;
 
@@ -191,22 +198,25 @@ typedef enum
 /* Screen configuration */
 typedef struct
 {
-  MONITORTYPE MonitorType;
-  int FrameSkips;
-  BOOL bFullScreen;
-  BOOL bAllowOverscan;
-  BOOL bZoomLowRes;
-  BOOL bUseExtVdiResolutions;
+  MONITORTYPE nMonitorType;
+  int nFrameSkips;
+  bool bFullScreen;
+  bool bAllowOverscan;
+  bool bZoomLowRes;
+  bool bUseExtVdiResolutions;
   int nSpec512Threshold;
   int nForceBpp;
   int nVdiColors;
   int nVdiWidth;
   int nVdiHeight;
-  BOOL bCaptureChange;
-  int nFramesPerSecond;
+  bool bShowStatusbar;
+  bool bShowDriveLed;
+  bool bCaptureChange;
+  int nWindowBorderPixelsTop;
   int nWindowBorderPixelsLeft;
   int nWindowBorderPixelsRight;
   int nWindowBorderPixelsBottom;
+  int nFullScreenBorderPixelsTop;
   int nFullScreenBorderPixelsLeft;
   int nFullScreenBorderPixelsRight;
   int nFullScreenBorderPixelsBottom;
@@ -216,8 +226,8 @@ typedef struct
 /* Printer configuration */
 typedef struct
 {
-  BOOL bEnablePrinting;
-  BOOL bPrintToFile;
+  bool bEnablePrinting;
+  bool bPrintToFile;
   char szPrintToFileName[FILENAME_MAX];
 } CNF_PRINTER;
 
@@ -225,7 +235,7 @@ typedef struct
 /* Midi configuration */
 typedef struct
 {
-  BOOL bEnableMidi;
+  bool bEnableMidi;
   char szMidiOutFileName[FILENAME_MAX];
 } CNF_MIDI;
 
@@ -233,15 +243,6 @@ typedef struct
 /* Dialog System */
 typedef enum
 {
-  MINMAXSPEED_MIN,
-  MINMAXSPEED_1,
-  MINMAXSPEED_2,
-  MINMAXSPEED_3,
-  MINMAXSPEED_MAX
-} MINMAXSPEED_TYPE;
-
-typedef enum
-{
   MACHINE_ST,
   MACHINE_STE,
   MACHINE_TT,
@@ -259,15 +260,15 @@ typedef struct
 {
   int nCpuLevel;
   int nCpuFreq;
-  BOOL bCompatibleCpu;
-  /*BOOL bAddressSpace24;*/
+  bool bCompatibleCpu;
+  /*bool bAddressSpace24;*/
   MACHINETYPE nMachineType;
-  BOOL bBlitter;                  /* TRUE if Blitter is enabled */
+  bool bBlitter;                  /* TRUE if Blitter is enabled */
   DSPTYPE nDSPType;               /* how to "emulate" DSP */
-  BOOL bRealTimeClock;
-  BOOL bPatchTimerD;
-  BOOL bSlowFDC;                  /* TRUE to slow down FDC emulation */
-  MINMAXSPEED_TYPE nMinMaxSpeed;
+  bool bRealTimeClock;
+  bool bPatchTimerD;
+  bool bSlowFDC;                  /* TRUE to slow down FDC emulation */
+  bool bFastForward;
 } CNF_SYSTEM;
 
 
@@ -293,14 +294,13 @@ typedef struct
 } CNF_PARAMS;
 
 
-extern BOOL bFirstTimeInstall;
 extern CNF_PARAMS ConfigureParams;
 extern char sConfigFileName[FILENAME_MAX];
 
 extern void Configuration_SetDefault(void);
-extern void Configuration_Apply(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);
+extern void Configuration_MemorySnapShot_Capture(bool bSave);
 
 #endif