Merged branch develop into master

rsjaffe · Feb 19, 2017 · e24b0ea · e24b0ea
2 parents 53de370 + 8e957b2
commit e24b0ea
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 39 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.0.2.2</string>
+    <string>2.0.3.0</string>
     <key>CFBundleVersion</key>
-    <string>2.0.2.2</string>
+    <string>2.0.3.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.2.2",
-					"JUCE_APP_VERSION_HEX=0x2000202", );
+					"JUCE_APP_VERSION=2.0.3.0",
+					"JUCE_APP_VERSION_HEX=0x2000300", );
 				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.2.2",
-					"JUCE_APP_VERSION_HEX=0x2000202", );
+					"JUCE_APP_VERSION=2.0.3.0",
+					"JUCE_APP_VERSION_HEX=0x2000300", );
 				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.0.2.2;JUCE_APP_VERSION_HEX=0x2000202;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.0.3.0;JUCE_APP_VERSION_HEX=0x2000300;%(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.2.2;JUCE_APP_VERSION_HEX=0x2000202;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=2.0.3.0;JUCE_APP_VERSION_HEX=0x2000300;%(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,2,2
+FILEVERSION  2,0,3,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "FileDescription",  "MIDI2LR\0"
-      VALUE "FileVersion",  "2.0.2.2\0"
+      VALUE "FileVersion",  "2.0.3.0\0"
       VALUE "ProductName",  "MIDI2LR\0"
-      VALUE "ProductVersion",  "2.0.2.2\0"
+      VALUE "ProductVersion",  "2.0.3.0\0"
     END
   END
 

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.2.2";
-    const int          versionNumber  = 0x2000202;
+    const char* const  versionString  = "2.0.3.0";
+    const int          versionNumber  = 0x2000300;
 }
 #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.0.2.2"
+<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="2.0.3.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/CommandMenu.cpp b/Source/CommandMenu.cpp
@@ -20,11 +20,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 "CommandMenu.h"
-#include "CCoptions.h"
-#include "PWoptions.h"
-#include <limits>
+
 #include "CCoptions.h"
 #include "LRCommands.h"
 #include "PWoptions.h"

diff --git a/Source/CommandMenu.h b/Source/CommandMenu.h
@@ -23,7 +23,6 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #define COMMANDMENU_H_INCLUDED
 
 #include <limits>
-#include <memory>
 #include <vector>
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "CommandMap.h"

diff --git a/Source/CommandTableModel.h b/Source/CommandTableModel.h
@@ -22,7 +22,6 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef COMMANDTABLEMODEL_H
 #define COMMANDTABLEMODEL_H
 
-#include <memory>
 #include <utility>
 #include <vector>
 #include "../JuceLibraryCode/JuceHeader.h"

diff --git a/Source/LRCommands.cpp b/Source/LRCommands.cpp
@@ -22,7 +22,6 @@ 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 = {

diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Build.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Build.lua
@@ -82,7 +82,6 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
   ==============================================================================
 */
 #include "LRCommands.h"
-#include <unordered_map>
 #include "CommandMap.h"
   
 ]=])

diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua b/Source/LRPlugin/MIDI2LR.lrplugin/ClientUtilities.lua
@@ -153,7 +153,8 @@ local function PasteSelectedSettings ()
           TargetSettings[param] = MIDI2LR.Copied_Settings[param]
         end
       end
-      if (TargetSettings.Tint or TargetSettings.Temperature) then
+      if ((ProgramPreferences.PasteList.Tint or ProgramPreferences.PasteList.Temperature) and 
+        (TargetSettings.WhiteBalance == nil or TargetSettings.WhiteBalance == 'As Shot')) then
         TargetSettings.WhiteBalance = 'Custom'
       end
       LrApplication.activeCatalog():withWriteAccessDo(

diff --git a/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua b/Source/LRPlugin/MIDI2LR.lrplugin/Info.lua
@@ -56,5 +56,5 @@ return {
       file = "Build.lua"
     },
   },
-  VERSION = { major=2, minor=0, revision=2, build=2}
+  VERSION = { major=2, minor=0, revision=3, build=0}
 }
diff --git a/Source/LR_IPC_In.h b/Source/LR_IPC_In.h
@@ -25,7 +25,6 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include <memory>
 #include <mutex>
 #include <string>
-#include <unordered_map>
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "ControlsModel.h"
 #include "CommandMap.h"

diff --git a/Source/LR_IPC_Out.cpp b/Source/LR_IPC_Out.cpp
@@ -21,8 +21,6 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
   ==============================================================================
 */
 #include "LR_IPC_OUT.h"
-#include "CommandMap.h"
-
 #include "LRCommands.h"
 
 namespace {

diff --git a/Source/LR_IPC_Out.h b/Source/LR_IPC_Out.h
@@ -22,15 +22,8 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef LR_IPC_OUT_H_INCLUDED
 #define LR_IPC_OUT_H_INCLUDED
 
-#include "../JuceLibraryCode/JuceHeader.h"
-#include "CommandMap.h"
-#include "ControlsModel.h"
-#include "MIDIProcessor.h"
-#include "Utilities/Utilities.h"
-#include <memory>
 #include <mutex>
 #include <string>
-#include <unordered_map>
 #include <vector>
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "CommandMap.h"

diff --git a/Source/MIDIProcessor.h b/Source/MIDIProcessor.h
@@ -21,13 +21,11 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef MIDIPROCESSOR_H_INCLUDED
 #define MIDIPROCESSOR_H_INCLUDED
-#include <array>
 #include <memory>
 #include <vector>
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "MidiUtilities.h"
 #include "NrpnMessage.h"
-#include "MidiUtilities.h"
 
 class MIDICommandListener {
 public:

diff --git a/Source/NrpnMessage.cpp b/Source/NrpnMessage.cpp
@@ -73,7 +73,7 @@ void NRPN_Message::SetControlLSB(short val) noexcept(ndebug) {
 void NRPN_Message::SetValueMSB(short val) noexcept(ndebug) {
   assert(val <= 0x7Fu);
   value_msb_ = val & 0x7Fu;
-  ready_ |= 0b100;  //-V112 "Magic number" false alarm
+  ready_ |= 0b100;  //"Magic number" false alarm //-V112
 }
 
 void NRPN_Message::SetValueLSB(short val) noexcept(ndebug) {

diff --git a/Source/SettingsComponent.h b/Source/SettingsComponent.h
@@ -22,7 +22,6 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef SETTINGSCOMPONENT_H_INCLUDED
 #define SETTINGSCOMPONENT_H_INCLUDED
 
-#include <memory>
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "ResizableLayout.h"
 #include "SettingsManager.h"

diff --git a/Source/VersionChecker.cpp b/Source/VersionChecker.cpp
@@ -23,7 +23,7 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include "VersionChecker.h"
 #include <utility>
 
-VersionChecker::VersionChecker(SettingsManager* setmgr) noexcept : 
+VersionChecker::VersionChecker(SettingsManager* setmgr) noexcept :
 settings_manager_{setmgr}, juce::Thread{"VersionChecker"} {}
 
 VersionChecker::~VersionChecker() {