Skip to content

Commit a19a173

Browse files
committed
Merge branch 'master' and appropriate needed fixes of https://github.com/priyanjitdey94/plugin-GUI into development
2 parents ca28420 + c166598 commit a19a173

12 files changed

Lines changed: 1718 additions & 1634 deletions

File tree

Builds/Linux/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ OBJECTS := \
9090
$(OBJDIR)/rhd2000registers_6b59b998.o \
9191
$(OBJDIR)/DataBuffer_6ae4f549.o \
9292
$(OBJDIR)/DataThread_b2a47a13.o \
93+
$(OBJDIR)/ListSliceParser_dfcd8ec5.o \
9394
$(OBJDIR)/ChannelSelector_c1430874.o \
9495
$(OBJDIR)/ElectrodeButtons_a6064cc.o \
9596
$(OBJDIR)/GenericEditor_becb2ad6.o \
@@ -366,6 +367,11 @@ $(OBJDIR)/DataThread_b2a47a13.o: ../../Source/Processors/DataThreads/DataThread.
366367
@echo "Compiling DataThread.cpp"
367368
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
368369

370+
$(OBJDIR)/ListSliceParser_dfcd8ec5.o: ../../Source/Processors/Editors/ListSliceParser.cpp
371+
-@mkdir -p $(OBJDIR)
372+
@echo "Compiling ListSliceParser.cpp"
373+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
374+
369375
$(OBJDIR)/ChannelSelector_c1430874.o: ../../Source/Processors/Editors/ChannelSelector.cpp
370376
-@mkdir -p $(OBJDIR)
371377
@echo "Compiling ChannelSelector.cpp"

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
203844FDF36CFE38A7DAABE7 = {isa = PBXBuildFile; fileRef = F06884C6399CB102B1E8A24E; };
6161
FAE745870674A07A65690433 = {isa = PBXBuildFile; fileRef = 788F8B7719B70465762B634B; };
6262
24CC7E9A7E87F762D4AB0467 = {isa = PBXBuildFile; fileRef = 92602D7166325C7232B85EDD; };
63+
CC2888DA67844855CD300B44 = {isa = PBXBuildFile; fileRef = 37F35AFCC432C449B991469B; };
6364
52AE3F7AEED81BA9ED5C4830 = {isa = PBXBuildFile; fileRef = E216D095C98F850A5FB6FB0F; };
6465
029C3B11BE586DA100895A60 = {isa = PBXBuildFile; fileRef = 28CCF04CCC028BAE0AEE5840; };
6566
6702EEA4E99D503C0EE933C4 = {isa = PBXBuildFile; fileRef = D3AE8303545E28D793312F46; };
@@ -301,6 +302,7 @@
301302
28847C807E6B05303FB8FB34 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Strings.mm"; path = "../../JuceLibraryCode/modules/juce_core/native/juce_mac_Strings.mm"; sourceTree = "SOURCE_ROOT"; };
302303
28CCF04CCC028BAE0AEE5840 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ElectrodeButtons.cpp; path = ../../Source/Processors/Editors/ElectrodeButtons.cpp; sourceTree = "SOURCE_ROOT"; };
303304
28D5AEEEFC4FA8877419C829 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_posix_NamedPipe.cpp"; path = "../../JuceLibraryCode/modules/juce_core/native/juce_posix_NamedPipe.cpp"; sourceTree = "SOURCE_ROOT"; };
305+
28F9EA370A924275261DD951 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ListSliceParser.h; path = ../../Source/Processors/Editors/ListSliceParser.h; sourceTree = "SOURCE_ROOT"; };
304306
2924B990E35D3B51AA245978 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MessageListener.h"; path = "../../JuceLibraryCode/modules/juce_events/messages/juce_MessageListener.h"; sourceTree = "SOURCE_ROOT"; };
305307
29381F22B8FDF48C3EAC3A9F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLPixelFormat.cpp"; path = "../../JuceLibraryCode/modules/juce_opengl/opengl/juce_OpenGLPixelFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
306308
29C859E4FEC33981B0C5ABBA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RHD2000Thread.cpp; path = ../../Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp; sourceTree = "SOURCE_ROOT"; };
@@ -346,6 +348,7 @@
346348
3663C981D28BF165C1B601A7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OptionalScopedPointer.h"; path = "../../JuceLibraryCode/modules/juce_core/memory/juce_OptionalScopedPointer.h"; sourceTree = "SOURCE_ROOT"; };
347349
36A9736F04AAA2F8E9D711BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SpinLock.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_SpinLock.h"; sourceTree = "SOURCE_ROOT"; };
348350
36BE4BA79883C88072EE385B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CustomLookAndFeel.h; path = ../../Source/UI/LookAndFeel/CustomLookAndFeel.h; sourceTree = "SOURCE_ROOT"; };
351+
37F35AFCC432C449B991469B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ListSliceParser.cpp; path = ../../Source/Processors/Editors/ListSliceParser.cpp; sourceTree = "SOURCE_ROOT"; };
349352
381F5DC605AE69088004DF80 = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PipelineB-01.png"; path = "../../Resources/Images/Buttons/PipelineB-01.png"; sourceTree = "SOURCE_ROOT"; };
350353
3846F3FA0FC28CE322073E94 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Utilities.h; path = ../../Source/Processors/Dsp/Utilities.h; sourceTree = "SOURCE_ROOT"; };
351354
385F66531BAB16BA754E901E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SplitterEditor.h; path = ../../Source/Processors/Splitter/SplitterEditor.h; sourceTree = "SOURCE_ROOT"; };
@@ -1127,7 +1130,6 @@
11271130
E1057B787FF26E64A5A3A994 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rhd2000datablock.cpp; path = "../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000datablock.cpp"; sourceTree = "SOURCE_ROOT"; };
11281131
E122ECCE167A03BDF2D282FE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RootFinder.cpp; path = ../../Source/Processors/Dsp/RootFinder.cpp; sourceTree = "SOURCE_ROOT"; };
11291132
E19724CB4C351AD59A3E41D0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rhd2000datablock.h; path = "../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000datablock.h"; sourceTree = "SOURCE_ROOT"; };
1130-
E1E9FAB63BD90C10F2BEF74C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Splitter.h; path = ../../Source/Processors/Splitter/Splitter.h; sourceTree = "SOURCE_ROOT"; };
11311133
E20D5F2F75478DA4943CEDBD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionBroadcaster.h"; path = "../../JuceLibraryCode/modules/juce_events/broadcasters/juce_ActionBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
11321134
E216D095C98F850A5FB6FB0F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ChannelSelector.cpp; path = ../../Source/Processors/Editors/ChannelSelector.cpp; sourceTree = "SOURCE_ROOT"; };
11331135
E21CA41B44E191F1804F9662 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../JuceLibraryCode/modules/juce_data_structures/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
@@ -1137,6 +1139,7 @@
11371139
E33F167E4AA1C44596A1EBED = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_mac_CoreGraphicsHelpers.h"; path = "../../JuceLibraryCode/modules/juce_graphics/native/juce_mac_CoreGraphicsHelpers.h"; sourceTree = "SOURCE_ROOT"; };
11381140
E34E535DA9CBF248E32F7B45 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReadWriteLock.cpp"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_ReadWriteLock.cpp"; sourceTree = "SOURCE_ROOT"; };
11391141
E37140E9E8F7CFDDEEEF6148 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarItemFactory.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/widgets/juce_ToolbarItemFactory.h"; sourceTree = "SOURCE_ROOT"; };
1142+
E39CC410838072043E3C30DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OriginalRecording.cpp; path = ../../Source/Processors/RecordNode/OriginalRecording.cpp; sourceTree = "SOURCE_ROOT"; };
11401143
E3C4B6B362320594789E1297 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertySet.cpp"; path = "../../JuceLibraryCode/modules/juce_core/containers/juce_PropertySet.cpp"; sourceTree = "SOURCE_ROOT"; };
11411144
E3D9DABE0A9C1DCE6A6515CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MixerAudioSource.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
11421145
E419C9DA3202B8B6EC2DB723 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Reverb.h"; path = "../../JuceLibraryCode/modules/juce_audio_basics/effects/juce_Reverb.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1163,11 +1166,10 @@
11631166
EA9518CDEA7049C21D5CE2D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; };
11641167
EAB6A66678B122C578B16445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
11651168
EAC262A83CD2BEA14542AE89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
1166-
EAEA49B9394D802B79CA8164 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
11671169
EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
11681170
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
11691171
99E1BC08B886CFDD2CCFD462 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "open-ephys.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
1170-
E39CC410838072043E3C30DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OriginalRecording.cpp; path = ../../Source/Processors/RecordNode/OriginalRecording.cpp; sourceTree = "SOURCE_ROOT"; };
1172+
E1E9FAB63BD90C10F2BEF74C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Splitter.h; path = ../../Source/Processors/Splitter/Splitter.h; sourceTree = "SOURCE_ROOT"; };
11711173
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"; };
11721174
E91923510CB2280C3A3B9E9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
11731175
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1179,6 +1181,7 @@
11791181
EAB2319C7AA57E06A2247CDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BorderSize.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_BorderSize.h"; sourceTree = "SOURCE_ROOT"; };
11801182
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"; };
11811183
EAC7A64301F0BF2C5E33A1F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_InterprocessConnectionServer.cpp"; path = "../../JuceLibraryCode/modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp"; sourceTree = "SOURCE_ROOT"; };
1184+
EAEA49B9394D802B79CA8164 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
11821185
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"; };
11831186
EBD8622EAEF10558809888B7 = {isa = PBXFileReference; lastKnownFileType = image.png; name = "RadioButtons_selected_over-01.png"; path = "../../Resources/Images/Icons/RadioButtons_selected_over-01.png"; sourceTree = "SOURCE_ROOT"; };
11841187
EC95A2CF4B33EA37DA5FC1AC = {isa = PBXFileReference; lastKnownFileType = file.ttf; name = nordic.ttf; path = ../../Resources/Fonts/nordic.ttf; sourceTree = "SOURCE_ROOT"; };
@@ -1435,6 +1438,8 @@
14351438
92602D7166325C7232B85EDD,
14361439
0287B009511521BEAAE8A52C, ); name = DataThreads; sourceTree = "<group>"; };
14371440
9F16043BF599BCE0C02A00A5 = {isa = PBXGroup; children = (
1441+
37F35AFCC432C449B991469B,
1442+
28F9EA370A924275261DD951,
14381443
E216D095C98F850A5FB6FB0F,
14391444
70F06DBCA3948BCC1062E36F,
14401445
28CCF04CCC028BAE0AEE5840,
@@ -2803,6 +2808,7 @@
28032808
203844FDF36CFE38A7DAABE7,
28042809
FAE745870674A07A65690433,
28052810
24CC7E9A7E87F762D4AB0467,
2811+
CC2888DA67844855CD300B44,
28062812
52AE3F7AEED81BA9ED5C4830,
28072813
029C3B11BE586DA100895A60,
28082814
6702EEA4E99D503C0EE933C4,

Builds/VisualStudio2012/open-ephys.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@
294294
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.cpp"/>
295295
<ClCompile Include="..\..\Source\Processors\DataThreads\DataBuffer.cpp"/>
296296
<ClCompile Include="..\..\Source\Processors\DataThreads\DataThread.cpp"/>
297+
<ClCompile Include="..\..\Source\Processors\Editors\ListSliceParser.cpp"/>
297298
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp"/>
298299
<ClCompile Include="..\..\Source\Processors\Editors\ElectrodeButtons.cpp"/>
299300
<ClCompile Include="..\..\Source\Processors\Editors\GenericEditor.cpp"/>
@@ -1513,6 +1514,7 @@
15131514
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.h"/>
15141515
<ClInclude Include="..\..\Source\Processors\DataThreads\DataBuffer.h"/>
15151516
<ClInclude Include="..\..\Source\Processors\DataThreads\DataThread.h"/>
1517+
<ClInclude Include="..\..\Source\Processors\Editors\ListSliceParser.h"/>
15161518
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h"/>
15171519
<ClInclude Include="..\..\Source\Processors\Editors\ElectrodeButtons.h"/>
15181520
<ClInclude Include="..\..\Source\Processors\Editors\GenericEditor.h"/>

Builds/VisualStudio2012/open-ephys.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,9 @@
523523
<ClCompile Include="..\..\Source\Processors\DataThreads\DataThread.cpp">
524524
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
525525
</ClCompile>
526+
<ClCompile Include="..\..\Source\Processors\Editors\ListSliceParser.cpp">
527+
<Filter>open-ephys\Source\Processors\Editors</Filter>
528+
</ClCompile>
526529
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp">
527530
<Filter>open-ephys\Source\Processors\Editors</Filter>
528531
</ClCompile>
@@ -2037,6 +2040,9 @@
20372040
<ClInclude Include="..\..\Source\Processors\DataThreads\DataThread.h">
20382041
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
20392042
</ClInclude>
2043+
<ClInclude Include="..\..\Source\Processors\Editors\ListSliceParser.h">
2044+
<Filter>open-ephys\Source\Processors\Editors</Filter>
2045+
</ClInclude>
20402046
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h">
20412047
<Filter>open-ephys\Source\Processors\Editors</Filter>
20422048
</ClInclude>

Builds/VisualStudio2013/open-ephys.sln

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 11.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.40629.0
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
3+
Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
64
EndProject
75
Global
86
GlobalSection(SolutionConfigurationPlatforms) = preSolution
97
Debug|Win32 = Debug|Win32
10-
Debug|x64 = Debug|x64
11-
Debug64|Win32 = Debug64|Win32
12-
Debug64|x64 = Debug64|x64
138
Release|Win32 = Release|Win32
14-
Release|x64 = Release|x64
15-
Release64|Win32 = Release64|Win32
9+
Debug64|x64 = Debug64|x64
1610
Release64|x64 = Release64|x64
1711
EndGlobalSection
1812
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1913
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
2014
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
21-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
22-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
23-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
24-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2515
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
2616
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
27-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
28-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
17+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
18+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2919
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
3020
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
3121
EndGlobalSection

Builds/VisualStudio2013/open-ephys.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@
298298
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.cpp"/>
299299
<ClCompile Include="..\..\Source\Processors\DataThreads\DataBuffer.cpp"/>
300300
<ClCompile Include="..\..\Source\Processors\DataThreads\DataThread.cpp"/>
301+
<ClCompile Include="..\..\Source\Processors\Editors\ListSliceParser.cpp"/>
301302
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp"/>
302303
<ClCompile Include="..\..\Source\Processors\Editors\ElectrodeButtons.cpp"/>
303304
<ClCompile Include="..\..\Source\Processors\Editors\GenericEditor.cpp"/>
@@ -1517,6 +1518,7 @@
15171518
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.h"/>
15181519
<ClInclude Include="..\..\Source\Processors\DataThreads\DataBuffer.h"/>
15191520
<ClInclude Include="..\..\Source\Processors\DataThreads\DataThread.h"/>
1521+
<ClInclude Include="..\..\Source\Processors\Editors\ListSliceParser.h"/>
15201522
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h"/>
15211523
<ClInclude Include="..\..\Source\Processors\Editors\ElectrodeButtons.h"/>
15221524
<ClInclude Include="..\..\Source\Processors\Editors\GenericEditor.h"/>

Builds/VisualStudio2013/open-ephys.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,9 @@
523523
<ClCompile Include="..\..\Source\Processors\DataThreads\DataThread.cpp">
524524
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
525525
</ClCompile>
526+
<ClCompile Include="..\..\Source\Processors\Editors\ListSliceParser.cpp">
527+
<Filter>open-ephys\Source\Processors\Editors</Filter>
528+
</ClCompile>
526529
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp">
527530
<Filter>open-ephys\Source\Processors\Editors</Filter>
528531
</ClCompile>
@@ -2037,6 +2040,9 @@
20372040
<ClInclude Include="..\..\Source\Processors\DataThreads\DataThread.h">
20382041
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
20392042
</ClInclude>
2043+
<ClInclude Include="..\..\Source\Processors\Editors\ListSliceParser.h">
2044+
<Filter>open-ephys\Source\Processors\Editors</Filter>
2045+
</ClInclude>
20402046
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h">
20412047
<Filter>open-ephys\Source\Processors\Editors</Filter>
20422048
</ClInclude>

0 commit comments

Comments
 (0)