Skip to content

Commit

Permalink
Merge branch 'release/1.5.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
rsjaffe committed Nov 26, 2016
2 parents a5a1ac4 + 2d10836 commit 3dd47e1
Show file tree
Hide file tree
Showing 23 changed files with 710 additions and 92 deletions.
4 changes: 2 additions & 2 deletions Builds/MacOSX/Info-App.plist
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>1.5.0.0</string>
<string>1.5.0.1</string>
<key>CFBundleVersion</key>
<string>1.5.0.0</string>
<string>1.5.0.1</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand Down
8 changes: 4 additions & 4 deletions Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2442,8 +2442,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=1.5.0.0",
"JUCE_APP_VERSION_HEX=0x1050000", );
"JUCE_APP_VERSION=1.5.0.1",
"JUCE_APP_VERSION_HEX=0x1050001", );
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
INFOPLIST_FILE = Info-App.plist;
Expand All @@ -2467,8 +2467,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=1.5.0.0",
"JUCE_APP_VERSION_HEX=0x1050000", );
"JUCE_APP_VERSION=1.5.0.1",
"JUCE_APP_VERSION_HEX=0x1050001", );
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "$(inherited)");
Expand Down
4 changes: 2 additions & 2 deletions Builds/VisualStudio2015/MIDI2LR.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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=1.5.0.0;JUCE_APP_VERSION_HEX=0x1050000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.5.0.1;JUCE_APP_VERSION_HEX=0x1050001;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down Expand Up @@ -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=1.5.0.0;JUCE_APP_VERSION_HEX=0x1050000;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.5.0.1;JUCE_APP_VERSION_HEX=0x1050001;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
Expand Down
6 changes: 3 additions & 3 deletions Builds/VisualStudio2015/resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,5,0,0
FILEVERSION 1,5,0,1
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "MIDI2LR\0"
VALUE "FileVersion", "1.5.0.0\0"
VALUE "FileVersion", "1.5.0.1\0"
VALUE "ProductName", "MIDI2LR\0"
VALUE "ProductVersion", "1.5.0.0\0"
VALUE "ProductVersion", "1.5.0.1\0"
END
END

