Skip to content

Commit 8e243b5

Browse files
ethanbbethanbb
committed
Merge branch 'testing' into dsp-common
2 parents ae42eb3 + f48651c commit 8e243b5

44 files changed

Lines changed: 4411 additions & 4784 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,31 @@
88
Builds/Linux/build/open-ephys
99
Builds/Linux/build/open-ephys-release
1010
Resources/Fonts/font_serializer/Builds/Linux/build/
11-
Introjucer/Builds/Linux/build
12-
Introjucer/Builds/VisualStudio2010/Debug
13-
Introjucer/Builds/VisualStudio2010/Release
14-
Introjucer/Builds/VisualStudio2010/*.user
15-
Introjucer/Builds/VisualStudio2010/*.sdf
16-
Introjucer/Builds/VisualStudio2010/*.suo
17-
Introjucer/Builds/VisualStudio2012/Debug
18-
Introjucer/Builds/VisualStudio2012/Release
19-
Introjucer/Builds/VisualStudio2012/*.user
20-
Introjucer/Builds/VisualStudio2012/*.sdf
21-
Introjucer/Builds/VisualStudio2012/*.opensdf
22-
Introjucer/Builds/VisualStudio2012/*.suo
23-
Introjucer/Builds/VisualStudio2013/Debug
24-
Introjucer/Builds/VisualStudio2013/Release
25-
Introjucer/Builds/VisualStudio2013/*.user
26-
Introjucer/Builds/VisualStudio2013/*.sdf
27-
Introjucer/Builds/VisualStudio2013/*.opensdf
28-
Introjucer/Builds/VisualStudio2013/*.suo
11+
Projucer/Builds/Linux/build
12+
Projucer/Builds/VisualStudio2010/Debug
13+
Projucer/Builds/VisualStudio2010/Release
14+
Projucer/Builds/VisualStudio2010/*.user
15+
Projucer/Builds/VisualStudio2010/*.sdf
16+
Projucer/Builds/VisualStudio2010/*.suo
17+
Projucer/Builds/VisualStudio2012/Debug
18+
Projucer/Builds/VisualStudio2012/Release
19+
Projucer/Builds/VisualStudio2012/*.user
20+
Projucer/Builds/VisualStudio2012/*.sdf
21+
Projucer/Builds/VisualStudio2012/*.opensdf
22+
Projucer/Builds/VisualStudio2012/*.suo
23+
Projucer/Builds/VisualStudio2013/Debug
24+
Projucer/Builds/VisualStudio2013/Release
25+
Projucer/Builds/VisualStudio2013/x64
26+
Projucer/Builds/VisualStudio2013/*.user
27+
Projucer/Builds/VisualStudio2013/*.sdf
28+
Projucer/Builds/VisualStudio2013/*.opensdf
29+
Projucer/Builds/VisualStudio2013/*.suo
30+
31+
PluginGenerator/Builds/VisualStudio2013/x64
32+
PluginGenerator/Builds/VisualStudio2013/*.user
33+
PluginGenerator/Builds/VisualStudio2013/*.sdf
34+
PluginGenerator/Builds/VisualStudio2013/*.opensdf
35+
PluginGenerator/Builds/VisualStudio2013/*.suo
2936

3037
# 3. extra files
3138
Builds/Linux/build/data
@@ -113,11 +120,11 @@ Builds/MacOSX/open-ephys.xcodeproj/*.pbxuser
113120
Builds/MacOSX/open-ephys.xcodeproj/xcuserdata
114121
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace
115122
Builds/MacOSX/build
116-
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/*.mode1v3
117-
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/*.pbxuser
118-
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/xcuserdata
119-
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.xcworkspace
120-
Introjucer/Builds/MacOSX/build
123+
Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.mode1v3
124+
Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.pbxuser
125+
Projucer/Builds/MacOSX/The Projucer.xcodeproj/xcuserdata
126+
Projucer/Builds/MacOSX/The Projucer.xcodeproj/project.xcworkspace
127+
Projucer/Builds/MacOSX/build
121128
Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
122129
Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
123130

@@ -126,4 +133,4 @@ build/
126133

127134
/Builds/MacOSX/Plugins/Config/Env.xcconfig
128135
#10. git conflict resolution files
129-
*.orig
136+
*.orig

‎Builds/Linux/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ifeq ($(CONFIG),Debug)
1818
TARGET_ARCH := -march=native
1919
endif
2020

21-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
21+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.3" -D "JUCE_APP_VERSION_HEX=0x403" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
2222
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -rdynamic -fvisibility=hidden
2323
CXXFLAGS += $(CFLAGS) -std=c++11
2424
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'
@@ -38,7 +38,7 @@ ifeq ($(CONFIG),Release)
3838
TARGET_ARCH := -march=native
3939
endif
4040

41-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
41+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.3" -D "JUCE_APP_VERSION_HEX=0x403" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
4242
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -rdynamic -fvisibility=hidden
4343
CXXFLAGS += $(CFLAGS) -std=c++11
4444
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'

‎Builds/Linux/Makefile.plugins‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ifeq ($(CONFIG),Debug)
2121
TARGET_ARCH := -march=native
2222
endif
2323

24-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
24+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
2525
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -std=c++11 -fPIC -rdynamic
2626
CXXFLAGS += $(CFLAGS)
2727
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 -fPIC -rdynamic
@@ -41,7 +41,7 @@ ifeq ($(CONFIG),Release)
4141
TARGET_ARCH := -march=native
4242
endif
4343

44-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
44+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
4545
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -fPIC -rdynamic
4646
CXXFLAGS += $(CFLAGS)
4747
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 -fPIC -rdynamic

‎Builds/MacOSX/Info-App.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<key>CFBundleSignature</key>
1919
<string>????</string>
2020
<key>CFBundleShortVersionString</key>
21-
<string>0.4.2.1</string>
21+
<string>0.4.3</string>
2222
<key>CFBundleVersion</key>
23-
<string>0.4.2.1</string>
23+
<string>0.4.3</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string>Open Ephys</string>
2626
<key>NSHighResolutionCapable</key>

‎Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@
131131
buildForAnalyzing = "YES">
132132
<BuildableReference
133133
BuildableIdentifier = "primary"
134-
BlueprintIdentifier = "E1F558741C9B1F920035F88B"
135-
BuildableName = "FilterNode.bundle"
136-
BlueprintName = "FilterNode"
137-
ReferencedContainer = "container:Plugins/FilterNode/FilterNode.xcodeproj">
134+
BlueprintIdentifier = "038981D21FA2EFB500D25D7A"
135+
BuildableName = "EvntTrigAvg.bundle"
136+
BlueprintName = "EvntTrigAvg"
137+
ReferencedContainer = "container:Plugins/EvntTrigAvg/EvntTrigAvg.xcodeproj">
138138
</BuildableReference>
139139
</BuildActionEntry>
140140
<BuildActionEntry
@@ -145,10 +145,10 @@
145145
buildForAnalyzing = "YES">
146146
<BuildableReference
147147
BuildableIdentifier = "primary"
148-
BlueprintIdentifier = "E14A22111DA80A9700134197"
149-
BuildableName = "JuliaProcessor.bundle"
150-
BlueprintName = "JuliaProcessor"
151-
ReferencedContainer = "container:Plugins/JuliaProcessor/JuliaProcessor.xcodeproj">
148+
BlueprintIdentifier = "E1F558741C9B1F920035F88B"
149+
BuildableName = "FilterNode.bundle"
150+
BlueprintName = "FilterNode"
151+
ReferencedContainer = "container:Plugins/FilterNode/FilterNode.xcodeproj">
152152
</BuildableReference>
153153
</BuildActionEntry>
154154
<BuildActionEntry
@@ -305,20 +305,6 @@
305305
ReferencedContainer = "container:Plugins/SerialInput/SerialInput.xcodeproj">
306306
</BuildableReference>
307307
</BuildActionEntry>
308-
<BuildActionEntry
309-
buildForTesting = "YES"
310-
buildForRunning = "YES"
311-
buildForProfiling = "YES"
312-
buildForArchiving = "YES"
313-
buildForAnalyzing = "YES">
314-
<BuildableReference
315-
BuildableIdentifier = "primary"
316-
BlueprintIdentifier = "0363EF941CF9D6F90077C530"
317-
BuildableName = "SpikeRaster.bundle"
318-
BlueprintName = "SpikeRaster"
319-
ReferencedContainer = "container:Plugins/SpikeRaster/SpikeRaster.xcodeproj">
320-
</BuildableReference>
321-
</BuildActionEntry>
322308
<BuildActionEntry
323309
buildForTesting = "YES"
324310
buildForRunning = "YES"
@@ -339,6 +325,7 @@
339325
buildConfiguration = "Debug"
340326
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
341327
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
328+
language = ""
342329
shouldUseLaunchSchemeArgsEnv = "YES">
343330
<Testables>
344331
</Testables>
@@ -358,6 +345,7 @@
358345
buildConfiguration = "Debug"
359346
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
360347
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
348+
language = ""
361349
launchStyle = "0"
362350
useCustomWorkingDirectory = "NO"
363351
ignoresPersistentStateOnLaunch = "NO"

‎Builds/MacOSX/Plugins/BinaryWriter/BinaryWriter.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
95FF1CA51FA30A040093371B /* NpyFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95FF1CA31FA30A040093371B /* NpyFile.cpp */; };
1011
E1D300381DAEBC570050E0F8 /* BinaryRecording.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1D300321DAEBC570050E0F8 /* BinaryRecording.cpp */; };
1112
E1D300391DAEBC570050E0F8 /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1D300351DAEBC570050E0F8 /* OpenEphysLib.cpp */; };
1213
E1D3003A1DAEBC570050E0F8 /* SequentialBlockFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1D300361DAEBC570050E0F8 /* SequentialBlockFile.cpp */; };
1314
/* End PBXBuildFile section */
1415

