Merge remote-tracking branch 'refs/remotes/origin/develop'

rsjaffe · Feb 2, 2016 · 4fd3cf6 · 4fd3cf6
2 parents 980baa6 + 88c82c1
commit 4fd3cf6
Show file tree

Hide file tree

Showing 60 changed files with 8,873 additions and 1,807 deletions.
diff --git a/.gitignore b/.gitignore
@@ -265,3 +265,4 @@ Source/LRPlugin/MIDI2LR.lrplugin/untitled.lua
 Source/LRPlugin/MIDI2LR.lrplugin/test.lua
 
 /DoxyGen/html
+Source/LRPlugin/MIDI2LR.lrplugin/Documentation.txt
diff --git a/Builds/MacOSX/Icon.icns b/Builds/MacOSX/Icon.icns
diff --git a/Builds/MacOSX/Info.plist b/Builds/MacOSX/Info.plist
@@ -16,9 +16,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.9.4</string>
+    <string>0.9.5</string>
     <key>CFBundleVersion</key>
-    <string>0.9.4</string>
+    <string>0.9.5</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
diff --git a/Builds/VisualStudio2015/MIDI2LR.vcxproj b/Builds/VisualStudio2015/MIDI2LR.vcxproj
@@ -56,7 +56,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=0.9.4;JUCE_APP_VERSION_HEX=0x904;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.9.5;JUCE_APP_VERSION_HEX=0x905;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -97,7 +97,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=0.9.4;JUCE_APP_VERSION_HEX=0x904;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.9.5;JUCE_APP_VERSION_HEX=0x905;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -142,10 +142,12 @@
     <ClCompile Include="..\..\Source\MainWindow.cpp"/>
     <ClCompile Include="..\..\Source\MIDIProcessor.cpp"/>
     <ClCompile Include="..\..\Source\MIDISender.cpp"/>
+    <ClCompile Include="..\..\Source\Pattern\Observer.cpp"/>
     <ClCompile Include="..\..\Source\ProfileManager.cpp"/>
     <ClCompile Include="..\..\Source\ResizableLayout.cpp"/>
     <ClCompile Include="..\..\Source\SettingsComponent.cpp"/>
     <ClCompile Include="..\..\Source\SettingsManager.cpp"/>
+    <ClCompile Include="..\..\Source\Pattern\Subject.cpp"/>
     <ClCompile Include="..\..\Source\VersionChecker.cpp"/>
     <ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_basics\buffers\juce_AudioDataConverters.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
@@ -1200,10 +1202,12 @@
     <ClInclude Include="..\..\Source\MainWindow.h"/>
     <ClInclude Include="..\..\Source\MIDIProcessor.h"/>
     <ClInclude Include="..\..\Source\MIDISender.h"/>
+    <ClInclude Include="..\..\Source\Pattern\Observer.h"/>
     <ClInclude Include="..\..\Source\ProfileManager.h"/>
     <ClInclude Include="..\..\Source\ResizableLayout.h"/>
     <ClInclude Include="..\..\Source\SettingsComponent.h"/>
     <ClInclude Include="..\..\Source\SettingsManager.h"/>
+    <ClInclude Include="..\..\Source\Pattern\Subject.h"/>
     <ClInclude Include="..\..\Source\Tools.h"/>
     <ClInclude Include="..\..\Source\VersionChecker.h"/>
     <ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_basics\buffers\juce_AudioDataConverters.h"/>

diff --git a/Builds/VisualStudio2015/MIDI2LR.vcxproj.filters b/Builds/VisualStudio2015/MIDI2LR.vcxproj.filters
@@ -292,6 +292,9 @@
     <ClCompile Include="..\..\Source\MIDISender.cpp">
       <Filter>MIDI2LR\Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Pattern\Observer.cpp">
+      <Filter>MIDI2LR\Source</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Source\ProfileManager.cpp">
       <Filter>MIDI2LR\Source</Filter>
     </ClCompile>
@@ -304,6 +307,9 @@
     <ClCompile Include="..\..\Source\SettingsManager.cpp">
       <Filter>MIDI2LR\Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Pattern\Subject.cpp">
+      <Filter>MIDI2LR\Source</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Source\VersionChecker.cpp">
       <Filter>MIDI2LR\Source</Filter>
     </ClCompile>
@@ -1470,6 +1476,9 @@
     <ClInclude Include="..\..\Source\MIDISender.h">
       <Filter>MIDI2LR\Source</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Pattern\Observer.h">
+      <Filter>MIDI2LR\Source</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\ProfileManager.h">
       <Filter>MIDI2LR\Source</Filter>
     </ClInclude>
@@ -1482,6 +1491,9 @@
     <ClInclude Include="..\..\Source\SettingsManager.h">
       <Filter>MIDI2LR\Source</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Pattern\Subject.h">
+      <Filter>MIDI2LR\Source</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Tools.h">
       <Filter>MIDI2LR\Source</Filter>
     </ClInclude>

diff --git a/Builds/VisualStudio2015/icon.ico b/Builds/VisualStudio2015/icon.ico
diff --git a/Builds/VisualStudio2015/resources.rc b/Builds/VisualStudio2015/resources.rc
@@ -7,16 +7,16 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  0,9,4,0
+FILEVERSION  0,9,5,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "FileDescription",  "MIDI2LR\0"
-      VALUE "FileVersion",  "0.9.4\0"
+      VALUE "FileVersion",  "0.9.5\0"
       VALUE "ProductName",  "MIDI2LR\0"
-      VALUE "ProductVersion",  "0.9.4\0"
+      VALUE "ProductVersion",  "0.9.5\0"
     END
   END