Merged branch develop into master

rsjaffe · Mar 5, 2017 · 523578d · 523578d
2 parents e7f4ada + 9b007fd
commit 523578d
Show file tree

Hide file tree

Showing 64 changed files with 4,284 additions and 3,330 deletions.
diff --git a/.gitignore b/.gitignore
@@ -280,6 +280,4 @@ Source/LRPlugin/MIDI2LR.lrplugin/MIDI2LR.exe
 Source/LRPlugin/MIDI2LR.lrplugin/default.xml
 Source/LRPlugin/MIDI2LR.lrplugin/settings.bin
 *.db
-
-
 *.backup
diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist
@@ -18,9 +18,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.0.3.1</string>
+    <string>2.0.4.0</string>
     <key>CFBundleVersion</key>
-    <string>2.0.3.1</string>
+    <string>2.0.4.0</string>
     <key>NSHumanReadableCopyright</key>
     <string></string>
     <key>NSHighResolutionCapable</key>

diff --git a/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj b/Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj
@@ -2465,8 +2465,8 @@
 					"_DEBUG=1",
 					"DEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=2.0.3.1",
-					"JUCE_APP_VERSION_HEX=0x2000301", );
+					"JUCE_APP_VERSION=2.0.4.0",
+					"JUCE_APP_VERSION_HEX=0x2000400", );
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "../../", "$(inherited)");
 				INFOPLIST_FILE = Info-App.plist;
@@ -2490,8 +2490,8 @@
 					"_NDEBUG=1",
 					"NDEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=2.0.3.1",
-					"JUCE_APP_VERSION_HEX=0x2000301", );
+					"JUCE_APP_VERSION=2.0.4.0",
+					"JUCE_APP_VERSION_HEX=0x2000400", );
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "../../", "$(inherited)");

diff --git a/Builds/VisualStudio2015/MIDI2LR.sln b/Builds/VisualStudio2015/MIDI2LR.sln
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2015
-Project("{050F59F1-41F2-89B3-50B2-E25F43FDC1AE}") = "MIDI2LR", "MIDI2LR.vcxproj", "{62CE7F88-4C2A-C448-873F-40363B88C6A3}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MIDI2LR", "MIDI2LR.vcxproj", "{62CE7F88-4C2A-C448-873F-40363B88C6A3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Builds/VisualStudio2015/MIDI2LR.vcxproj b/Builds/VisualStudio2015/MIDI2LR.vcxproj
@@ -58,7 +58,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.0.3.1;JUCE_APP_VERSION_HEX=0x2000301;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.0.4.0;JUCE_APP_VERSION_HEX=0x2000400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -99,7 +99,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.0.3.1;JUCE_APP_VERSION_HEX=0x2000301;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.0.4.0;JUCE_APP_VERSION_HEX=0x2000400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>

diff --git a/Builds/VisualStudio2015/resources.rc b/Builds/VisualStudio2015/resources.rc
@@ -7,16 +7,16 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  2,0,3,1
+FILEVERSION  2,0,4,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "FileDescription",  "MIDI2LR\0"
-      VALUE "FileVersion",  "2.0.3.1\0"
+      VALUE "FileVersion",  "2.0.4.0\0"
       VALUE "ProductName",  "MIDI2LR\0"
-      VALUE "ProductVersion",  "2.0.3.1\0"
+      VALUE "ProductVersion",  "2.0.4.0\0"
     END
   END
 

diff --git a/DoxyGen/Midi2lr.Doxyfile b/DoxyGen/Midi2lr.Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = MIDI2LR
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.0.0.0
+PROJECT_NUMBER         = 2.0.4.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h
@@ -37,8 +37,8 @@
 namespace ProjectInfo
 {
     const char* const  projectName    = "MIDI2LR";
-    const char* const  versionString  = "2.0.3.1";
-    const int          versionNumber  = 0x2000301;
+    const char* const  versionString  = "2.0.4.0";
+    const int          versionNumber  = 0x2000400;
 }
 #endif