Expand Down
4 changes: 2 additions & 2 deletions JuceLibraryCode/JuceHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
namespace ProjectInfo
{
const char* const projectName = "MIDI2LR";
const char* const versionString = "1.5.0.0";
const int versionNumber = 0x1050000;
const char* const versionString = "1.5.0.1";
const int versionNumber = 0x1050001;
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion MIDI2LR.jucer
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="1.5.0.0"
<JUCERPROJECT id="jqaeel" name="MIDI2LR" projectType="guiapp" version="1.5.0.1"
bundleIdentifier="com.rsjaffe.MIDI2LR" includeBinaryInAppConfig="1"
jucerVersion="4.3.0" companyWebsite="http://rsjaffe.github.io/MIDI2LR/"
companyEmail="rsjaffe@gmail.com">
Expand Down
39 changes: 39 additions & 0 deletions Source/LRPlugin/Controller_Settings/BCFBCR2000/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
BCF2000.txt and BCR2000.txt are settings for the BCF2000 and BCR2000 controllers. Following are instructions for getting ready with the BCF2000:

Download and install plugin into LR per usual (see ReadMe.txt) in the MIDI2LR folder
In the MIDI2LR popup
Settings
Turn off enable pickup mode (for BCF2000)
Choose Profile Folder (*1)
LR plugin manager
Make sure MIDI2LR is enabled
LR plugin extras
Make sure server is started (MIDI2LR popup should be green and say �Connected to LR�)
Options -> Profiles
Type in the profile names (located in Profile Folder *1)
The names will be predictive text once you start typing

Preparing the BCF2000

If it is used need to factory reset it:
https://pusherlabs.freshdesk.com/support/solutions/articles/161619-resetting-the-behringer-bcf-2000-bcr-2000-to-factory-defaults

Reprogram the BCF2000 using BCManager (*2)
http://mountainutilities.eu/bcmanager

What this (*2) does:
Remaps BCF2000 to �toggle off� mode. This allows top buttons to send LR commands with a single button press rather than be in their default toggle on/off, which is normally used for muting and unmuting music tracks. Trust me you need this. It also remaps the BCF2000 buttons Store, Learn, Edit and Exit to generic buttons that can then be used by MIDI2LR per usual. Also, you�ll want this. Trust me.

BCManager uses a file within the �Controller Settings� folder in the MIDI2LR folder: preset2.bcf. (*3) It�s the file that does the remapping. When BCF2000 is on, it remaps PRESET2 on the BCF2000. This is the only preset that you�ll need on the BCF2000 and will not need to ever touch the PRESET buttons again. LED on the BCF needs to show P-2.

Turn on BCF2000 and connect to your computer
Open BCManager
Press button �Show list of B controls�
Your BCF2000 should be listed and noted as �online�
File -> Open -> preset2.bcf (*3)
MIDI -> Send all data
Exit from BCManager

You�re done and ready to go!

Instructions courtesy of kfrazack
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>

<settings>
<setting channel="11" controller="47" command_string="Key5"/>
<setting channel="11" controller="15" command_string="ResetWhites"/>
<setting channel="11" controller="31" command_string="Key8"/>
<setting channel="11" controller="63" command_string="profile1"/>
<setting channel="11" controller="45" command_string="ResetVibrance"/>
<setting channel="11" controller="13" command_string="ResetShadows"/>
<setting channel="11" controller="61" command_string="ToggleGreen"/>
<setting channel="11" controller="29" command_string="ResetAll"/>
<setting channel="11" controller="19" command_string="Key4"/>
<setting channel="11" controller="51" command_string="IncreaseRating"/>
<setting channel="11" controller="35" command_string="Temperature"/>
<setting channel="11" controller="3" command_string="Blacks"/>
<setting channel="11" controller="11" command_string="ResetContrast"/>
<setting channel="11" controller="59" command_string="ToggleRed"/>
<setting channel="11" controller="43" command_string="WhiteBalanceAs_Shot"/>
<setting channel="11" controller="27" command_string="Undo"/>
<setting channel="11" controller="12" command_string="ResetBlacks"/>
<setting channel="11" controller="60" command_string="ToggleYellow"/>
<setting channel="11" controller="44" command_string="WhiteBalanceAuto"/>
<setting channel="11" controller="28" command_string="CropOverlay"/>
<setting channel="11" controller="46" command_string="ResetSaturation"/>
<setting channel="11" controller="14" command_string="ResetHighlights"/>
<setting channel="11" controller="62" command_string="ToggleBlue"/>
<setting channel="11" controller="30" command_string="ResetAll"/>
<setting channel="11" controller="52" command_string="DecreaseRating"/>
<setting channel="11" controller="36" command_string="Tint"/>
<setting channel="11" controller="4" command_string="Shadows"/>
<setting channel="11" controller="20" command_string="CopySettings"/>
<setting channel="11" controller="53" command_string="Pick"/>
<setting channel="11" controller="37" command_string="Vibrance"/>
<setting channel="11" controller="5" command_string="Highlights"/>
<setting channel="11" controller="21" command_string="PasteSettings"/>
<setting channel="11" controller="22" command_string="Key6"/>
<setting channel="11" controller="54" command_string="RemoveFlag"/>
<setting channel="11" controller="38" command_string="Saturation"/>
<setting channel="11" controller="6" command_string="Whites"/>
<setting channel="11" controller="23" command_string="Key7"/>
<setting channel="11" controller="7" command_string="Clarity"/>
<setting channel="11" controller="39" command_string="ParametricDarks"/>
<setting channel="11" controller="56" command_string="Key2"/>
<setting channel="11" controller="8" command_string="straightenAngle"/>
<setting channel="11" controller="40" command_string="ParametricShadows"/>
<setting channel="11" controller="24" command_string="Select1Left"/>
<setting channel="11" controller="57" command_string="Prev"/>
<setting channel="11" controller="9" command_string="Unmapped"/>
<setting channel="11" controller="41" command_string="ParametricLights"/>
<setting channel="11" controller="25" command_string="Select1Right"/>
<setting channel="11" controller="10" command_string="ResetExposure"/>
<setting channel="11" controller="26" command_string="Key9"/>
<setting channel="11" controller="58" command_string="Next"/>
<setting channel="11" controller="42" command_string="ParametricHighlights"/>
<setting channel="11" controller="18" command_string="Key3"/>
<setting channel="11" controller="50" command_string="ConvertToGrayscale"/>
<setting channel="11" controller="2" command_string="Contrast"/>
<setting channel="11" controller="34" command_string="Unmapped"/>
<setting channel="11" controller="17" command_string="ResetstraightenAngle"/>
<setting channel="11" controller="33" command_string="Next"/>
<setting channel="11" controller="1" command_string="Exposure"/>
<setting channel="11" controller="49" command_string="EnableToneCurve"/>
<setting channel="11" controller="16" command_string="ResetClarity"/>
<setting channel="11" controller="48" command_string="Key5"/>
<setting channel="11" controller="32" command_string="Prev"/>
<setting channel="11" controller="64" command_string="profile2"/>
<setting channel="11" controller="65" command_string="profile3"/>
<setting channel="11" controller="66" command_string="profile4"/>
<setting channel="11" controller="55" command_string="Key1"/>
<setting channel="10" controller="24" command_string="Unmapped"/>
<setting channel="10" controller="25" command_string="Unmapped"/>
<setting channel="10" controller="32" command_string="Unmapped"/>
<setting channel="10" controller="33" command_string="Unmapped"/>
<setting channel="10" controller="9" command_string="Unmapped"/>
<setting channel="10" controller="35" command_string="Unmapped"/>
<setting channel="10" controller="36" command_string="Unmapped"/>
<setting channel="10" controller="37" command_string="Unmapped"/>
<setting channel="10" controller="38" command_string="Unmapped"/>
<setting channel="10" controller="39" command_string="Unmapped"/>
<setting channel="10" controller="40" command_string="Unmapped"/>
<setting channel="10" controller="41" command_string="Unmapped"/>
<setting channel="10" controller="42" command_string="Unmapped"/>
<setting channel="10" controller="65" command_string="Unmapped"/>
<setting channel="10" controller="66" command_string="Unmapped"/>
<setting channel="10" controller="58" command_string="Unmapped"/>
<setting channel="10" controller="57" command_string="Unmapped"/>
<setting channel="10" controller="34" command_string="Unmapped"/>
<setting channel="10" controller="1" command_string="PostCropVignetteAmount"/>
<setting channel="10" controller="2" command_string="PostCropVignetteMidpoint"/>
<setting channel="10" controller="3" command_string="PostCropVignetteFeather"/>
<setting channel="10" controller="4" command_string="GrainAmount"/>
<setting channel="10" controller="5" command_string="GrainSize"/>
<setting channel="10" controller="6" command_string="GrainFrequency"/>
<setting channel="10" controller="10" command_string="ResetPostCropVignetteAmount"/>
<setting channel="10" controller="11" command_string="ResetPostCropVignetteMidpoint"/>
<setting channel="10" controller="12" command_string="ResetPostCropVignetteFeather"/>
<setting channel="10" controller="13" command_string="ResetGrainAmount"/>
<setting channel="10" controller="14" command_string="ResetGrainSize"/>
<setting channel="10" controller="15" command_string="ResetGrainFrequency"/>
<setting channel="10" controller="16" command_string="Preset_1"/>
<setting channel="10" controller="17" command_string="Preset_2"/>
<setting channel="10" controller="7" command_string="Dehaze"/>
<setting channel="10" controller="8" command_string="LensProfileVignettingScale"/>
<setting channel="10" controller="18" command_string="Preset_3"/>
<setting channel="10" controller="31" command_string="Preset_11"/>
<setting channel="10" controller="19" command_string="Preset_4"/>
<setting channel="10" controller="20" command_string="Preset_5"/>
<setting channel="10" controller="21" command_string="Preset_12"/>
<setting channel="10" controller="22" command_string="Preset_13"/>
<setting channel="10" controller="23" command_string="Preset_14"/>
<setting channel="10" controller="26" command_string="Preset_6"/>
<setting channel="10" controller="27" command_string="Preset_7"/>
<setting channel="10" controller="28" command_string="Preset_8"/>
<setting channel="10" controller="29" command_string="Preset_9"/>
<setting channel="10" controller="30" command_string="Preset_10"/>
<setting channel="10" controller="59" command_string="Preset_15"/>
<setting channel="10" controller="60" command_string="Preset_16"/>
<setting channel="10" controller="61" command_string="Preset_17"/>
<setting channel="10" controller="62" command_string="Preset_18"/>
<setting channel="10" controller="63" command_string="Preset_19"/>
<setting channel="10" controller="64" command_string="Preset_20"/>
<setting channel="10" controller="51" command_string="Preset_21"/>
<setting channel="10" controller="52" command_string="Preset_22"/>
<setting channel="10" controller="53" command_string="Preset_23"/>
<setting channel="10" controller="54" command_string="Preset_24"/>
<setting channel="10" controller="55" command_string="Preset_25"/>
<setting channel="10" controller="56" command_string="Preset_26"/>
</settings>
Loading

0 comments on commit 3dd47e1

Please sign in to comment.