Merge remote-tracking branch 'origin/development' into development

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata

@@ -35,9 +35,6 @@
       <FileRef
          location = "group:FilterNode/FilterNode.xcodeproj">
       </FileRef>
-      <FileRef
-         location = "group:JuliaProcessor/JuliaProcessor.xcodeproj">
-      </FileRef>
       <FileRef
          location = "group:KWIKFormat/KWIKFormat.xcodeproj">
       </FileRef>

Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj

@@ -174,6 +174,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(MAC_PACKAGE_DIR)/include",
+					"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -191,6 +192,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(MAC_PACKAGE_DIR)/include",
+					"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",

Builds/MacOSX/Plugins/Config/Plugin.xcconfig

@@ -5,6 +5,8 @@ MAC_PACKAGE_DIR = /opt/local
 // Pull in machine-specific settings from git-ignored file, if it exists.
 #include "Env.xcconfig"
 
+#include "Base.xcconfig"
+
 CONFIGURATION_BUILD_DIR = $(PROJECT_DIR)/../../build/$(CONFIGURATION)/open-ephys.app/Contents/PlugIns
 COPY_PHASE_STRIP = NO
 DEBUG_INFORMATION_FORMAT = dwarf

Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj

@@ -197,6 +197,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E1F558DB1C9B23830035F88B /* Plugin_Debug.xcconfig */;
 			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../../../../JuceLibraryCode,
+					../../../../JuceLibraryCode/modules,
+					../../../../Source/Plugins/Headers,
+					../../../../Source/Plugins/CommonLibs,
+					"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
+					"$(MAC_PACKAGE_DIR)/include",
+					"$(inherited)",
+				);
 			};
 			name = Debug;
 		};
@@ -204,6 +213,15 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E1F558DC1C9B23830035F88B /* Plugin_Release.xcconfig */;
 			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					../../../../JuceLibraryCode,
+					../../../../JuceLibraryCode/modules,
+					../../../../Source/Plugins/Headers,
+					../../../../Source/Plugins/CommonLibs,
+					"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
+					"$(MAC_PACKAGE_DIR)/include",
+					"$(inherited)",
+				);
 			};
 			name = Release;
 		};

Source/Processors/Channel/InfoObjects.cpp

@@ -34,6 +34,9 @@ NodeInfoBase::NodeInfoBase(uint16 id) :
 	m_nodeID(id)
 {}
 
+NodeInfoBase::~NodeInfoBase()
+{}
+
 unsigned int NodeInfoBase::getCurrentNodeID() const
 {
 	return m_nodeID;
@@ -50,6 +53,9 @@ String NodeInfoBase::getCurrentNodeName() const
 }
 
 //History Object
