diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile
index 29944655cc3a1871e3a0489ec27292d26a78258c..0c41f11987eda749001eae573150c6662bf0f3ea 100644
--- a/Builds/Linux/Makefile
+++ b/Builds/Linux/Makefile
@@ -18,7 +18,7 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif
- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "ZEROMQ" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.4" -D "JUCE_APP_VERSION_HEX=0x304" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
+ CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "ZEROMQ" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.4" -D "JUCE_APP_VERSION_HEX=0x304" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -export-dynamic -g -pg -std=c++0x
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -lhdf5 -lhdf5_cpp -lzmq
@@ -39,7 +39,7 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif
- CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "ZEROMQ" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.4" -D "JUCE_APP_VERSION_HEX=0x304" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
+ CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "ZEROMQ" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.4" -D "JUCE_APP_VERSION_HEX=0x304" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -export-dynamic -g -pg -std=c++0x
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -lhdf5 -lhdf5_cpp -lzmq
@@ -54,6 +54,7 @@ OBJECTS := \
$(OBJDIR)/AccessClass_de9602d5.o \
$(OBJDIR)/PracticalSocket_2574ecc8.o \
$(OBJDIR)/AudioComponent_521bd9c9.o \
+ $(OBJDIR)/CAR_9a7e50f4.o \
$(OBJDIR)/ArduinoOutput_d5a968de.o \
$(OBJDIR)/ArduinoOutputEditor_e1b7e52b.o \
$(OBJDIR)/AudioEditor_3931be27.o \
@@ -218,6 +219,11 @@ $(OBJDIR)/AudioComponent_521bd9c9.o: ../../Source/Audio/AudioComponent.cpp
@echo "Compiling AudioComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/CAR_9a7e50f4.o: ../../Source/Processors/CAR/CAR.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling CAR.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/ArduinoOutput_d5a968de.o: ../../Source/Processors/ArduinoOutput/ArduinoOutput.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ArduinoOutput.cpp"
diff --git a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
index 67ceb869433dc3be1e29c8c791c48fcd5c619ed2..3eebaaef63a517a0b4d04d1f05a9e2be625a7465 100644
--- a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
+++ b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
@@ -24,6 +24,7 @@
14BDAEA656AAFA60334CC55C = {isa = PBXBuildFile; fileRef = 420B0E95F1300ABFDC125DBF; };
C853FCE2F6C91B3643322CF0 = {isa = PBXBuildFile; fileRef = 9F577889CB6C54A2F7B1CA80; };
0AE243437B40602D35435C32 = {isa = PBXBuildFile; fileRef = B04D87ED6AA4897B6CD3CCF6; };
+ 2BBDCC829E8525DF770E7E6A = {isa = PBXBuildFile; fileRef = C8EC33D17178B382027313A7; };
55227B30828797A8DCB0B91D = {isa = PBXBuildFile; fileRef = 95A64508FF3D0140D3001A19; };
527EB48A4A9C2F4FF1BC4FB2 = {isa = PBXBuildFile; fileRef = E850C14F13F9855CE1E14C1A; };
8352817FEDC7542D3E65B49A = {isa = PBXBuildFile; fileRef = DA4EAC64A750D0C3DEE83C5D; };
@@ -924,6 +925,7 @@
A7875D5F8D2A632C99791002 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComboBox.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/widgets/juce_ComboBox.h"; sourceTree = "SOURCE_ROOT"; };
A7BF9312D81FF5DCEAB8AC47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SourceNode.h; path = ../../Source/Processors/SourceNode/SourceNode.h; sourceTree = "SOURCE_ROOT"; };
A7FE538FF09AC8A58DE8F1BD = {isa = PBXFileReference; lastKnownFileType = image.png; name = "RadioButtons_selected-02.png"; path = "../../Resources/Images/Icons/RadioButtons_selected-02.png"; sourceTree = "SOURCE_ROOT"; };
+ A81E114BF75E0CEF0C7D1318 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAR.h; path = ../../Source/Processors/CAR/CAR.h; sourceTree = "SOURCE_ROOT"; };
A8B4D80D55E48F50809DC5E4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_Windowing.mm"; path = "../../JuceLibraryCode/modules/juce_gui_basics/native/juce_ios_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
A8FCE8FB1D47A14A8C65C35E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AnimatedPosition.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_AnimatedPosition.h"; sourceTree = "SOURCE_ROOT"; };
A93F302B8D91A997F54D231B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MarkerList.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/positioning/juce_MarkerList.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1098,6 +1100,7 @@
C7D36423459E79F3F462A421 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EcubeEditor.h; path = ../../Source/Processors/DataThreads/EcubeEditor.h; sourceTree = "SOURCE_ROOT"; };
C844D1792A91BE2D8808CB14 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MessageManager.h"; path = "../../JuceLibraryCode/modules/juce_events/messages/juce_MessageManager.h"; sourceTree = "SOURCE_ROOT"; };
C868329EBC1BBA606AB2EB88 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+ C8EC33D17178B382027313A7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CAR.cpp; path = ../../Source/Processors/CAR/CAR.cpp; sourceTree = "SOURCE_ROOT"; };
C916444FD4BFB79D4DE9FCAF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AttributedString.cpp"; path = "../../JuceLibraryCode/modules/juce_graphics/fonts/juce_AttributedString.cpp"; sourceTree = "SOURCE_ROOT"; };
C98D4FF283E598244E89CD83 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextDiff.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_TextDiff.h"; sourceTree = "SOURCE_ROOT"; };
CA09B0483969444C7CD106DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Fonts.mm"; path = "../../JuceLibraryCode/modules/juce_graphics/native/juce_mac_Fonts.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -1244,6 +1247,7 @@
E835BEB3C42E4B241804BE13 = {isa = PBXFileReference; lastKnownFileType = file; name = "cpmono-light-serialized"; path = "../../Resources/Fonts/cpmono-light-serialized"; sourceTree = "SOURCE_ROOT"; };
E849E3966302E7D4D06712F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RecordControl.cpp; path = ../../Source/Processors/RecordControl/RecordControl.cpp; sourceTree = "SOURCE_ROOT"; };
E850C14F13F9855CE1E14C1A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ArduinoOutputEditor.cpp; path = ../../Source/Processors/ArduinoOutput/ArduinoOutputEditor.cpp; sourceTree = "SOURCE_ROOT"; };
+<<<<<<< HEAD
E8964C0BE264A55753BC6B7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Midi.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_devices/native/juce_linux_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
E91923510CB2280C3A3B9E9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
E946426F95E0240683CB3337 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1254,9 +1258,22 @@
EAEA49B9394D802B79CA8164 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
EDA209B0E7D124EA581023AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatManager.h"; path = "../../JuceLibraryCode/modules/juce_audio_formats/format/juce_AudioFormatManager.h"; sourceTree = "SOURCE_ROOT"; };
EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
+=======
+ E946426F95E0240683CB3337 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; };
+ EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
+ ED86166920362E9D2BE2CB26 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SVGParser.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_SVGParser.cpp"; sourceTree = "SOURCE_ROOT"; };
+ EDAC82BD742A54182E8DF2FE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeCoordinatePositioner.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/positioning/juce_RelativeCoordinatePositioner.h"; sourceTree = "SOURCE_ROOT"; };
+ EE0336B43A39FD585DF638EE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResizableEdgeComponent.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_ResizableEdgeComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+ EE4DD055D31F7D9DC718DBD8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentMovementWatcher.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h"; sourceTree = "SOURCE_ROOT"; };
+ EF059B26886B32000BCF8CFF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseInputSource.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_MouseInputSource.h"; sourceTree = "SOURCE_ROOT"; };
+>>>>>>> ad949e740b3b7480c13f13802fe4d50b0f241ede
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
99E1BC08B886CFDD2CCFD462 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "open-ephys.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
E8D51D470C9955D7D03D5469 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ChebyshevII.h; path = ../../Source/Processors/Dsp/ChebyshevII.h; sourceTree = "SOURCE_ROOT"; };
+<<<<<<< HEAD
+=======
+ E91923510CB2280C3A3B9E9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
+>>>>>>> ad949e740b3b7480c13f13802fe4d50b0f241ede
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
E93BE115650B1CB80EACB841 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EditorViewportButtons.h; path = ../../Source/UI/EditorViewportButtons.h; sourceTree = "SOURCE_ROOT"; };
E97684DCE824DEDA6683C6CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Synthesiser.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1280,7 +1297,11 @@
EE4DD055D31F7D9DC718DBD8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentMovementWatcher.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.h"; sourceTree = "SOURCE_ROOT"; };
EEA51B7EF1CF19028C6672E0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DocumentWindow.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
EEFC66D2DF5FD66B4D83B22F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Component.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/components/juce_Component.h"; sourceTree = "SOURCE_ROOT"; };
+<<<<<<< HEAD
EF059B26886B32000BCF8CFF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseInputSource.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_MouseInputSource.h"; sourceTree = "SOURCE_ROOT"; };
+=======
+ EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
+>>>>>>> ad949e740b3b7480c13f13802fe4d50b0f241ede
EF4A6E0E1232071252ACCD7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeParallelogram.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h"; sourceTree = "SOURCE_ROOT"; };
EF610B2A17D9B1C0D24DCE67 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_android_JNIHelpers.h"; path = "../../JuceLibraryCode/modules/juce_core/native/juce_android_JNIHelpers.h"; sourceTree = "SOURCE_ROOT"; };
EF7B66764093D950724EFE70 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLShaderProgram.h"; path = "../../JuceLibraryCode/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1433,6 +1454,9 @@
C451728043944D40C69166C1 = {isa = PBXGroup; children = (
B04D87ED6AA4897B6CD3CCF6,
E79259F2164D16553A69B458, ); name = Audio; sourceTree = "<group>"; };
+ 1D3795144FF61913C780F00D = {isa = PBXGroup; children = (
+ C8EC33D17178B382027313A7,
+ A81E114BF75E0CEF0C7D1318, ); name = CAR; sourceTree = "<group>"; };
9C8E3549A602E74DCFC44244 = {isa = PBXGroup; children = (
95A64508FF3D0140D3001A19,
B410FE6CF1A561A1648343D6,
@@ -1681,6 +1705,7 @@
F115ED75E977A54AAF036B2C,
AE3D7946F13CE32AE41DD1B7, ); name = Visualization; sourceTree = "<group>"; };
83A3E005DDFCC55F277EEDA5 = {isa = PBXGroup; children = (
+ 1D3795144FF61913C780F00D,
9C8E3549A602E74DCFC44244,
9C7703C01E449614C1CD884D,
B3EC4C17E1555DCD89B1B62C,
@@ -1967,9 +1992,9 @@
AFE835E175F7159E1E7C6CC7,
2DA0032B6DF10345C4842BF5,
B64893F699A10B03AA4AFF6B,
+ 55F7467B96E236DD558228C9,
9200FC900D22733AE716C364,
6596D69CCD1502DC6BBD15F1,
- 55F7467B96E236DD558228C9,
05BD169B8574607A6F6AD3B6,
6C8489C41782E3D391AF0C26,
1246C8A62803B7E115713705,
@@ -2938,6 +2963,7 @@
14BDAEA656AAFA60334CC55C,
C853FCE2F6C91B3643322CF0,
0AE243437B40602D35435C32,
+ 2BBDCC829E8525DF770E7E6A,
55227B30828797A8DCB0B91D,
527EB48A4A9C2F4FF1BC4FB2,
8352817FEDC7542D3E65B49A,
diff --git a/Builds/VisualStudio2012/open-ephys.vcxproj b/Builds/VisualStudio2012/open-ephys.vcxproj
index 1096a85715e768cea0a9d2678b818c6ca66a8bf9..f631550ca55201c81740628b1fdfaf30fdb1efb8 100644
--- a/Builds/VisualStudio2012/open-ephys.vcxproj
+++ b/Builds/VisualStudio2012/open-ephys.vcxproj
@@ -266,6 +266,7 @@
<ClCompile Include="..\..\Source\AccessClass.cpp"/>
<ClCompile Include="..\..\Source\Network\PracticalSocket.cpp"/>
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\CAR\CAR.cpp"/>
<ClCompile Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.cpp"/>
<ClCompile Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioEditor.cpp"/>
@@ -1509,6 +1510,7 @@
<ClInclude Include="..\..\Source\AccessClass.h"/>
<ClInclude Include="..\..\Source\Network\PracticalSocket.h"/>
<ClInclude Include="..\..\Source\Audio\AudioComponent.h"/>
+ <ClInclude Include="..\..\Source\Processors\CAR\CAR.h"/>
<ClInclude Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.h"/>
<ClInclude Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\AudioNode\AudioEditor.h"/>
@@ -1717,9 +1719,9 @@
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_audio_utils.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharacterFunctions.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_ASCII.h"/>
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF16.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF32.h"/>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_Identifier.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_LocalisedStrings.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_NewLine.h"/>
diff --git a/Builds/VisualStudio2012/open-ephys.vcxproj.filters b/Builds/VisualStudio2012/open-ephys.vcxproj.filters
index b0ccd22aab60f10b7b3e6cf3a0075eda82c9906e..c9dabb7754f2482b0f4505f8f064b9b0f44827c3 100644
--- a/Builds/VisualStudio2012/open-ephys.vcxproj.filters
+++ b/Builds/VisualStudio2012/open-ephys.vcxproj.filters
@@ -32,6 +32,9 @@
<Filter Include="open-ephys\Source\Processors">
<UniqueIdentifier>{3DDEC88C-BAA5-2DDA-A59F-0FB74070AB82}</UniqueIdentifier>
</Filter>
+ <Filter Include="open-ephys\Source\Processors\CAR">
+ <UniqueIdentifier>{1B2171CA-EE41-20E7-6532-5D930593633A}</UniqueIdentifier>
+ </Filter>
<Filter Include="open-ephys\Source\Processors\ArduinoOutput">
<UniqueIdentifier>{26D17857-B604-0035-CFB5-C3FFD320BD99}</UniqueIdentifier>
</Filter>
@@ -445,6 +448,9 @@
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp">
<Filter>open-ephys\Source\Audio</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\CAR\CAR.cpp">
+ <Filter>open-ephys\Source\Processors\CAR</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.cpp">
<Filter>open-ephys\Source\Processors\ArduinoOutput</Filter>
</ClCompile>
@@ -2031,6 +2037,9 @@
<ClInclude Include="..\..\Source\Audio\AudioComponent.h">
<Filter>open-ephys\Source\Audio</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\CAR\CAR.h">
+ <Filter>open-ephys\Source\Processors\CAR</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.h">
<Filter>open-ephys\Source\Processors\ArduinoOutput</Filter>
</ClInclude>
@@ -2655,13 +2664,13 @@
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_ASCII.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF16.h">
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF32.h">
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF16.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h">
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF32.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_Identifier.h">
diff --git a/Builds/VisualStudio2013/open-ephys.vcxproj b/Builds/VisualStudio2013/open-ephys.vcxproj
index 32fea9560b293910ff4a354f2949343c33df6497..16e36e61f9d735c20d13d60f9d16a6ec43561578 100644
--- a/Builds/VisualStudio2013/open-ephys.vcxproj
+++ b/Builds/VisualStudio2013/open-ephys.vcxproj
@@ -270,6 +270,7 @@
<ClCompile Include="..\..\Source\AccessClass.cpp"/>
<ClCompile Include="..\..\Source\Network\PracticalSocket.cpp"/>
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\CAR\CAR.cpp"/>
<ClCompile Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.cpp"/>
<ClCompile Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioEditor.cpp"/>
@@ -1513,6 +1514,7 @@
<ClInclude Include="..\..\Source\AccessClass.h"/>
<ClInclude Include="..\..\Source\Network\PracticalSocket.h"/>
<ClInclude Include="..\..\Source\Audio\AudioComponent.h"/>
+ <ClInclude Include="..\..\Source\Processors\CAR\CAR.h"/>
<ClInclude Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.h"/>
<ClInclude Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\AudioNode\AudioEditor.h"/>
@@ -1721,9 +1723,9 @@
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_audio_utils.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharacterFunctions.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_ASCII.h"/>
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF16.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF32.h"/>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_Identifier.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_LocalisedStrings.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_NewLine.h"/>
diff --git a/Builds/VisualStudio2013/open-ephys.vcxproj.filters b/Builds/VisualStudio2013/open-ephys.vcxproj.filters
index 1251522bb6537167fe39418f84eefb817ea90604..799170d0fe1189aaa211ce4f2f882cdb7ab0f18c 100644
--- a/Builds/VisualStudio2013/open-ephys.vcxproj.filters
+++ b/Builds/VisualStudio2013/open-ephys.vcxproj.filters
@@ -32,6 +32,9 @@
<Filter Include="open-ephys\Source\Processors">
<UniqueIdentifier>{3DDEC88C-BAA5-2DDA-A59F-0FB74070AB82}</UniqueIdentifier>
</Filter>
+ <Filter Include="open-ephys\Source\Processors\CAR">
+ <UniqueIdentifier>{1B2171CA-EE41-20E7-6532-5D930593633A}</UniqueIdentifier>
+ </Filter>
<Filter Include="open-ephys\Source\Processors\ArduinoOutput">
<UniqueIdentifier>{26D17857-B604-0035-CFB5-C3FFD320BD99}</UniqueIdentifier>
</Filter>
@@ -445,6 +448,9 @@
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp">
<Filter>open-ephys\Source\Audio</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\CAR\CAR.cpp">
+ <Filter>open-ephys\Source\Processors\CAR</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.cpp">
<Filter>open-ephys\Source\Processors\ArduinoOutput</Filter>
</ClCompile>
@@ -2031,6 +2037,9 @@
<ClInclude Include="..\..\Source\Audio\AudioComponent.h">
<Filter>open-ephys\Source\Audio</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\CAR\CAR.h">
+ <Filter>open-ephys\Source\Processors\CAR</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\ArduinoOutput\ArduinoOutput.h">
<Filter>open-ephys\Source\Processors\ArduinoOutput</Filter>
</ClInclude>
@@ -2655,13 +2664,13 @@
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_ASCII.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF16.h">
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF32.h">
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF16.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
- <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF8.h">
+ <ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_CharPointer_UTF32.h">
<Filter>Juce Modules\juce_core\text</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_core\text\juce_Identifier.h">
diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h
index fb111b6443002a8d2a511e978f5e51fe63217d21..48b14758c92f8515af761fa3b283ac4fb98a55e0 100644
--- a/JuceLibraryCode/JuceHeader.h
+++ b/JuceLibraryCode/JuceHeader.h
@@ -36,11 +36,13 @@
using namespace juce;
#endif
+#if ! JUCE_DONT_DECLARE_PROJECTINFO
namespace ProjectInfo
{
const char* const projectName = "open-ephys";
const char* const versionString = "0.3.4";
const int versionNumber = 0x304;
}
+#endif
#endif // __APPHEADERFILE_YNSYIRR__
diff --git a/Source/Processors/ExampleProcessor/ExampleProcessor.h b/Source/Processors/ExampleProcessor/ExampleProcessor.h
index 9307bbe029e0777951a6f7c556e84e9cd5bf0fdb..76f89eb519492198a8f2183290b27f87aec8652d 100644
--- a/Source/Processors/ExampleProcessor/ExampleProcessor.h
+++ b/Source/Processors/ExampleProcessor/ExampleProcessor.h
@@ -29,7 +29,7 @@
#endif
#include "../../JuceLibraryCode/JuceHeader.h"
-#include "GenericProcessor.h"
+#include "../GenericProcessor/GenericProcessor.h"
/**
diff --git a/Source/Processors/ProcessorGraph/ProcessorGraph.cpp b/Source/Processors/ProcessorGraph/ProcessorGraph.cpp
index bd173d37b7f58e63f81fac794177df28d60beae1..fa90bf5df95badb72ab47cb33a8fbc897c60c785 100644
--- a/Source/Processors/ProcessorGraph/ProcessorGraph.cpp
+++ b/Source/Processors/ProcessorGraph/ProcessorGraph.cpp
@@ -52,6 +52,8 @@
#include "../../UI/EditorViewport.h"
#include "../NetworkEvents/NetworkEvents.h"
#include "../PSTH/PeriStimulusTimeHistogramNode.h"
+#include "../CAR/CAR.h"
+
#ifdef ZEROMQ
@@ -603,7 +605,11 @@ GenericProcessor* ProcessorGraph::createProcessorFromDescription(String& descrip
std::cout << "Creating a new channel mapping node." << std::endl;
processor = new ChannelMappingNode();
}
-
+ else if (subProcessorType.equalsIgnoreCase("Common Avg Ref"))
+ {
+ std::cout << "Creating a new common average reference node." << std::endl;
+ processor = new CAR();
+ }
sendActionMessage("New filter node created.");
}
diff --git a/Source/UI/ProcessorList.cpp b/Source/UI/ProcessorList.cpp
index edef638fb4266396fe48f2a6f0c5d078c0e55bfe..0e38896791af085af1bcbd49a3d6e094f30ea45b 100755
--- a/Source/UI/ProcessorList.cpp
+++ b/Source/UI/ProcessorList.cpp
@@ -73,6 +73,7 @@ ProcessorList::ProcessorList()
filters->addSubItem(new ProcessorListItem("Phase Detector"));
//filters->addSubItem(new ProcessorListItem("Digital Ref"));
filters->addSubItem(new ProcessorListItem("Channel Map"));
+ filters->addSubItem(new ProcessorListItem("Common Avg Ref"));
//filters->addSubItem(new ProcessorListItem("Eye Tracking"));
diff --git a/open-ephys.jucer b/open-ephys.jucer
index 4af53bfaeb3e4be48f58cf4b2451c9db7df98949..fd4565069dd3f51583870ce059ddff595e43c559 100644
--- a/open-ephys.jucer
+++ b/open-ephys.jucer
@@ -7,7 +7,7 @@
pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0"
pluginSilenceInIsSilenceOut="0" pluginTailLength="0" pluginEditorRequiresKeys="0"
pluginAUExportPrefix="JuceProjectAU" pluginAUViewClass="JuceProjectAU_V1"
- pluginRTASCategory="" bundleIdentifier="org.open-ephys.gui" jucerVersion="3.1.0"
+ pluginRTASCategory="" bundleIdentifier="org.open-ephys.gui" jucerVersion="3.1.1"
companyName="Open Ephys" userNotes="The Open Ephys GUI was designed to provide a fast and flexible interface for acquiring, processing, and visualizing data from extracellular electrodes. See open-ephys.org for more information."
includeBinaryInAppConfig="1">
<EXPORTFORMATS>
@@ -281,6 +281,10 @@
file="Source/Audio/AudioComponent.h"/>
</GROUP>
<GROUP id="yQmqZWk" name="Processors">
+ <GROUP id="{524D893D-A1F5-2C0F-5BB3-5E5C4D8C697D}" name="CAR">
+ <FILE id="Tt1aBa" name="CAR.cpp" compile="1" resource="0" file="Source/Processors/CAR/CAR.cpp"/>
+ <FILE id="JRBOqc" name="CAR.h" compile="0" resource="0" file="Source/Processors/CAR/CAR.h"/>
+ </GROUP>
<GROUP id="{447899E6-3974-53D0-5588-79643E8F5CA3}" name="ArduinoOutput">
<FILE id="Ucs5gf" name="ArduinoOutput.cpp" compile="1" resource="0"
file="Source/Processors/ArduinoOutput/ArduinoOutput.cpp"/>