From 26a613ec9b99ee221d548493340e423a477ca88d Mon Sep 17 00:00:00 2001
From: jsiegle <joshs@alleninstitute.org>
Date: Thu, 30 Oct 2014 17:40:59 -0700
Subject: [PATCH] Update 'getNumSamples()' method in SpikeDetector
---
Source/Processors/FileReader/FileReader.cpp | 2 +-
Source/Processors/SpikeDetector/SpikeDetector.cpp | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Source/Processors/FileReader/FileReader.cpp b/Source/Processors/FileReader/FileReader.cpp
index 97d02aada..be5d56326 100644
--- a/Source/Processors/FileReader/FileReader.cpp
+++ b/Source/Processors/FileReader/FileReader.cpp
@@ -168,7 +168,7 @@ void FileReader::process(AudioSampleBuffer& buffer, MidiBuffer& events)
int16 sample = readBuffer[n];
- *buffer.getWritePointer(chan++, samp) = -sample * getDefaultBitVolts();
+ *buffer.getWritePointer(chan++, samp) = -sample * 0.05f;
}
diff --git a/Source/Processors/SpikeDetector/SpikeDetector.cpp b/Source/Processors/SpikeDetector/SpikeDetector.cpp
index f602b5159..e4424bdaf 100755
--- a/Source/Processors/SpikeDetector/SpikeDetector.cpp
+++ b/Source/Processors/SpikeDetector/SpikeDetector.cpp
@@ -461,8 +461,9 @@ void SpikeDetector::process(AudioSampleBuffer& buffer,
// increment at start of getNextSample()
// cycle through samples
- while (samplesAvailable(getNumSamples(electrode->sourceNodeId)))
+ while (samplesAvailable(getNumSamples(*electrode->channels)))
{
+
sampleIndex++;
// cycle through channels
for (int chan = 0; chan < electrode->numChannels; chan++)
@@ -552,7 +553,7 @@ void SpikeDetector::process(AudioSampleBuffer& buffer,
} // end cycle through samples
- electrode->lastBufferIndex = sampleIndex - getNumSamples(electrode->sourceNodeId); // should be negative
+ electrode->lastBufferIndex = sampleIndex - getNumSamples(*electrode->channels); // should be negative
//jassert(electrode->lastBufferIndex < 0);
--
GitLab