Merge remote-tracking branch 'upstream/master' into feature/mtrr

src/include/86box/86box.h

@@ -31,6 +31,10 @@
 #define NVR_PATH        "nvr"
 #define SCREENSHOT_PATH "screenshots"
 
+/* Recently used images */
+#define MAX_PREV_IMAGES 4
+#define MAX_IMAGE_PATH_LEN 256
+
 /* Default language 0xFFFF = from system, 0x409 = en-US */
 #define DEFAULT_LANGUAGE 0x0409
 

src/include/86box/cdrom.h

@@ -39,6 +39,8 @@
 #define CD_TOC_SESSION			1
 #define CD_TOC_RAW			2
 
+#define CD_IMAGE_HISTORY                4
+
 #define BUF_SIZE 32768
 
 #define CDROM_IMAGE 200
@@ -110,6 +112,8 @@ typedef struct cdrom {
     char image_path[1024],
          prev_image_path[1024];
 
+    char *image_history[CD_IMAGE_HISTORY];
+
     uint32_t sound_on, cdrom_capacity,
              pad, seek_pos,
              seek_diff, cd_end;