+HistoryObject::~HistoryObject()
+{}
+
 String HistoryObject::getHistoricString()
 {
 	return m_historicString;
@@ -73,6 +79,9 @@ SourceProcessorInfo::SourceProcessorInfo(const GenericProcessor* source, uint16
 {
 }
 
+SourceProcessorInfo::~SourceProcessorInfo()
+{}
+
 uint16 SourceProcessorInfo::getSourceNodeID() const
 {
 	return m_sourceNodeID;
@@ -99,6 +108,9 @@ uint16 SourceProcessorInfo::getSourceSubprocessorCount() const
 }
 
 //NamedInfoObject
+NamedInfoObject::~NamedInfoObject()
+{}
+
 void NamedInfoObject::setName(String name)
 {
 	m_name = name;
@@ -139,6 +151,9 @@ InfoObjectCommon::InfoObjectCommon(uint16 idx, uint16 typeidx, float sampleRate,
 {
 }
 
+InfoObjectCommon::~InfoObjectCommon()
+{}
+
 float InfoObjectCommon::getSampleRate() const
 {
 	return m_sampleRate;
@@ -542,6 +557,9 @@ ConfigurationObject::ConfigurationObject(String identifier, GenericProcessor* so
 	setIdentifier(identifier);
 }
 
+ConfigurationObject::~ConfigurationObject()
+{}
+
 void ConfigurationObject::setShouldBeRecorded(bool status)
 {
 	m_shouldBeRecorded = status;

Source/Processors/Channel/InfoObjects.h

@@ -47,6 +47,7 @@ class PLUGIN_API NodeInfoBase
 	//This field should never be changed by anything except GenericProcessor base code
 	friend class GenericProcessor;
 public:
+    virtual ~NodeInfoBase();
 	/** Gets the ID of the processor which currently owns this copy of the info object */
 	unsigned int getCurrentNodeID() const;
 	/** Gets the type of the processor which currently owns this copy of the info object */
@@ -68,6 +69,7 @@ protected:
 	HistoryObject();
 
 public:
+    virtual ~HistoryObject();
 	/** Returns the historic string */
 	String getHistoricString();
 	/** Adds a new entry in the historic string*/
@@ -83,6 +85,7 @@ protected:
 	SourceProcessorInfo(const GenericProcessor* source, uint16 subproc = 0);
 
 public:
+    virtual ~SourceProcessorInfo();
 	/** Gets the ID of the processor which created the channel object */
 	uint16 getSourceNodeID() const;
 
@@ -111,6 +114,7 @@ private:
 class PLUGIN_API NamedInfoObject
 {
 public:
+    virtual ~NamedInfoObject();
 	/** Sets the object's name*/
 	void setName(String name);
 
@@ -145,6 +149,7 @@ protected:
 	InfoObjectCommon(uint16 idx, uint16 typeidx, float sampleRate, const GenericProcessor* source, uint16 subproc = 0);
 
 public:
+    virtual ~InfoObjectCommon();
 	enum InfoObjectType
 	{
 		DATA_CHANNEL,
@@ -201,7 +206,7 @@ public:
 	/** Copy constructor. */
 	DataChannel(const DataChannel& ch);
 
-	~DataChannel();
+	virtual ~DataChannel();
 
 	//--------- DATA GET / SET METHODS --------//
 
@@ -303,7 +308,7 @@ public:
 	*/
 	EventChannel(EventChannelTypes type, unsigned int numChannels, unsigned int dataLength, float sampleRate, GenericProcessor* source, uint16 subproc = 0);
 
-	~EventChannel();
+	virtual ~EventChannel();
 
 	EventChannelTypes getChannelType() const;
 
@@ -368,7 +373,7 @@ public:
 	*/
 	SpikeChannel(ElectrodeTypes type, GenericProcessor* source, const Array<const DataChannel*>& sourceChannels, uint16 subproc = 0);
 
-	~SpikeChannel();
+	virtual ~SpikeChannel();
 
 	ElectrodeTypes getChannelType() const;
 
@@ -431,6 +436,7 @@ public:
 	@param subproc Optional. The source subprocessor index
 	*/
 	ConfigurationObject(String identifier, GenericProcessor* source, uint16 subproc = 0);
+    virtual ~ConfigurationObject();
 
 	/** Sets if the configuration should be recorded or not.
 	Similar to the events, this does not prevent the configuration data to be recorded, but rather states

Source/Processors/Channel/MetaData.cpp

@@ -46,7 +46,7 @@ bool checkMetaDataType(MetaDataDescriptor::MetaDataTypes baseType)
 //MetaDataDescriptor
 
 MetaDataDescriptor::MetaDataDescriptor(MetaDataDescriptor::MetaDataTypes t, unsigned int length, String n, String d, String id)
-	: m_name(n), m_description(d), m_identifier(id), m_type(t), m_length(length)
+	: m_name(n), m_identifier(id), m_description(d), m_type(t), m_length(length)
 {}
 
 MetaDataDescriptor::~MetaDataDescriptor() {};
@@ -277,6 +277,8 @@ void MetaDataValue::setValue(const void* data)
 
 MetaDataInfoObject::MetaDataInfoObject() {}
 
+MetaDataInfoObject::~MetaDataInfoObject() {}
+
 void MetaDataInfoObject::addMetaData(MetaDataDescriptor* desc, MetaDataValue* val)
 {
 	if (desc->getType() != val->getDataType() || desc->getLength() != val->getDataLength())
@@ -335,6 +337,8 @@ int MetaDataInfoObject::findMetaData(MetaDataDescriptor::MetaDataTypes type, uns
 
 MetaDataEventObject::MetaDataEventObject() {}
 
+MetaDataEventObject::~MetaDataEventObject() {}
+
 void MetaDataEventObject::addEventMetaData(MetaDataDescriptor* desc)
 {
 	if (eventMetaDataLock)
@@ -400,6 +404,8 @@ size_t MetaDataEventObject::getMaxEventMetaDataSize() const
 //MetaDataEvent
 MetaDataEvent::MetaDataEvent() {}
 
+MetaDataEvent::~MetaDataEvent() {}
+
 int MetaDataEvent::getMetadataValueCount() const
 {
 	return m_metaDataValues.size();

Source/Processors/Channel/MetaData.h

@@ -177,6 +177,7 @@ class PLUGIN_API MetaDataInfoObject
 protected:
 	MetaDataInfoObject();
 public:
+    virtual ~MetaDataInfoObject();
 	void addMetaData(MetaDataDescriptor* desc, MetaDataValue* val);
 	void addMetaData(const MetaDataDescriptor& desc, const MetaDataValue& val);
 	const MetaDataDescriptor* getMetaDataDescriptor(int index) const;
@@ -204,6 +205,7 @@ protected:
 class PLUGIN_API MetaDataEventObject : public MetaDataEventLock
 {
 public:
+    virtual ~MetaDataEventObject();
 	//This method will only work when creating the info object, but not for those copied down the chain
 	void addEventMetaData(MetaDataDescriptor* desc);
 	void addEventMetaData(const MetaDataDescriptor& desc);
@@ -224,6 +226,7 @@ protected:
 class PLUGIN_API MetaDataEvent
 {
 public:
+    virtual ~MetaDataEvent();
 	int getMetadataValueCount() const;
 	const MetaDataValue* getMetaDataValue(int index) const;
 protected:

Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp

@@ -927,6 +927,7 @@ int RHD2000Thread::getNumDataOutputs(DataChannel::DataChannelTypes type, int sub
 			return 0;
 		}
 	}
+    return 0;
 }
 
 String RHD2000Thread::getChannelUnits(int chanIndex) const

Source/Processors/FileReader/FileReader.cpp

@@ -245,14 +245,14 @@ void FileReader::process (AudioSampleBuffer& buffer)
         {
             samplesToRead = stopSample - currentSample;
             if (samplesToRead > 0)
-                input->readData (readBuffer + samplesRead, samplesToRead);
+                input->readData (readBuffer + samplesRead * currentNumChannels, samplesToRead);
 
             input->seekTo (startSample);
             currentSample = startSample;
         }
         else
         {
-            input->readData (readBuffer + samplesRead, samplesToRead);
+            input->readData (readBuffer + samplesRead * currentNumChannels, samplesToRead);
 
             currentSample += samplesToRead;
         }

Source/Processors/GenericProcessor/GenericProcessor.cpp

@@ -477,7 +477,7 @@ void GenericProcessor::createEventChannels()
 		int nChans = events.size();
 		for (int i = 0; i < nChans; i++)
 		{
-			DefaultEventInfo& info = events[i];
+			const DefaultEventInfo& info = events[i];
 			if (info.type != EventChannel::INVALID && info.nChannels > 0 && info.length > 0)
 			{
 				EventChannel* chan = new EventChannel(info.type, info.nChannels, info.length, info.sampleRate, this, sub);
@@ -1263,7 +1263,7 @@ GenericProcessor::DefaultEventInfo::DefaultEventInfo()
 
 uint32 GenericProcessor::getProcessorFullId(uint16 sid, uint16 subid)
 {
-	return uint32(sid) << 16 + subid;
+	return (uint32(sid) << 16) + subid;
 }
 
 int64 GenericProcessor::getLastProcessedsoftwareTime() const