Merge branch 'development' into fix-audiomonitor-offset

Builds/VisualStudio2013/open-ephys.sln

-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Debug64|Win32 = Debug64|Win32
 		Debug64|x64 = Debug64|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release64|Win32 = Release64|Win32
 		Release64|x64 = Release64|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
-		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
-		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
 		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
 	EndGlobalSection

Source/Processors/Editors/VisualizerEditor.h

@@ -202,8 +202,15 @@ private:
     void initializeSelectors();
 
     // Some constants
+
+	//C++11 constexpr keyword is not implemented in Visual Studio prior 2015
+#if defined _MSC_VER && _MSC_VER <= 1800
+	const char* EDITOR_TAG_TAB     = "TAB";
+	const char* EDITOR_TAG_WINDOW  = "WINDOW";
+#else
     static constexpr const char* EDITOR_TAG_TAB     = "TAB";
     static constexpr const char* EDITOR_TAG_WINDOW  = "WINDOW";
+#endif
 
     // ========================================================================
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (VisualizerEditor);

Source/Processors/Parameter/Parameter.cpp

@@ -28,7 +28,7 @@
 Parameter::Parameter (const String& name, bool defaultValue, int ID, bool deactivateDuringAcquisition)
     : shouldDeactivateDuringAcquisition (deactivateDuringAcquisition)
     , m_nameValueObject                 (name)
-    , m_descriptionValueObject          ("")
+    , m_descriptionValueObject          (String::empty)
     , m_parameterIdValueObject          (ID)
     , m_defaultValueObject              (defaultValue)
     , m_parameterType                   (PARAMETER_TYPE_BOOLEAN)
@@ -49,7 +49,7 @@ Parameter::Parameter (const String& name,
                       bool deactivateDuringAcquisition)
     : shouldDeactivateDuringAcquisition (deactivateDuringAcquisition)
     , m_nameValueObject                 (name)
-    , m_descriptionValueObject          ("")
+    , m_descriptionValueObject          (String::empty)
     , m_parameterIdValueObject          (ID)
     , m_defaultValueObject              (defaultValue)
     , m_parameterType                   (PARAMETER_TYPE_CONTINUOUS)
@@ -73,7 +73,7 @@ Parameter::Parameter (const String& name,
                       bool deactivateDuringAcquisition)
     : shouldDeactivateDuringAcquisition (deactivateDuringAcquisition)
     , m_nameValueObject                 (name)
-    , m_descriptionValueObject          ("")
+    , m_descriptionValueObject          (String::empty)
     , m_parameterIdValueObject          (ID)
     , m_defaultValueObject              (defaultValue)
     , m_parameterType                   (PARAMETER_TYPE_DISCRETE)
@@ -93,7 +93,7 @@ Parameter::Parameter (const String& name, const String& labelName,
                       bool deactivateDuringAcquisition)
     : shouldDeactivateDuringAcquisition (deactivateDuringAcquisition)
     , m_nameValueObject                 (name)
-    , m_descriptionValueObject          ("")
+    , m_descriptionValueObject          (String::empty)
     , m_parameterIdValueObject          (ID)
     , m_defaultValueObject              (defaultValue)
     , m_parameterType                   (PARAMETER_TYPE_NUMERICAL)

Source/Processors/Parameter/Parameter.h

@@ -136,7 +136,7 @@ public:
     int getEditorRecommendedHeight() const noexcept;
 
     /** Returns the desired bounds for editor if parameter has it. */
-    const Rectangle<int>& getEditorDesiredBounds() const noexcept;
+    const juce::Rectangle<int>& getEditorDesiredBounds() const noexcept;
 
     /** Sets the name of a parameter. */
     void setName (const String& newName);
@@ -157,7 +157,7 @@ public:
     void setEditorDesiredBounds (int x, int y, int width, int height);
 
     /** Sets desired bounds for the parameter editor. */
-    void setEditorDesiredBounds (const Rectangle<int>& desiredBounds);
+    void setEditorDesiredBounds (const juce::Rectangle<int>& desiredBounds);
 
     /** Returns the appropriate parameter type from string. */
     static ParameterType getParameterTypeFromString (const String& parameterTypeString);
@@ -201,7 +201,7 @@ private:
 
     bool m_hasCustomEditorBounds { false };
 
-    Rectangle<int> m_editorBounds;
+    juce::Rectangle<int> m_editorBounds;
 
     //var m_defaultValue;
     Array<var> m_values;