Skip to content

Commit b04a0b7

Browse files
aacuevasaacuevas
committed
First works to enable saving/loading chains with plugins
1 parent 536252b commit b04a0b7

27 files changed

Lines changed: 250 additions & 25 deletions

File tree

‎Builds/Linux/Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ OBJECTS := \
7474
$(OBJDIR)/State_5d41ca1e.o \
7575
$(OBJDIR)/ofSerial_c3b0a9e1.o \
7676
$(OBJDIR)/ProcessorManager_2aa7db2a.o \
77+
$(OBJDIR)/PluginClass_23924d4b.o \
7778
$(OBJDIR)/PluginManager_f764c180.o \
7879
$(OBJDIR)/AudioEditor_3931be27.o \
7980
$(OBJDIR)/AudioNode_3db3557c.o \
@@ -275,6 +276,11 @@ $(OBJDIR)/ProcessorManager_2aa7db2a.o: ../../Source/Processors/ProcessorManager/
275276
@echo "Compiling ProcessorManager.cpp"
276277
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
277278

279+
$(OBJDIR)/PluginClass_23924d4b.o: ../../Source/Processors/PluginManager/PluginClass.cpp
280+
-@mkdir -p $(OBJDIR)
281+
@echo "Compiling PluginClass.cpp"
282+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
283+
278284
$(OBJDIR)/PluginManager_f764c180.o: ../../Source/Processors/PluginManager/PluginManager.cpp
279285
-@mkdir -p $(OBJDIR)
280286
@echo "Compiling PluginManager.cpp"

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
411543734DA2029A3030D903 = {isa = PBXBuildFile; fileRef = 20BB146B925C4D4AD43BA479; };
4848
582C224AA50C9395810C8E27 = {isa = PBXBuildFile; fileRef = 308F614D30DCB9AE3767C928; };
4949
AE80C3A6186F3A4D537489A0 = {isa = PBXBuildFile; fileRef = 66D578EAADBAD326A09FD25E; };
50+
FDC3F3F6332D07F15FED8EA1 = {isa = PBXBuildFile; fileRef = 541E3B77D21FF049426506C1; };
5051
07A712AC1BFF4BBB74914575 = {isa = PBXBuildFile; fileRef = D39560BC785A81E49F6C502D; };
5152
D761F014D76825DEFE0A7582 = {isa = PBXBuildFile; fileRef = FCA5573BA018F7E8106B89FF; };
5253
8352817FEDC7542D3E65B49A = {isa = PBXBuildFile; fileRef = DA4EAC64A750D0C3DEE83C5D; };
@@ -508,6 +509,7 @@
508509
5343D594AA7D444A7C6AD924 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_GZIPDecompressorInputStream.h"; path = "../../JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h"; sourceTree = "SOURCE_ROOT"; };
509510
5379FC603780F30A2F05FE78 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AsyncUpdater.h"; path = "../../JuceLibraryCode/modules/juce_events/broadcasters/juce_AsyncUpdater.h"; sourceTree = "SOURCE_ROOT"; };
510511
53C8A2696FE4389E4AB4441C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Slider.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/widgets/juce_Slider.cpp"; sourceTree = "SOURCE_ROOT"; };
512+
541E3B77D21FF049426506C1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PluginClass.cpp; path = ../../Source/Processors/PluginManager/PluginClass.cpp; sourceTree = "SOURCE_ROOT"; };
511513
54339ADDCB6F8E9E7721A986 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Windowing.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/native/juce_android_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
512514
54B7796F6DCF5531789CCF43 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Types.h; path = ../../Source/Processors/Dsp/Types.h; sourceTree = "SOURCE_ROOT"; };
513515
55811E331B55E0547326CF22 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TopLevelWindow.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -936,6 +938,7 @@
936938
B2FA9CC4754E136F22281176 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageEffectFilter.h"; path = "../../JuceLibraryCode/modules/juce_graphics/effects/juce_ImageEffectFilter.h"; sourceTree = "SOURCE_ROOT"; };
937939
B3BAC48D01C49D8727D08097 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ListBox.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/widgets/juce_ListBox.cpp"; sourceTree = "SOURCE_ROOT"; };
938940
B43C27BEC3AB681389FC5FC5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeCoordinate.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/positioning/juce_RelativeCoordinate.h"; sourceTree = "SOURCE_ROOT"; };
941+
B43DA6444D20C5F94D2F5BFB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginClass.h; path = ../../Source/Processors/PluginManager/PluginClass.h; sourceTree = "SOURCE_ROOT"; };
939942
B4C52FC94D6C680C33ED85C9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_File.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_File.cpp"; sourceTree = "SOURCE_ROOT"; };
940943
B4F0C0B262654C4782B5AC49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileChooserDialogBox.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h"; sourceTree = "SOURCE_ROOT"; };
941944
B5ADA0C1BDBFAE2A2F8ECB48 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_EdgeTable.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_EdgeTable.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1174,10 +1177,10 @@
11741177
E91923510CB2280C3A3B9E9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
11751178
E946426F95E0240683CB3337 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; };
11761179
E97684DCE824DEDA6683C6CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Synthesiser.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp"; sourceTree = "SOURCE_ROOT"; };
1180+
EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
11771181
EA9518CDEA7049C21D5CE2D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; };
11781182
EAB637B566FEBBDADA654262 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTMidiEventList.h"; path = "../../JuceLibraryCode/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h"; sourceTree = "SOURCE_ROOT"; };
11791183
EAB6A66678B122C578B16445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
1180-
EAC262A83CD2BEA14542AE89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
11811184
EDA209B0E7D124EA581023AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatManager.h"; path = "../../JuceLibraryCode/modules/juce_audio_formats/format/juce_AudioFormatManager.h"; sourceTree = "SOURCE_ROOT"; };
11821185
F345254DE7F499036FB17995 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Layout.h; path = ../../Source/Processors/Dsp/Layout.h; sourceTree = "SOURCE_ROOT"; };
11831186
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -1186,10 +1189,10 @@
11861189
E39CC410838072043E3C30DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OriginalRecording.cpp; path = ../../Source/Processors/RecordNode/OriginalRecording.cpp; sourceTree = "SOURCE_ROOT"; };
11871190
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
11881191
E93BE115650B1CB80EACB841 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EditorViewportButtons.h; path = ../../Source/UI/EditorViewportButtons.h; sourceTree = "SOURCE_ROOT"; };
1189-
EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
11901192
EA354D7D8E48D461415D52D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../JuceLibraryCode/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
11911193
EA73332E3D5AEC04ADDFBB2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDataConverters.h"; path = "../../JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h"; sourceTree = "SOURCE_ROOT"; };
11921194
EAB2319C7AA57E06A2247CDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BorderSize.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_BorderSize.h"; sourceTree = "SOURCE_ROOT"; };
1195+
EAC262A83CD2BEA14542AE89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
11931196
EAC7A64301F0BF2C5E33A1F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_InterprocessConnectionServer.cpp"; path = "../../JuceLibraryCode/modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp"; sourceTree = "SOURCE_ROOT"; };
11941197
EAEA49B9394D802B79CA8164 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
11951198
EB5F9A50EB53A57D6AE303C2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_QuickTimeMovieComponent.mm"; path = "../../JuceLibraryCode/modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -1401,6 +1404,8 @@
14011404
66D578EAADBAD326A09FD25E,
14021405
F79395F3D9FC2E03DFC7B7DA, ); name = ProcessorManager; sourceTree = "<group>"; };
14031406
8CCA9145D97AAACB0A0D24AD = {isa = PBXGroup; children = (
1407+
541E3B77D21FF049426506C1,
1408+
B43DA6444D20C5F94D2F5BFB,
14041409
196499CECF3848D933A5C905,
14051410
D39560BC785A81E49F6C502D,
14061411
FCA5573BA018F7E8106B89FF, ); name = PluginManager; sourceTree = "<group>"; };
@@ -2768,6 +2773,7 @@
27682773
411543734DA2029A3030D903,
27692774
582C224AA50C9395810C8E27,
27702775
AE80C3A6186F3A4D537489A0,
2776+
FDC3F3F6332D07F15FED8EA1,
27712777
07A712AC1BFF4BBB74914575,
27722778
D761F014D76825DEFE0A7582,
27732779
8352817FEDC7542D3E65B49A,

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
<ClCompile Include="..\..\Source\Processors\Dsp\State.cpp"/>
279279
<ClCompile Include="..\..\Source\Processors\Serial\ofSerial.cpp"/>
280280
<ClCompile Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.cpp"/>
281+
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginClass.cpp"/>
281282
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginManager.cpp"/>
282283
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioEditor.cpp"/>
283284
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioNode.cpp"/>
@@ -1485,6 +1486,7 @@
14851486
<ClInclude Include="..\..\Source\Processors\Serial\ofConstants.h"/>
14861487
<ClInclude Include="..\..\Source\Processors\Serial\ofSerial.h"/>
14871488
<ClInclude Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.h"/>
1489+
<ClInclude Include="..\..\Source\Processors\PluginManager\PluginClass.h"/>
14881490
<ClInclude Include="..\..\Source\Processors\PluginManager\OpenEphysPlugin.h"/>
14891491
<ClInclude Include="..\..\Source\Processors\PluginManager\PluginManager.h"/>
14901492
<ClInclude Include="..\..\Source\Processors\AudioNode\AudioEditor.h"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,9 @@
463463
<ClCompile Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.cpp">
464464
<Filter>open-ephys\Source\Processors\ProcessorManager</Filter>
465465
</ClCompile>
466+
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginClass.cpp">
467+
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
468+
</ClCompile>
466469
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginManager.cpp">
467470
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
468471
</ClCompile>
@@ -1941,6 +1944,9 @@
19411944
<ClInclude Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.h">
19421945
<Filter>open-ephys\Source\Processors\ProcessorManager</Filter>
19431946
</ClInclude>
1947+
<ClInclude Include="..\..\Source\Processors\PluginManager\PluginClass.h">
1948+
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
1949+
</ClInclude>
19441950
<ClInclude Include="..\..\Source\Processors\PluginManager\OpenEphysPlugin.h">
19451951
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
19461952
</ClInclude>

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@
282282
<ClCompile Include="..\..\Source\Processors\Dsp\State.cpp"/>
283283
<ClCompile Include="..\..\Source\Processors\Serial\ofSerial.cpp"/>
284284
<ClCompile Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.cpp"/>
285+
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginClass.cpp"/>
285286
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginManager.cpp"/>
286287
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioEditor.cpp"/>
287288
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioNode.cpp"/>
@@ -1489,6 +1490,7 @@
14891490
<ClInclude Include="..\..\Source\Processors\Serial\ofConstants.h"/>
14901491
<ClInclude Include="..\..\Source\Processors\Serial\ofSerial.h"/>
14911492
<ClInclude Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.h"/>
1493+
<ClInclude Include="..\..\Source\Processors\PluginManager\PluginClass.h"/>
14921494
<ClInclude Include="..\..\Source\Processors\PluginManager\OpenEphysPlugin.h"/>
14931495
<ClInclude Include="..\..\Source\Processors\PluginManager\PluginManager.h"/>
14941496
<ClInclude Include="..\..\Source\Processors\AudioNode\AudioEditor.h"/>

