Merge branch 'development' into network-events-load-fix

Author: ethanbb

Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0720"
-   version = "1.7">
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -373,7 +373,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -4314,7 +4314,7 @@
 				};
 			};
 			buildConfigurationList = 3B096175C0B17BFA58475A08 /* Build configuration list for PBXProject "open-ephys" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (

Builds/MacOSX/open-ephys.xcodeproj/xcshareddata/xcschemes/open-ephys (App).xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0730"
-   version = "1.7">
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -65,7 +65,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Builds/VisualStudio2013/open-ephys.sln

@@ -4,6 +4,11 @@ VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE917D74-FAF2-41E9-BE61-CD40C62EB7D0}"
+	ProjectSection(SolutionItems) = preProject
+		Performance1.psess = Performance1.psess
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32

JuceLibraryCode/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-const int AudioProcessorGraph::midiChannelIndex = 0x1000;
+const int AudioProcessorGraph::midiChannelIndex = 0x8000;
 
 //==============================================================================
 template <typename FloatType, typename Impl> struct FloatDoubleUtil {};
@@ -767,7 +767,9 @@ struct RenderingOpSequenceCalculator
             }
             else
             {
-                for (int i = 0; i < node->getProcessor()->getTotalNumInputChannels(); ++i)
+				//Open ephys modification
+				unsigned int numInputChannels = node->getProcessor()->getTotalNumInputChannels();
+                for (int i = 0; i < numInputChannels; ++i)
                     if (i != inputChannelOfIndexToIgnore
                          && graph.getConnectionBetween (nodeId, outputChanIndex,
                                                         node->nodeId, i) != nullptr)

Source/Plugins/EventBroadcaster/EventBroadcaster.cpp

@@ -189,6 +189,7 @@ int EventBroadcaster::setListeningPort(int port, bool forceRestart)
         return 0;
 #endif
     }
+    return 0; // CJB added
 }
 
 

Source/Plugins/EvntTrigAvg/EvntTrigAvgCanvas.cpp

@@ -105,7 +105,7 @@ void EvntTrigAvgCanvas::resized()
 
 void EvntTrigAvgCanvas::paint(Graphics& g)
 {
-    g.fillAll(Colours::darkgrey);
+    g.fillAll(Colour(0,18,43));
 
     int width=getWidth();
     int height=getHeight();

Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp

@@ -3033,6 +3033,11 @@ bool LfpDisplay::getSingleChannelState()
 
 void LfpDisplay::mouseDown(const MouseEvent& event)
 {
+    if (drawableChannels.isEmpty())
+    {
+        return;
+    }
+
     //int y = event.getMouseDownY(); //relative to each channel pos
     MouseEvent canvasevent = event.getEventRelativeTo(viewport);
     int y = canvasevent.getMouseDownY() + viewport->getViewPositionY(); // need to account for scrolling

Source/Processors/AudioNode/AudioNode.cpp

@@ -111,7 +111,7 @@ void AudioNode::addInputChannel(GenericProcessor* sourceNode, int chan)
 
     int channelIndex = getNextChannel(false);
 
-    setPlayConfigDetails(channelIndex+1,0,44100.0,128);
+    //setPlayConfigDetails(channelIndex+1,0,44100.0,128);
 
     auto dataChannel = sourceNode->getDataChannel(chan);
     auto dataChannelCopy = new DataChannel(*dataChannel);
@@ -121,6 +121,11 @@ void AudioNode::addInputChannel(GenericProcessor* sourceNode, int chan)
 
 }
 
+void AudioNode::updatePlaybackBuffer()
+{
+	setPlayConfigDetails(dataChannelArray.size(), 0, 44100.0, 128);
+}
+
 void AudioNode::setParameter(int parameterIndex, float newValue)
 {
     // change left channel, right channel, or volume

Source/Processors/AudioNode/AudioNode.h

@@ -112,6 +112,9 @@ class AudioNode : public GenericProcessor
     /** Establishes a connection between a channel of a GenericProcessor and the AudioNode. */
     void addInputChannel(GenericProcessor* source, int chan);
 
+	/** Updates the audio buffer size*/
+	void updatePlaybackBuffer();
+
     /** A pointer to the AudioNode's editor. */
     ScopedPointer<AudioEditor> audioEditor;