Skip to content
Snippets Groups Projects
Commit 8e62aebb authored by Josh Siegle's avatar Josh Siegle
Browse files

Attempting to solve Spike Viewer issues on OS X

parent 42fb9df8
No related branches found
No related tags found
No related merge requests found
......@@ -157,7 +157,7 @@ void AudioComponent::beginCallbacks()
restartDevice();
const MessageManagerLock mmLock; // add a lock to prevent crashes
//const MessageManagerLock mmLock; // add a lock to prevent crashes
std::cout << std::endl << "Adding audio callback." << std::endl;
deviceManager.addAudioCallback(graphPlayer);
......@@ -167,6 +167,8 @@ void AudioComponent::beginCallbacks()
void AudioComponent::endCallbacks()
{
// const MessageManagerLock mmLock; // add a lock to prevent crashes
std::cout << std::endl << "Removing audio callback." << std::endl;
deviceManager.removeAudioCallback(graphPlayer);
......
......@@ -710,28 +710,28 @@ void ProcessorGraph::setRecordState(bool isRecording)
// inform other processors that recording will begin
// for (int i = 0; i < getNumNodes(); i++)
// {
// Node* node = getNode(i);
// if (node->nodeId != OUTPUT_NODE_ID)
// {
// GenericProcessor* p = (GenericProcessor*) node->getProcessor();
//
// if (isRecording)
// p->startRecording();
// else
// p->stopRecording();
//
// }
// }
//
// // actually start recording
// if (isRecording)
// {
// getRecordNode()->setParameter(1,10.0f);
// } else {
// getRecordNode()->setParameter(0,10.0f);
// }
for (int i = 0; i < getNumNodes(); i++)
{
Node* node = getNode(i);
if (node->nodeId != OUTPUT_NODE_ID)
{
GenericProcessor* p = (GenericProcessor*) node->getProcessor();
if (isRecording)
p->startRecording();
else
p->stopRecording();
}
}
// actually start recording
if (isRecording)
{
getRecordNode()->setParameter(1,10.0f);
} else {
getRecordNode()->setParameter(0,10.0f);
}
}
......
......@@ -63,7 +63,7 @@ AudioProcessorEditor* SpikeDisplayNode::createEditor()
bool SpikeDisplayNode::enable()
{
std::cout<<"SpikeDisplayNode::enable()"<<std::endl;
std::cout << "SpikeDisplayNode::enable()" << std::endl;
SpikeDisplayEditor* editor = (SpikeDisplayEditor*) getEditor();
editor->enable();
return true;
......@@ -72,7 +72,7 @@ bool SpikeDisplayNode::enable()
bool SpikeDisplayNode::disable()
{
std::cout<<"SpikeDisplayNode disabled!"<<std::endl;
std::cout << "SpikeDisplayNode disabled!" << std::endl;
SpikeDisplayEditor* editor = (SpikeDisplayEditor*) getEditor();
editor->disable();
return true;
......@@ -174,7 +174,7 @@ void SpikeDisplayNode::handleEvent(int eventType, MidiMessage& event, int sample
if (eventType == SPIKE)
{
const MessageManagerLock mmLock; // get the lock to prevent the midi buffer from being read
// const MessageManagerLock mmLock; // get the lock to prevent the midi buffer from being read
eventBuffer->addEvent(event, 0);
}
......
......@@ -137,7 +137,7 @@ RecordNode* SpikeDisplayCanvas::getRecordNode()
void SpikeDisplayCanvas::processSpikeEvents()
{
const MessageManagerLock mmLock; // get the lock to prevent the midi buffer from being updated
//const MessageManagerLock mmLock; // get the lock to prevent the midi buffer from being updated
if (spikeBuffer->getNumEvents() > 0)
{
......@@ -505,29 +505,33 @@ void SpikePlot::processSpikeObject(const SpikeObject& s)
if (aboveThreshold && isRecording)
{
// write spike to disk
// writeSpike(s);
writeSpike(s);
}
}
void SpikePlot::startRecording()
{
//openFile();
openFile();
isRecording = true;
}
void SpikePlot::stopRecording()
{
// closeFile();
closeFile();
isRecording = false;
}
void SpikePlot::openFile()
{
//const MessageManagerLock mmLock;
dataDirectory = File("/Users/Josh/Programming/open-ephys/GUI/Builds/MacOSX/build/Debug");//recordNode->getDataDirectory();
dataDirectory = recordNode->getDataDirectory();//File("/Users/Josh/Programming/open-ephys/GUI/Builds/MacOSX/build/Debug"); //recordNode->getDataDirectory();
filename = dataDirectory.getFullPathName();
filename += File::separator;
......
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