Merge branch 'release/v0.1.2-alpha'

NiccoloGranieri · Jun 28, 2018 · b308979 · b308979
2 parents bbbc2e4 + 6906b45
commit b308979
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Builds/VisualStudio2017/Reach_App.vcxproj b/Builds/VisualStudio2017/Reach_App.vcxproj
@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;C:\JUCE\modules;..\..\LeapSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=0.1.1;JUCE_APP_VERSION_HEX=0x101;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=0.1.2;JUCE_APP_VERSION_HEX=0x102;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -125,7 +125,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;C:\JUCE\modules;..\..\LeapSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=0.1.1;JUCE_APP_VERSION_HEX=0x101;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=0.1.2;JUCE_APP_VERSION_HEX=0x102;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>

diff --git a/Builds/VisualStudio2017/resources.rc b/Builds/VisualStudio2017/resources.rc
@@ -7,7 +7,7 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  0,1,1,0
+FILEVERSION  0,1,2,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -16,9 +16,9 @@ BEGIN
       VALUE "CompanyName",  "Integra Lab\0"
       VALUE "LegalCopyright",  "Integra Lab\0"
       VALUE "FileDescription",  "Reach\0"
-      VALUE "FileVersion",  "0.1.1\0"
+      VALUE "FileVersion",  "0.1.2\0"
       VALUE "ProductName",  "Reach\0"
-      VALUE "ProductVersion",  "0.1.1\0"
+      VALUE "ProductVersion",  "0.1.2\0"
     END
   END
 

diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h
@@ -35,7 +35,7 @@
 namespace ProjectInfo
 {
     const char* const  projectName    = "Reach";
-    const char* const  versionString  = "0.1.1";
-    const int          versionNumber  = 0x101;
+    const char* const  versionString  = "0.1.2";
+    const int          versionNumber  = 0x102;
 }
 #endif
diff --git a/ReachCpp.jucer b/ReachCpp.jucer
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <JUCERPROJECT id="Oi0NjZ" name="Reach" splashScreenColour="Dark" projectType="guiapp"
-              version="0.1.1" bundleIdentifier="com.IntegraLab.Reach" includeBinaryInAppConfig="1"
+              version="0.1.2" bundleIdentifier="com.IntegraLab.Reach" includeBinaryInAppConfig="1"
               cppLanguageStandard="11" companyCopyright="Integra Lab" jucerVersion="5.3.2"
               companyName="Integra Lab" reportAppUsage="0">
   <MAINGROUP id="dja4JP" name="Reach">

diff --git a/Source/MainComponent.cpp b/Source/MainComponent.cpp
@@ -93,7 +93,6 @@ void MainContentComponent::resized()
 
 void MainContentComponent::timerCallback()
 {
-
 	leftLed = false;
 	rightLed = false;
 
@@ -157,7 +156,11 @@ void MainContentComponent::timerCallback()
 void MainContentComponent::labelTextChanged(Label* labelThatHasChanged)
 {
 	if (labelThatHasChanged == &ipAddress)
+	{
 		senderIP = labelThatHasChanged->getText();
+		sender.disconnect();
+		sender.connect (senderIP, senderPort);
+	}
 
 	if (labelThatHasChanged == &port)
 		senderPort = (int)labelThatHasChanged->getText().getIntValue();