1516
/* Begin PBXFileReference section */
17+
95FF1CA31FA30A040093371B /* NpyFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NpyFile.cpp; sourceTree = "<group>"; };
18+
95FF1CA41FA30A040093371B /* NpyFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NpyFile.h; sourceTree = "<group>"; };
1619
E1D300281DAEBBBD0050E0F8 /* BinaryWriter.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BinaryWriter.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
1720
E1D3002B1DAEBBBD0050E0F8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1821
E1D300321DAEBC570050E0F8 /* BinaryRecording.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinaryRecording.cpp; sourceTree = "<group>"; };
@@ -65,6 +68,8 @@
6568
E1D300311DAEBC140050E0F8 /* Source */ = {
6669
isa = PBXGroup;
6770
children = (
71+
95FF1CA31FA30A040093371B /* NpyFile.cpp */,
72+
95FF1CA41FA30A040093371B /* NpyFile.h */,
6873
E1D300331DAEBC570050E0F8 /* BinaryRecording.h */,
6974
E1D300321DAEBC570050E0F8 /* BinaryRecording.cpp */,
7075
E1D300341DAEBC570050E0F8 /* FileMemoryBlock.h */,
@@ -156,6 +161,7 @@
156161
E1D300381DAEBC570050E0F8 /* BinaryRecording.cpp in Sources */,
157162
E1D300391DAEBC570050E0F8 /* OpenEphysLib.cpp in Sources */,
158163
E1D3003A1DAEBC570050E0F8 /* SequentialBlockFile.cpp in Sources */,
164+
95FF1CA51FA30A040093371B /* NpyFile.cpp in Sources */,
159165
);
160166
runOnlyForDeploymentPostprocessing = 0;
161167
};

0 commit comments

Comments
 (0)