Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input_buffer.cpp

lib/defines.h

@@ -1,3 +1,4 @@
+#pragma once
 // Defines to print debug messages.
 #ifndef MIST_DEBUG
 #define MIST_DEBUG 1
@@ -77,3 +78,5 @@ static const char * DBG_LVL_LIST[] = {"NONE", "FAIL", "ERROR", "WARN", "INFO", "
 #define SEM_LIVE "MstLIVE%s" //%s stream name
 #define NAME_BUFFER_SIZE 200    //char buffer size for snprintf'ing shm filenames
 
+#define SIMUL_TRACKS 10
+

lib/shared_memory.cpp

@@ -293,14 +293,14 @@ namespace IPC {
 #ifdef __CYGWIN__
       if (master) {
         //Under cygwin, all pages are 4 bytes longer than claimed.
-        handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, len+4, name.c_str());
+        handle = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, len+4, name.c_str());
       } else {
         int i = 0;
         do {
           if (i != 0) {
             Util::sleep(1000);
           }
-          handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, name.c_str());
+          handle = OpenFileMappingA(FILE_MAP_ALL_ACCESS, FALSE, name.c_str());
           i++;
         } while (i < 10 && !handle && autoBackoff);
       }

lib/shared_memory.h

@@ -3,6 +3,7 @@
 #include <set>
 
 #include "timing.h"
+#include "defines.h"
 
 #ifdef __CYGWIN__
 #include <windows.h>
@@ -11,7 +12,7 @@
 #endif
 
 #define STAT_EX_SIZE 172
-#define PLAY_EX_SIZE 32
+#define PLAY_EX_SIZE 2+6*SIMUL_TRACKS
 
 namespace IPC {