Permalink
Browse files

Added event-controlled recording processor

  • Loading branch information...
1 parent 77a5726 commit 9bb5923a96757a4242ef88c3c6d94f3099571c32 unknown committed Nov 20, 2012
View
@@ -8,6 +8,11 @@
Builds/Linux/build/open-ephys
Resources/Fonts/font_serializer/Builds/Linux/build/
JuceLibraryCode/jucer/Builds/Linux/build
+JuceLibraryCode/jucer/Builds/VisualStudio2010/Debug
+JuceLibraryCode/jucer/Builds/VisualStudio2010/Release
+JuceLibraryCode/jucer/Builds/VisualStudio2010/*.user
+JuceLibraryCode/jucer/Builds/VisualStudio2010/The Jucer.sdf
+JuceLibraryCode/jucer/Builds/VisualStudio2010/The Jucer.v11.suo
# 3. extra files
Builds/Linux/build/data
@@ -22,6 +27,7 @@ Builds/VisualStudio2012/Debug
Builds/VisualStudio2012/Release
Builds/VisualStudio2012/ipch
Builds/VisualStudio2012/open-ephys.sdf
+Builds/VisualStudio2012/open-ephys.opensdf
Builds/VisualStudio2012/open-ephys.suo
Builds/VisualStudio2012/open-ephys.v11.suo
Builds/VisualStudio2012/open-ephys.vcxproj.user
View
@@ -75,6 +75,7 @@ OBJECTS := \
$(OBJDIR)/SpikeDisplayNode_9c52e4ad.o \
$(OBJDIR)/WiFiOutput_fa464ec5.o \
$(OBJDIR)/LfpDisplayNode_30ef22fd.o \
+ $(OBJDIR)/RecordControl_3e1c6062.o \
$(OBJDIR)/Merger_2f90542e.o \
$(OBJDIR)/Splitter_6e27a57b.o \
$(OBJDIR)/SpikePlot_c1cf98bd.o \
@@ -91,6 +92,7 @@ OBJECTS := \
$(OBJDIR)/SpikeDetector_300d85e7.o \
$(OBJDIR)/AudioNode_94606ff3.o \
$(OBJDIR)/EventNode_95c842b7.o \
+ $(OBJDIR)/RecordControlEditor_244084cb.o \
$(OBJDIR)/ResamplingNodeEditor_f2d6f061.o \
$(OBJDIR)/FPGAOutputEditor_cfe00f8a.o \
$(OBJDIR)/ArduinoOutputEditor_1118f008.o \
@@ -317,6 +319,11 @@ $(OBJDIR)/LfpDisplayNode_30ef22fd.o: ../../Source/Processors/LfpDisplayNode.cpp
@echo "Compiling LfpDisplayNode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/RecordControl_3e1c6062.o: ../../Source/Processors/Utilities/RecordControl.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling RecordControl.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/Merger_2f90542e.o: ../../Source/Processors/Utilities/Merger.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling Merger.cpp"
@@ -397,6 +404,11 @@ $(OBJDIR)/EventNode_95c842b7.o: ../../Source/Processors/EventNode.cpp
@echo "Compiling EventNode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/RecordControlEditor_244084cb.o: ../../Source/Processors/Editors/RecordControlEditor.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling RecordControlEditor.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/ResamplingNodeEditor_f2d6f061.o: ../../Source/Processors/Editors/ResamplingNodeEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ResamplingNodeEditor.cpp"
@@ -49,6 +49,7 @@
1F67A9ACD509FB4DC5A633DF = { isa = PBXBuildFile; fileRef = 4AEDD076CCA918481C6F9CF2; };
B992DDBFF8928A985EEE1557 = { isa = PBXBuildFile; fileRef = 268005410FB62BCB9099A762; };
F1268EC5E783EC8ECEBCA5D3 = { isa = PBXBuildFile; fileRef = 5935F823A2EE45AC36A0201F; };
+ EAE9186154287129292E7982 = { isa = PBXBuildFile; fileRef = 9EE49894F14895CEA36FD0F4; };
4A00153E1E69A74BC6B7D8A6 = { isa = PBXBuildFile; fileRef = 3973173C7FA07073B4F86B29; };
5F13B8FFB1584BFF6C05AD39 = { isa = PBXBuildFile; fileRef = 9A47B52E5E1CD17DC9C72B53; };
3D3A992E10308BA189CECE05 = { isa = PBXBuildFile; fileRef = C96A8F49EA22919F09486B96; };
@@ -65,6 +66,7 @@
4BE0DDA01B73223EF0BD934A = { isa = PBXBuildFile; fileRef = 3DD0741FCFBC7563EC722D9B; };
08B501E0D7764C6B613AF529 = { isa = PBXBuildFile; fileRef = B7750B27E4F3748ECCCCF69D; };
9CBA3837CC8CAA03A03F2D9C = { isa = PBXBuildFile; fileRef = FA57CE4F63FF1592D6B3F9B5; };
+ AAC4D8DB08B2A05A576A5F17 = { isa = PBXBuildFile; fileRef = AF4469EAC57A21DD7241C9A4; };
6F41ED502815AAF2F2EAB8B7 = { isa = PBXBuildFile; fileRef = EE3AAE8BD520868168064D38; };
9C77BFFE7BA865E20121E707 = { isa = PBXBuildFile; fileRef = 7738196148E539781B237854; };
BA64AA28A3E0DC10AB0A9380 = { isa = PBXBuildFile; fileRef = DAFD5D2E1F875321584C7147; };
@@ -256,6 +258,8 @@
32959675287F77DD9B7FA96B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WiFiOutput.h; path = ../../Source/Processors/WiFiOutput.h; sourceTree = SOURCE_ROOT; };
5935F823A2EE45AC36A0201F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LfpDisplayNode.cpp; path = ../../Source/Processors/LfpDisplayNode.cpp; sourceTree = SOURCE_ROOT; };
B00F207EBEED525FB686AD98 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LfpDisplayNode.h; path = ../../Source/Processors/LfpDisplayNode.h; sourceTree = SOURCE_ROOT; };
+ 9EE49894F14895CEA36FD0F4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RecordControl.cpp; path = ../../Source/Processors/Utilities/RecordControl.cpp; sourceTree = SOURCE_ROOT; };
+ 0998E3F08E61271CE0FA930C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RecordControl.h; path = ../../Source/Processors/Utilities/RecordControl.h; sourceTree = SOURCE_ROOT; };
3973173C7FA07073B4F86B29 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Merger.cpp; path = ../../Source/Processors/Utilities/Merger.cpp; sourceTree = SOURCE_ROOT; };
7977CAB4A151C41F4140FE1A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Merger.h; path = ../../Source/Processors/Utilities/Merger.h; sourceTree = SOURCE_ROOT; };
9A47B52E5E1CD17DC9C72B53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Splitter.cpp; path = ../../Source/Processors/Utilities/Splitter.cpp; sourceTree = SOURCE_ROOT; };
@@ -290,6 +294,8 @@
12866D44BE115E8837468F48 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioNode.h; path = ../../Source/Processors/AudioNode.h; sourceTree = SOURCE_ROOT; };
FA57CE4F63FF1592D6B3F9B5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EventNode.cpp; path = ../../Source/Processors/EventNode.cpp; sourceTree = SOURCE_ROOT; };
32163C956C8A6F5C1DD7FE7F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EventNode.h; path = ../../Source/Processors/EventNode.h; sourceTree = SOURCE_ROOT; };
+ AF4469EAC57A21DD7241C9A4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RecordControlEditor.cpp; path = ../../Source/Processors/Editors/RecordControlEditor.cpp; sourceTree = SOURCE_ROOT; };
+ 61CA6A2E58E2025508D42FCF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RecordControlEditor.h; path = ../../Source/Processors/Editors/RecordControlEditor.h; sourceTree = SOURCE_ROOT; };
EE3AAE8BD520868168064D38 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ResamplingNodeEditor.cpp; path = ../../Source/Processors/Editors/ResamplingNodeEditor.cpp; sourceTree = SOURCE_ROOT; };
E177F2FF11601F6E11498390 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ResamplingNodeEditor.h; path = ../../Source/Processors/Editors/ResamplingNodeEditor.h; sourceTree = SOURCE_ROOT; };
7738196148E539781B237854 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FPGAOutputEditor.cpp; path = ../../Source/Processors/Editors/FPGAOutputEditor.cpp; sourceTree = SOURCE_ROOT; };
@@ -508,6 +514,8 @@
3022191E4C192BC10670B935,
AED49EC9B45C93F39002B4B9 ); name = Serial; sourceTree = "<group>"; };
20FFF487B65BF8567EFE70F8 = { isa = PBXGroup; children = (
+ 9EE49894F14895CEA36FD0F4,
+ 0998E3F08E61271CE0FA930C,
3973173C7FA07073B4F86B29,
7977CAB4A151C41F4140FE1A,
9A47B52E5E1CD17DC9C72B53,
@@ -540,6 +548,8 @@
0C5335B0E57C9DC92FC57E5F,
7738F51AE0EC63D76EE0F761 ); name = Visualization; sourceTree = "<group>"; };
953CC35B9116404D6AA8D1C7 = { isa = PBXGroup; children = (
+ AF4469EAC57A21DD7241C9A4,
+ 61CA6A2E58E2025508D42FCF,
EE3AAE8BD520868168064D38,
E177F2FF11601F6E11498390,
7738196148E539781B237854,
@@ -808,6 +818,7 @@
1F67A9ACD509FB4DC5A633DF,
B992DDBFF8928A985EEE1557,
F1268EC5E783EC8ECEBCA5D3,
+ EAE9186154287129292E7982,
4A00153E1E69A74BC6B7D8A6,
5F13B8FFB1584BFF6C05AD39,
3D3A992E10308BA189CECE05,
@@ -824,6 +835,7 @@
4BE0DDA01B73223EF0BD934A,
08B501E0D7764C6B613AF529,
9CBA3837CC8CAA03A03F2D9C,
+ AAC4D8DB08B2A05A576A5F17,
6F41ED502815AAF2F2EAB8B7,
9C77BFFE7BA865E20121E707,
BA64AA28A3E0DC10AB0A9380,
@@ -154,6 +154,7 @@
<ClCompile Include="..\..\Source\Processors\SpikeDisplayNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\WiFiOutput.cpp"/>
<ClCompile Include="..\..\Source\Processors\LfpDisplayNode.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp"/>
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp"/>
<ClCompile Include="..\..\Source\Processors\Utilities\Splitter.cpp"/>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.cpp"/>
@@ -170,6 +171,7 @@
<ClCompile Include="..\..\Source\Processors\SpikeDetector.cpp"/>
<ClCompile Include="..\..\Source\Processors\AudioNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\EventNode.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\FPGAOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.cpp"/>
@@ -261,6 +263,7 @@
<ClInclude Include="..\..\Source\Processors\SpikeDisplayNode.h"/>
<ClInclude Include="..\..\Source\Processors\WiFiOutput.h"/>
<ClInclude Include="..\..\Source\Processors\LfpDisplayNode.h"/>
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h"/>
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h"/>
<ClInclude Include="..\..\Source\Processors\Utilities\Splitter.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.h"/>
@@ -279,6 +282,7 @@
<ClInclude Include="..\..\Source\Processors\SpikeDetector.h"/>
<ClInclude Include="..\..\Source\Processors\AudioNode.h"/>
<ClInclude Include="..\..\Source\Processors\EventNode.h"/>
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\FPGAOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.h"/>
@@ -331,6 +331,9 @@
<ClCompile Include="..\..\Source\Processors\LfpDisplayNode.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClCompile>
@@ -379,6 +382,9 @@
<ClCompile Include="..\..\Source\Processors\EventNode.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
@@ -648,6 +654,9 @@
<ClInclude Include="..\..\Source\Processors\LfpDisplayNode.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClInclude>
@@ -702,6 +711,9 @@
<ClInclude Include="..\..\Source\Processors\EventNode.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
@@ -161,12 +161,18 @@
<ClCompile Include="..\..\Source\Dsp\State.cpp" />
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp" />
<ClCompile Include="..\..\Source\Processors\ArduinoOutput.cpp" />
+ <ClCompile Include="..\..\Source\Processors\AudioResamplingNode.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Channel.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp" />
<ClCompile Include="..\..\Source\Processors\EventDetector.cpp" />
<ClCompile Include="..\..\Source\Processors\FPGAOutput.cpp" />
<ClCompile Include="..\..\Source\Processors\Parameter.cpp" />
+ <ClCompile Include="..\..\Source\Processors\PhaseDetector.cpp" />
<ClCompile Include="..\..\Source\Processors\Serial\ofArduino.cpp" />
<ClCompile Include="..\..\Source\Processors\Serial\ofSerial.cpp" />
<ClCompile Include="..\..\Source\Processors\SpikeDisplayNode.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp" />
<ClCompile Include="..\..\Source\Processors\WiFiOutput.cpp" />
<ClCompile Include="..\..\Source\Processors\LfpDisplayNode.cpp" />
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp" />
@@ -263,13 +269,19 @@
<ClInclude Include="..\..\Source\Dsp\Utilities.h" />
<ClInclude Include="..\..\Source\Audio\AudioComponent.h" />
<ClInclude Include="..\..\Source\Processors\ArduinoOutput.h" />
+ <ClInclude Include="..\..\Source\Processors\AudioResamplingNode.h" />
+ <ClInclude Include="..\..\Source\Processors\Channel.h" />
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h" />
+ <ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h" />
<ClInclude Include="..\..\Source\Processors\EventDetector.h" />
<ClInclude Include="..\..\Source\Processors\FPGAOutput.h" />
<ClInclude Include="..\..\Source\Processors\Parameter.h" />
+ <ClInclude Include="..\..\Source\Processors\PhaseDetector.h" />
<ClInclude Include="..\..\Source\Processors\Serial\ofArduino.h" />
<ClInclude Include="..\..\Source\Processors\Serial\ofConstants.h" />
<ClInclude Include="..\..\Source\Processors\Serial\ofSerial.h" />
<ClInclude Include="..\..\Source\Processors\SpikeDisplayNode.h" />
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h" />
<ClInclude Include="..\..\Source\Processors\WiFiOutput.h" />
<ClInclude Include="..\..\Source\Processors\LfpDisplayNode.h" />
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h" />
@@ -345,6 +345,24 @@
<ClCompile Include="..\..\Source\Processors\FPGAOutput.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Channel.cpp">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\AudioResamplingNode.cpp">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\PhaseDetector.cpp">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Source\AccessClass.h">
@@ -647,5 +665,23 @@
<ClInclude Include="..\..\Source\Processors\FPGAOutput.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Channel.h">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\AudioResamplingNode.h">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\PhaseDetector.h">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
Oops, something went wrong.

0 comments on commit 9bb5923

Please sign in to comment.