Skip to content
Snippets Groups Projects
Commit 193791b1 authored by jsiegle's avatar jsiegle
Browse files

Fix issues with FileReader

parent a0cd856e
No related branches found
No related tags found
No related merge requests found
......@@ -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;
// }
}
......
......@@ -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();
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment