diff --git a/Source/Processors/FileReader/FileReader.cpp b/Source/Processors/FileReader/FileReader.cpp index 33386f1f6f6df5a64ae6ab507a756338f263cfc8..d558bd5ed5f72f6d7a325d22040c9f41600af573 100644 --- a/Source/Processors/FileReader/FileReader.cpp +++ b/Source/Processors/FileReader/FileReader.cpp @@ -72,7 +72,7 @@ float FileReader::getDefaultSampleRate() return 44100.0; } -int FileReader::getDefaultNumOutputs() +int FileReader::getNumHeadstageOutputs() { if (input) return currentNumChannels; @@ -80,10 +80,10 @@ int FileReader::getDefaultNumOutputs() return 16; } -float FileReader::getBitVolts(int chan) +float FileReader::getBitVolts(Channel* chan) { if (input) - return channelInfo[chan].bitVolts; + return chan->bitVolts; else return 0.05f; } @@ -158,13 +158,13 @@ String FileReader::getFile() void FileReader::updateSettings() { - if (!input) return; + // if (!input) return; - for (int i=0; i < currentNumChannels; i++) - { - channels[i]->bitVolts = channelInfo[i].bitVolts; - channels[i]->name = channelInfo[i].name; - } + // for (int i=0; i < currentNumChannels; i++) + // { + // channels[i]->bitVolts = channelInfo[i].bitVolts; + // channels[i]->name = channelInfo[i].name; + // } } diff --git a/Source/Processors/FileReader/FileReader.h b/Source/Processors/FileReader/FileReader.h index 5d77a4e50fc3deb96c1355d368823a5726c60f51..0624b511fac9196c8c9106c45359d24daca49fad 100644 --- a/Source/Processors/FileReader/FileReader.h +++ b/Source/Processors/FileReader/FileReader.h @@ -71,8 +71,8 @@ public: void enabledState(bool t); float getDefaultSampleRate(); - int getDefaultNumOutputs(); - float getBitVolts(int chan); + int getNumHeadstageOutputs(); + float getBitVolts(Channel* chan); bool setFile(String fullpath); String getFile(); diff --git a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h index fd94553d78f70ef6d032419cb0f0348a3af38007..fc6ec7ed72a172ce2a540d7342d684a9d855c2b2 100644 --- a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h +++ b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h @@ -39,8 +39,6 @@ class DataViewport; class SpikePlot; class TrialCircularBuffer; - - class PeriStimulusTimeHistogramNode : public GenericProcessor { public: @@ -61,7 +59,6 @@ public: void syncInternalDataStructuresWithSpikeSorter(); - void allocateTrialCircularBuffer(); void handleEvent(int, MidiMessage&, int);