‎Builds/VisualStudio2013/open-ephys.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,9 @@
463463
<ClCompile Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.cpp">
464464
<Filter>open-ephys\Source\Processors\ProcessorManager</Filter>
465465
</ClCompile>
466+
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginClass.cpp">
467+
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
468+
</ClCompile>
466469
<ClCompile Include="..\..\Source\Processors\PluginManager\PluginManager.cpp">
467470
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
468471
</ClCompile>
@@ -1941,6 +1944,9 @@
19411944
<ClInclude Include="..\..\Source\Processors\ProcessorManager\ProcessorManager.h">
19421945
<Filter>open-ephys\Source\Processors\ProcessorManager</Filter>
19431946
</ClInclude>
1947+
<ClInclude Include="..\..\Source\Processors\PluginManager\PluginClass.h">
1948+
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
1949+
</ClInclude>
19441950
<ClInclude Include="..\..\Source\Processors\PluginManager\OpenEphysPlugin.h">
19451951
<Filter>open-ephys\Source\Processors\PluginManager</Filter>
19461952
</ClInclude>

‎Source/Plugins/ArduinoOutput/OpenEphysLib.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" EXPORT void getLibInfo(Plugin::LibraryInfo* info)
3838
{
3939
info->apiVersion = PLUGIN_API_VER;
4040
info->name = "Arduino Output";
41+
info->libVersion = 1;
4142
info->numPlugins = NUM_PLUGINS;
4243
}
4344

‎Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ extern "C" EXPORT void getLibInfo(Plugin::LibraryInfo* info)
3939
{
4040
info->apiVersion = PLUGIN_API_VER;
4141
info->name = "Basic Spike Display";
42+
info->libVersion = 1;
4243
info->numPlugins = NUM_PLUGINS;
4344
}
4445

‎Source/Plugins/CAR/OpenEphysLib.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" EXPORT void getLibInfo(Plugin::LibraryInfo* info)
3838
{
3939
info->apiVersion = PLUGIN_API_VER;
4040
info->name = "Common Average Reference";
41+
info->libVersion = 1;
4142
info->numPlugins = NUM_PLUGINS;
4243
}
4344

‎Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" EXPORT void getLibInfo(Plugin::LibraryInfo* info)
3838
{
3939
info->apiVersion = PLUGIN_API_VER;
4040
info->name = "Channel Mapper";
41+
info->libVersion = 1;
4142
info->numPlugins = NUM_PLUGINS;
4243
}
4344

0 commit comments

Comments
 (0)