Merge branch 'develop'

rsjaffe · Apr 1, 2017 · c761747 · c761747
2 parents 600a601 + ff0b1d5
commit c761747
Show file tree

Hide file tree

Showing 77 changed files with 901 additions and 602 deletions.
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.1.0.0</string>
+    <string>2.2.0.0</string>
     <key>CFBundleVersion</key>
-    <string>2.1.0.0</string>
+    <string>2.2.0.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
@@ -2470,8 +2470,8 @@
 					"_DEBUG=1",
 					"DEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=2.1.0.0",
-					"JUCE_APP_VERSION_HEX=0x2010000", );
+					"JUCE_APP_VERSION=2.2.0.0",
+					"JUCE_APP_VERSION_HEX=0x2020000", );
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "../../", "$(inherited)");
 				INFOPLIST_FILE = Info-App.plist;
@@ -2495,8 +2495,8 @@
 					"_NDEBUG=1",
 					"NDEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=2.1.0.0",
-					"JUCE_APP_VERSION_HEX=0x2010000", );
+					"JUCE_APP_VERSION=2.2.0.0",
+					"JUCE_APP_VERSION_HEX=0x2020000", );
 				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.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.1.0.0;JUCE_APP_VERSION_HEX=0x2010000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.2.0.0;JUCE_APP_VERSION_HEX=0x2020000;%(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.1.0.0;JUCE_APP_VERSION_HEX=0x2010000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.2.0.0;JUCE_APP_VERSION_HEX=0x2020000;%(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,1,0,0
+FILEVERSION  2,2,0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "FileDescription",  "MIDI2LR\0"
-      VALUE "FileVersion",  "2.1.0.0\0"
+      VALUE "FileVersion",  "2.2.0.0\0"
       VALUE "ProductName",  "MIDI2LR\0"
-      VALUE "ProductVersion",  "2.1.0.0\0"
+      VALUE "ProductVersion",  "2.2.0.0\0"
     END
   END
 

diff --git a/Builds/VisualStudio2017/MIDI2LR.vcxproj b/Builds/VisualStudio2017/MIDI2LR.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -46,6 +46,10 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <CodeAnalysisRuleSet>D:\Program Files\Visual Studio\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <EnableCppCoreCheck>true</EnableCppCoreCheck>
+    <EnableExperimentalCppCoreCheck>true</EnableExperimentalCppCoreCheck>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -58,8 +62,7 @@
     <ClCompile>
       <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.1.0.0;JUCE_APP_VERSION_HEX=0x2010000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.2.0.0;JUCE_APP_VERSION_HEX=0x2020000;%(PreprocessorDefinitions)PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -100,7 +103,8 @@
     <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.1.0.0;JUCE_APP_VERSION_HEX=0x2010000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.2.0.0;JUCE_APP_VERSION_HEX=0x2020000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader />
@@ -110,6 +114,10 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/Builds/VisualStudio2017/MIDI2LR.vcxproj.filters b/Builds/VisualStudio2017/MIDI2LR.vcxproj.filters
@@ -3491,6 +3491,15 @@
     <ClInclude Include="..\..\JuceLibraryCode\modules\juce_graphics\juce_graphics.h" />
     <ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\juce_gui_basics.h" />
     <ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_extra\juce_gui_extra.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_basics\juce_audio_basics.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\juce_audio_devices.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_formats\juce_audio_formats.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\juce_core.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_data_structures.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_events\juce_events.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_graphics\juce_graphics.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_basics\juce_gui_basics.h" />
+    <ClInclude Include="..\..\JuceLibraryCode\modules\juce_gui_extra\juce_gui_extra.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Source\MIDI2LR.png">

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

diff --git a/Installer/MIDI2LR.xml b/Installer/MIDI2LR.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>MIDI2LR</shortName>
     <fullName>MIDI2LR</fullName>
-    <version>2.1.0.0</version>
+    <version>2.2.0.0</version>
     <readmeFile>../Source/LRPlugin/ReadMe.txt</readmeFile>
     <licenseFile>../LICENSE.txt</licenseFile>
     <htmlLicenseFile>LICENSE.html</htmlLicenseFile>
@@ -33,6 +33,9 @@
                         <distributionFile>
                             <origin>../Source/LRPlugin/MIDI2LR.lrplugin/Client.lua</origin>
                         </distributionFile>
+                        <distributionFile>
+                            <origin>../Source/LRPlugin/MIDI2LR.lrplugin/Virtual.lua</origin>
+                        </distributionFile>
                         <distributionFile>
                             <origin>../Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua</origin>
                         </distributionFile>

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.1.0.0";
-    const int          versionNumber  = 0x2010000;
+    const char* const  versionString  = "2.2.0.0";
+    const int          versionNumber  = 0x2020000;
 }
 #endif
 

diff --git a/MIDI2LR.jucer b/MIDI2LR.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.1.0.0"
+<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.2.0.0"
               bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
               jucerVersion="4.3.1" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
               companyEmail="rsjaffe@gmail.com">

diff --git a/Source/CommandTable.cpp b/Source/CommandTable.cpp
@@ -36,8 +36,8 @@ CommandTable::CommandTable(const juce::String& component_name, CommandTableModel
 bool CommandTable::keyPressed(const KeyPress& k)
 {
     if (k.isKeyCode(KeyPress::deleteKey) && getSelectedRow() != -1) {
-        bool last = getSelectedRow() == getNumRows() - 1;
-        static_cast<CommandTableModel*>(getModel())->removeRow(static_cast<size_t>(getSelectedRow()));
+        const bool last = getSelectedRow() == getNumRows() - 1;
+        dynamic_cast<CommandTableModel*>(getModel())->removeRow(static_cast<size_t>(getSelectedRow()));
         updateContent();
         if (last) {
             // keep selection at the end

diff --git a/Source/ControlsModel.cpp b/Source/ControlsModel.cpp
@@ -90,9 +90,9 @@ short ChannelModel::PluginToController(short controltype, size_t controlnumber,
 
 void ChannelModel::setCC(size_t controlnumber, short min, short max, RSJ::CCmethod controltype) noexcept(ndebug)
 {
+    setCCmethod(controlnumber, controltype); //has to be set before others or ranges won't be correct
     setCCmin(controlnumber, min);
     setCCmax(controlnumber, max);
-    setCCmethod(controlnumber, controltype);
 }
 
 void ChannelModel::setCCall(size_t controlnumber, short min, short max, RSJ::CCmethod controltype) noexcept(ndebug)

diff --git a/Source/LRCommands.cpp b/Source/LRCommands.cpp
@@ -1,6 +1,6 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-/*
+  /*
   ==============================================================================
 
     LRCommands.cpp is generated by Build.lua. To make persistent changes
@@ -21,9 +21,8 @@ You should have received a copy of the GNU General Public License along with
 MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
   ==============================================================================
 */
-
 #include "LRCommands.h"
-#include <unordered_map>
+#include "CommandMap.h"
 
 const std::vector<std::string> LRCommandList::KeyShortcuts = {
     "Key 1",
@@ -133,8 +132,8 @@ const std::vector<std::string> LRCommandList::Develop = {
     "Primary Display Before/After Left/Right",
     "Primary Display Before/After Top/Bottom",
     "Primary Display Before",
-    "Show Reference View Horizontal",
-    "Show Reference View Vertical",
+    "Primary Display Reference View — Left/Right",
+    "Primary Display Reference View — Top/Bottom",
     "Primary Display Loupe",
 };
 
@@ -207,6 +206,7 @@ const std::vector<std::string> LRCommandList::Mixer = {
     "Saturation Adjustment Blue",
     "Saturation Adjustment Purple",
     "Saturation Adjustment Magenta",
+    "All Saturation Adjustment",
     "Hue Adjustment Red",
     "Hue Adjustment Orange",
     "Hue Adjustment Yellow",
@@ -244,6 +244,7 @@ const std::vector<std::string> LRCommandList::ResetMixer = {
     "Reset Saturation Adjustment Blue",
     "Reset Saturation Adjustment Purple",
     "Reset Saturation Adjustment Magenta",
+    "Reset All Saturation Adjustment",
     "Reset Hue Adjustment Red",
     "Reset Hue Adjustment Orange",
     "Reset Hue Adjustment Yellow",
@@ -745,6 +746,7 @@ const std::vector<std::string> LRCommandList::LRStringList = {
     "SaturationAdjustmentBlue",
     "SaturationAdjustmentPurple",
     "SaturationAdjustmentMagenta",
+    "AllSaturationAdjustment",
     "HueAdjustmentRed",
     "HueAdjustmentOrange",
     "HueAdjustmentYellow",
@@ -780,6 +782,7 @@ const std::vector<std::string> LRCommandList::LRStringList = {
     "ResetSaturationAdjustmentBlue",
     "ResetSaturationAdjustmentPurple",
     "ResetSaturationAdjustmentMagenta",
+    "ResetAllSaturationAdjustment",
     "ResetHueAdjustmentRed",
     "ResetHueAdjustmentOrange",
     "ResetHueAdjustmentYellow",

diff --git a/Source/LRPlugin/Controller_Settings/TouchOSC/Mathieu Carbou/MIDI2LR_TouchOSC.xml b/Source/LRPlugin/Controller_Settings/TouchOSC/Mathieu Carbou/MIDI2LR_TouchOSC.xml
@@ -31,8 +31,8 @@
   <setting channel="1" controller="34" command_string="Preset_4"/>
   <setting channel="1" controller="35" command_string="Preset_1"/>
   <setting channel="1" controller="36" command_string="ResetAll"/>
-  <setting channel="1" controller="37" command_string="SaturationAdjustment"/>
-  <setting channel="1" controller="38" command_string="ResetSaturationAdjustment"/>
+  <setting channel="1" controller="37" command_string="AllSaturationAdjustment"/>
+  <setting channel="1" controller="38" command_string="ResetAllSaturationAdjustment"/>
   <setting channel="1" controller="4" command_string="WhiteBalanceCloudy"/>
   <setting channel="1" controller="5" command_string="WhiteBalanceShade"/>
   <setting channel="1" controller="6" command_string="WhiteBalanceTungsten"/>