Skip to content

Commit 9ad08a5

Browse files
author
open-ephys
authored
Merge pull request #272 from open-ephys/271/optionally-disable-recordthread
Add ability to disable record thread via recording options interface
2 parents e8bc33c + df4ed6c commit 9ad08a5

7 files changed

Lines changed: 324 additions & 220 deletions

File tree

‎Source/CoreServices.cpp‎

Lines changed: 148 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -38,157 +38,157 @@ using namespace AccessClass;
3838

3939
namespace CoreServices
4040
{
41-
void updateSignalChain(GenericEditor* source)
42-
{
43-
getEditorViewport()->makeEditorVisible(source, false, true);
44-
}
45-
46-
bool getRecordingStatus()
47-
{
48-
return getControlPanel()->recordButton->getToggleState();
49-
}
50-
51-
void setRecordingStatus(bool enable)
52-
{
53-
getControlPanel()->setRecordState(enable);
54-
}
55-
56-
bool getAcquisitionStatus()
57-
{
58-
return getControlPanel()->getAcquisitionState();
59-
}
60-
61-
void setAcquisitionStatus(bool enable)
62-
{
63-
getControlPanel()->setAcquisitionState(enable);
64-
}
65-
66-
void sendStatusMessage(const String& text)
67-
{
68-
getBroadcaster()->sendActionMessage(text);
69-
}
70-
71-
void sendStatusMessage(const char* text)
72-
{
73-
getBroadcaster()->sendActionMessage(text);
74-
}
75-
76-
void highlightEditor(GenericEditor* ed)
77-
{
78-
getEditorViewport()->makeEditorVisible(ed);
79-
}
80-
81-
juce::int64 getGlobalTimestamp()
82-
{
83-
return getProcessorGraph()->getGlobalTimestamp(false);
84-
}
85-
86-
juce::int64 getSoftwareTimestamp()
87-
{
88-
return getProcessorGraph()->getGlobalTimestamp(true);
89-
}
90-
91-
float getGlobalSampleRate()
92-
{
93-
return getProcessorGraph()->getGlobalSampleRate(false);
94-
}
95-
96-
float getSoftwareSampleRate()
97-
{
98-
return getProcessorGraph()->getGlobalSampleRate(true);
99-
}
100-
101-
void setRecordingDirectory(String dir)
102-
{
103-
getControlPanel()->setRecordingDirectory(dir);
104-
}
105-
106-
void createNewRecordingDir()
107-
{
108-
getControlPanel()->labelTextChanged(NULL);
109-
}
110-
111-
void setPrependTextToRecordingDir(String text)
112-
{
113-
getControlPanel()->setPrependText(text);
114-
}
115-
116-
void setAppendTextToRecordingDir(String text)
117-
{
118-
getControlPanel()->setAppendText(text);
119-
}
120-
121-
String getSelectedRecordEngineId()
122-
{
123-
return getControlPanel()->getSelectedRecordEngineId();
124-
}
125-
126-
bool setSelectedRecordEngineId(String id)
127-
{
128-
return getControlPanel()->setSelectedRecordEngineId(id);
129-
}
130-
131-
namespace RecordNode
132-
{
133-
void createNewrecordingDir()
134-
{
135-
getProcessorGraph()->getRecordNode()->createNewDirectory();
136-
}
137-
138-
File getRecordingPath()
139-
{
140-
return getProcessorGraph()->getRecordNode()->getDataDirectory();
141-
}
142-
143-
int getRecordingNumber()
144-
{
145-
return getProcessorGraph()->getRecordNode()->getRecordingNumber();
146-
}
147-
148-
int getExperimentNumber()
149-
{
150-
return getProcessorGraph()->getRecordNode()->getExperimentNumber();
151-
}
152-
153-
void writeSpike(const SpikeEvent* spike, const SpikeChannel* chan)
154-
{
155-
getProcessorGraph()->getRecordNode()->writeSpike(spike, chan);
156-
}
157-
158-
void registerSpikeSource(GenericProcessor* processor)
159-
{
160-
getProcessorGraph()->getRecordNode()->registerSpikeSource(processor);
161-
}
162-
163-
int addSpikeElectrode(const SpikeChannel* elec)
164-
{
165-
return getProcessorGraph()->getRecordNode()->addSpikeElectrode(elec);
166-
}
167-
};
168-
169-
const char* getApplicationResource(const char* name, int& size)
170-
{
171-
return BinaryData::getNamedResource(name, size);
172-
}
173-
174-
File getDefaultUserSaveDirectory()
175-
{
41+
void updateSignalChain(GenericEditor* source)
42+
{
43+
getEditorViewport()->makeEditorVisible(source, false, true);
44+
}
45+
46+
bool getRecordingStatus()
47+
{
48+
return getControlPanel()->recordButton->getToggleState();
49+
}
50+
51+
void setRecordingStatus(bool enable)
52+
{
53+
getControlPanel()->setRecordState(enable);
54+
}
55+
56+
bool getAcquisitionStatus()
57+
{
58+
return getControlPanel()->getAcquisitionState();
59+
}
60+
61+
void setAcquisitionStatus(bool enable)
62+
{
63+
getControlPanel()->setAcquisitionState(enable);
64+
}
65+
66+
void sendStatusMessage(const String& text)
67+
{
68+
getBroadcaster()->sendActionMessage(text);
69+
}
70+
71+
void sendStatusMessage(const char* text)
72+
{
73+
getBroadcaster()->sendActionMessage(text);
74+
}
75+
76+
void highlightEditor(GenericEditor* ed)
77+
{
78+
getEditorViewport()->makeEditorVisible(ed);
79+
}
80+
81+
juce::int64 getGlobalTimestamp()
82+
{
83+
return getProcessorGraph()->getGlobalTimestamp(false);
84+
}
85+
86+
juce::int64 getSoftwareTimestamp()
87+
{
88+
return getProcessorGraph()->getGlobalTimestamp(true);
89+
}
90+
91+
float getGlobalSampleRate()
92+
{
93+
return getProcessorGraph()->getGlobalSampleRate(false);
94+
}
95+
96+
float getSoftwareSampleRate()
97+
{
98+
return getProcessorGraph()->getGlobalSampleRate(true);
99+
}
100+
101+
void setRecordingDirectory(String dir)
102+
{
103+
getControlPanel()->setRecordingDirectory(dir);
104+
}
105+
106+
void createNewRecordingDir()
107+
{
108+
getControlPanel()->labelTextChanged(NULL);
109+
}
110+
111+
void setPrependTextToRecordingDir(String text)
112+
{
113+
getControlPanel()->setPrependText(text);
114+
}
115+
116+
void setAppendTextToRecordingDir(String text)
117+
{
118+
getControlPanel()->setAppendText(text);
119+
}
120+
121+
String getSelectedRecordEngineId()
122+
{
123+
return getControlPanel()->getSelectedRecordEngineId();
124+
}
125+
126+
bool setSelectedRecordEngineId(String id)
127+
{
128+
return getControlPanel()->setSelectedRecordEngineId(id);
129+
}
130+
131+
namespace RecordNode
132+
{
133+
void createNewrecordingDir()
134+
{
135+
getProcessorGraph()->getRecordNode()->createNewDirectory();
136+
}
137+
138+
File getRecordingPath()
139+
{
140+
return getProcessorGraph()->getRecordNode()->getDataDirectory();
141+
}
142+
143+
int getRecordingNumber()
144+
{
145+
return getProcessorGraph()->getRecordNode()->getRecordingNumber();
146+
}
147+
148+
int getExperimentNumber()
149+
{
150+
return getProcessorGraph()->getRecordNode()->getExperimentNumber();
151+
}
152+
153+
void writeSpike(const SpikeEvent* spike, const SpikeChannel* chan)
154+
{
155+
getProcessorGraph()->getRecordNode()->writeSpike(spike, chan);
156+
}
157+
158+
void registerSpikeSource(GenericProcessor* processor)
159+
{
160+
getProcessorGraph()->getRecordNode()->registerSpikeSource(processor);
161+
}
162+
163+
int addSpikeElectrode(const SpikeChannel* elec)
164+
{
165+
return getProcessorGraph()->getRecordNode()->addSpikeElectrode(elec);
166+
}
167+
168+
};
169+
170+
const char* getApplicationResource(const char* name, int& size)
171+
{
172+
return BinaryData::getNamedResource(name, size);
173+
}
174+
175+
File getDefaultUserSaveDirectory()
176+
{
176177
#if defined(__APPLE__)
177-
File dir = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("open-ephys");
178-
if (!dir.isDirectory()) {
179-
dir.createDirectory();
180-
}
181-
return std::move(dir);
178+
File dir = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("open-ephys");
179+
if (!dir.isDirectory()) {
180+
dir.createDirectory();
181+
}
182+
return std::move(dir);
182183
#else
183-
return File::getCurrentWorkingDirectory();
184+
return File::getCurrentWorkingDirectory();
184185
#endif
185-
}
186+
}
186187

187-
String getGUIVersion()
188-
{
188+
String getGUIVersion()
189+
{
189190
#define XSTR_DEF(s) #s
190191
#define STR_DEF(s) XSTR_DEF(s)
191-
return STR_DEF(JUCE_APP_VERSION);
192-
}
193-
194-
};
192+
return STR_DEF(JUCE_APP_VERSION);
193+
}
194+
};

‎Source/CoreServices.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ PLUGIN_API int getExperimentNumber();
109109
PLUGIN_API void writeSpike(const SpikeEvent* spike, const SpikeChannel* chan);
110110
PLUGIN_API void registerSpikeSource(GenericProcessor* processor);
111111
PLUGIN_API int addSpikeElectrode(const SpikeChannel* elec);
112+
112113
};
113114

114115
PLUGIN_API const char* getApplicationResource(const char* name, int& size);

0 commit comments

Comments
 (0)