Skip to content

Commit c19e7fc

Browse files
aacuevasaacuevas
committed
Merge remote-tracking branch 'origin/development' into development
2 parents d224b0e + 744e2e8 commit c19e7fc

11 files changed

Lines changed: 64 additions & 11 deletions

File tree

‎Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
HEADER_SEARCH_PATHS = (
175175
"$(inherited)",
176176
"$(MAC_PACKAGE_DIR)/include",
177+
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
177178
);
178179
OTHER_LDFLAGS = (
179180
"$(inherited)",
@@ -191,6 +192,7 @@
191192
HEADER_SEARCH_PATHS = (
192193
"$(inherited)",
193194
"$(MAC_PACKAGE_DIR)/include",
195+
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
194196
);
195197
OTHER_LDFLAGS = (
196198
"$(inherited)",

‎Builds/MacOSX/Plugins/Config/Plugin.xcconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ MAC_PACKAGE_DIR = /opt/local
55
// Pull in machine-specific settings from git-ignored file, if it exists.
66
#include "Env.xcconfig"
77

8+
#include "Base.xcconfig"
9+
810
CONFIGURATION_BUILD_DIR = $(PROJECT_DIR)/../../build/$(CONFIGURATION)/open-ephys.app/Contents/PlugIns
911
COPY_PHASE_STRIP = NO
1012
DEBUG_INFORMATION_FORMAT = dwarf

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,31 @@
197197
isa = XCBuildConfiguration;
198198
baseConfigurationReference = E1F558DB1C9B23830035F88B /* Plugin_Debug.xcconfig */;
199199
buildSettings = {
200+
HEADER_SEARCH_PATHS = (
201+
../../../../JuceLibraryCode,
202+
../../../../JuceLibraryCode/modules,
203+
../../../../Source/Plugins/Headers,
204+
../../../../Source/Plugins/CommonLibs,
205+
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
206+
"$(MAC_PACKAGE_DIR)/include",
207+
"$(inherited)",
208+
);
200209
};
201210
name = Debug;
202211
};
203212
E1F558D51C9B23370035F88B /* Release */ = {
204213
isa = XCBuildConfiguration;
205214
baseConfigurationReference = E1F558DC1C9B23830035F88B /* Plugin_Release.xcconfig */;
206215
buildSettings = {
216+
HEADER_SEARCH_PATHS = (
217+
../../../../JuceLibraryCode,
218+
../../../../JuceLibraryCode/modules,
219+
../../../../Source/Plugins/Headers,
220+
../../../../Source/Plugins/CommonLibs,
221+
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
222+
"$(MAC_PACKAGE_DIR)/include",
223+
"$(inherited)",
224+
);
207225
};
208226
name = Release;
209227
};

‎Source/Processors/Channel/InfoObjects.cpp‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ NodeInfoBase::NodeInfoBase(uint16 id) :
3434
m_nodeID(id)
3535
{}
3636

37+
NodeInfoBase::~NodeInfoBase()
38+
{}
39+
3740
unsigned int NodeInfoBase::getCurrentNodeID() const
3841
{
3942
return m_nodeID;
@@ -50,6 +53,9 @@ String NodeInfoBase::getCurrentNodeName() const
5053
}
5154

5255
//History Object
56+
HistoryObject::~HistoryObject()
57+
{}
58+
5359
String HistoryObject::getHistoricString()
5460
{
5561
return m_historicString;
@@ -73,6 +79,9 @@ SourceProcessorInfo::SourceProcessorInfo(const GenericProcessor* source, uint16
7379
{
7480
}
7581

82+
SourceProcessorInfo::~SourceProcessorInfo()
83+
{}
84+
7685
uint16 SourceProcessorInfo::getSourceNodeID() const
7786
{
7887
return m_sourceNodeID;
@@ -99,6 +108,9 @@ uint16 SourceProcessorInfo::getSourceSubprocessorCount() const
99108
}
100109

101110
//NamedInfoObject
111+
NamedInfoObject::~NamedInfoObject()
112+
{}
113+
102114
void NamedInfoObject::setName(String name)
103115
{
104116
m_name = name;
@@ -139,6 +151,9 @@ InfoObjectCommon::InfoObjectCommon(uint16 idx, uint16 typeidx, float sampleRate,
139151
{
140152
}
141153

154+
InfoObjectCommon::~InfoObjectCommon()
155+
{}
156+
142157
float InfoObjectCommon::getSampleRate() const
143158
{
144159
return m_sampleRate;
@@ -542,6 +557,9 @@ ConfigurationObject::ConfigurationObject(String identifier, GenericProcessor* so
542557
setIdentifier(identifier);
543558
}
544559

560+
ConfigurationObject::~ConfigurationObject()
561+
{}
562+
545563
void ConfigurationObject::setShouldBeRecorded(bool status)
546564
{
547565
m_shouldBeRecorded = status;

‎Source/Processors/Channel/InfoObjects.h‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class PLUGIN_API NodeInfoBase
4747
//This field should never be changed by anything except GenericProcessor base code
4848
friend class GenericProcessor;
4949
public:
50+
virtual ~NodeInfoBase();
5051
/** Gets the ID of the processor which currently owns this copy of the info object */
5152
unsigned int getCurrentNodeID() const;
5253
/** Gets the type of the processor which currently owns this copy of the info object */
@@ -68,6 +69,7 @@ class PLUGIN_API HistoryObject
6869
HistoryObject();
6970

7071
public:
72+
virtual ~HistoryObject();
7173
/** Returns the historic string */
7274
String getHistoricString();
7375
/** Adds a new entry in the historic string*/
@@ -83,6 +85,7 @@ class PLUGIN_API SourceProcessorInfo
8385
SourceProcessorInfo(const GenericProcessor* source, uint16 subproc = 0);
8486

8587
public:
88+
virtual ~SourceProcessorInfo();
8689
/** Gets the ID of the processor which created the channel object */
8790
uint16 getSourceNodeID() const;
8891

@@ -111,6 +114,7 @@ class PLUGIN_API SourceProcessorInfo
111114
class PLUGIN_API NamedInfoObject
112115
{
113116
public:
117+
virtual ~NamedInfoObject();
114118
/** Sets the object's name*/
115119
void setName(String name);
116120

@@ -145,6 +149,7 @@ class PLUGIN_API InfoObjectCommon :
145149
InfoObjectCommon(uint16 idx, uint16 typeidx, float sampleRate, const GenericProcessor* source, uint16 subproc = 0);
146150

147151
public:
152+
virtual ~InfoObjectCommon();
148153
enum InfoObjectType
149154
{
150155
DATA_CHANNEL,
@@ -201,7 +206,7 @@ class PLUGIN_API DataChannel
201206
/** Copy constructor. */
202207
DataChannel(const DataChannel& ch);
203208

204-
~DataChannel();
209+
virtual ~DataChannel();
205210

206211
//--------- DATA GET / SET METHODS --------//
207212

@@ -303,7 +308,7 @@ class PLUGIN_API EventChannel :
303308
*/
304309
EventChannel(EventChannelTypes type, unsigned int numChannels, unsigned int dataLength, float sampleRate, GenericProcessor* source, uint16 subproc = 0);
305310

306-
~EventChannel();
311+
virtual ~EventChannel();
307312

308313
EventChannelTypes getChannelType() const;
309314

@@ -368,7 +373,7 @@ class PLUGIN_API SpikeChannel :
368373
*/
369374
SpikeChannel(ElectrodeTypes type, GenericProcessor* source, const Array<const DataChannel*>& sourceChannels, uint16 subproc = 0);
370375

371-
~SpikeChannel();
376+
virtual ~SpikeChannel();
372377

373378
ElectrodeTypes getChannelType() const;
374379

@@ -431,6 +436,7 @@ class PLUGIN_API ConfigurationObject :
431436
@param subproc Optional. The source subprocessor index
432437
*/
433438
ConfigurationObject(String identifier, GenericProcessor* source, uint16 subproc = 0);
439+
virtual ~ConfigurationObject();
434440

435441
/** Sets if the configuration should be recorded or not.
436442
Similar to the events, this does not prevent the configuration data to be recorded, but rather states

‎Source/Processors/Channel/MetaData.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bool checkMetaDataType(MetaDataDescriptor::MetaDataTypes baseType)
4646
//MetaDataDescriptor
4747

4848
MetaDataDescriptor::MetaDataDescriptor(MetaDataDescriptor::MetaDataTypes t, unsigned int length, String n, String d, String id)
49-
: m_name(n), m_description(d), m_identifier(id), m_type(t), m_length(length)
49+
: m_name(n), m_identifier(id), m_description(d), m_type(t), m_length(length)
5050
{}
5151

5252
MetaDataDescriptor::~MetaDataDescriptor() {};
@@ -277,6 +277,8 @@ void MetaDataValue::setValue(const void* data)
277277

278278
MetaDataInfoObject::MetaDataInfoObject() {}
279279

280+
MetaDataInfoObject::~MetaDataInfoObject() {}
281+
280282
void MetaDataInfoObject::addMetaData(MetaDataDescriptor* desc, MetaDataValue* val)
281283
{
282284
if (desc->getType() != val->getDataType() || desc->getLength() != val->getDataLength())
@@ -335,6 +337,8 @@ int MetaDataInfoObject::findMetaData(MetaDataDescriptor::MetaDataTypes type, uns
335337

336338
MetaDataEventObject::MetaDataEventObject() {}
337339

340+
MetaDataEventObject::~MetaDataEventObject() {}
341+
338342
void MetaDataEventObject::addEventMetaData(MetaDataDescriptor* desc)
339343
{
340344
if (eventMetaDataLock)
@@ -400,6 +404,8 @@ size_t MetaDataEventObject::getMaxEventMetaDataSize() const
400404
//MetaDataEvent
401405
MetaDataEvent::MetaDataEvent() {}
402406

407+
MetaDataEvent::~MetaDataEvent() {}
408+
403409
int MetaDataEvent::getMetadataValueCount() const
404410
{
405411
return m_metaDataValues.size();

‎Source/Processors/Channel/MetaData.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ class PLUGIN_API MetaDataInfoObject
177177
protected:
178178
MetaDataInfoObject();
179179
public:
180+
virtual ~MetaDataInfoObject();
180181
void addMetaData(MetaDataDescriptor* desc, MetaDataValue* val);
181182
void addMetaData(const MetaDataDescriptor& desc, const MetaDataValue& val);
182183
const MetaDataDescriptor* getMetaDataDescriptor(int index) const;
@@ -204,6 +205,7 @@ class PLUGIN_API MetaDataEventLock
204205
class PLUGIN_API MetaDataEventObject : public MetaDataEventLock
205206
{
206207
public:
208+
virtual ~MetaDataEventObject();
207209
//This method will only work when creating the info object, but not for those copied down the chain
208210
void addEventMetaData(MetaDataDescriptor* desc);
209211
void addEventMetaData(const MetaDataDescriptor& desc);
@@ -224,6 +226,7 @@ class PLUGIN_API MetaDataEventObject : public MetaDataEventLock
224226
class PLUGIN_API MetaDataEvent
225227
{
226228
public:
229+
virtual ~MetaDataEvent();
227230
int getMetadataValueCount() const;
228231
const MetaDataValue* getMetaDataValue(int index) const;
229232
protected:

‎Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,7 @@ int RHD2000Thread::getNumDataOutputs(DataChannel::DataChannelTypes type, int sub
927927
return 0;
928928
}
929929
}
930+
return 0;
930931
}
931932

932933
String RHD2000Thread::getChannelUnits(int chanIndex) const

‎Source/Processors/FileReader/FileReader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,14 @@ void FileReader::process (AudioSampleBuffer& buffer)
245245
{
246246
samplesToRead = stopSample - currentSample;
247247
if (samplesToRead > 0)
248-
input->readData (readBuffer + samplesRead, samplesToRead);
248+
input->readData (readBuffer + samplesRead * currentNumChannels, samplesToRead);
249249

250250
input->seekTo (startSample);
251251
currentSample = startSample;
252252
}
253253
else
254254
{
255-
input->readData (readBuffer + samplesRead, samplesToRead);
255+
input->readData (readBuffer + samplesRead * currentNumChannels, samplesToRead);
256256

257257
currentSample += samplesToRead;
258258
}

0 commit comments

Comments
 (0)