Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/*.pbxuser
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/xcuserdata
Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.xcworkspace
Introjucer/Builds/MacOSX/build
Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace

# 9. Plugin build dirs
build/
Expand Down
1 change: 0 additions & 1 deletion Builds/MacOSX/Plugins/Config/Plugin.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ DEBUG_INFORMATION_FORMAT = dwarf
ENABLE_STRICT_OBJC_MSGSEND = YES
GCC_C_LANGUAGE_STANDARD = c99
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
GCC_INLINES_ARE_PRIVATE_EXTERN = YES
GCC_NO_COMMON_BLOCKS = YES
GCC_OPTIMIZATION_LEVEL = 3
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) OEPLUGIN JUCER_XCODE_MAC_F6D2F4CF=1 JUCE_APP_VERSION=0.4.1 JUCE_APP_VERSION_HEX=0x401
Expand Down
1 change: 1 addition & 0 deletions Builds/MacOSX/Plugins/Config/Plugin_Debug.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

ENABLE_TESTABILITY = YES
GCC_DYNAMIC_NO_PIC = NO
GCC_INLINES_ARE_PRIVATE_EXTERN = NO
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG=1 _DEBUG=1
MTL_ENABLE_DEBUG_INFO = YES
ONLY_ACTIVE_ARCH = YES
17 changes: 9 additions & 8 deletions Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,7 @@
9069CE21141F5A4C5721BCF3,
65F4459CC1832883FFF6C166,
9069CE21141F5A4C5721BCF3, ); name = "juce_audio_devices"; sourceTree = "<group>"; };
43D700D1965DF684964ACAE6 = {isa = PBXGroup; children = (
217479BAEDCDC02C29C466EB = {isa = PBXGroup; children = (
B47FEE41896F01CE6EB42B36,
92A6643073EB8E38F6BBD39C,
30B1B20F186FC5FBA93D4C90,
Expand All @@ -2037,15 +2037,15 @@
9493FB479E4B4FA2D5C86724,
BE15A2B0B537B5CC343EF6F9,
63E801199DEC51DCFBB61890, ); name = private; sourceTree = "<group>"; };
81ED6AB2A5472FC995B6653F = {isa = PBXGroup; children = (
35E22AE46A6F6A700C3B3D94 = {isa = PBXGroup; children = (
AC91C85D2437C7D1286AFAAB,
D1B150DF1455287F67E629B2,
FE88B876367616EBFEA00713, ); name = protected; sourceTree = "<group>"; };
178CBDC0FAC7D537E3CC7E78 = {isa = PBXGroup; children = (
43D700D1965DF684964ACAE6,
81ED6AB2A5472FC995B6653F, ); name = include; sourceTree = "<group>"; };
DC301071305052CAAA2F0AB6 = {isa = PBXGroup; children = (
178CBDC0FAC7D537E3CC7E78,
17A7656AF0E66E5C7AD93D8E = {isa = PBXGroup; children = (
217479BAEDCDC02C29C466EB,
35E22AE46A6F6A700C3B3D94, ); name = include; sourceTree = "<group>"; };
2FC2E6E13664F64828C03461 = {isa = PBXGroup; children = (
17A7656AF0E66E5C7AD93D8E,
AD9B515651FF2143CA089351,
6C12F08C8B6CBD125DC897AF,
5F8BCA4580A738F645A05D8A,
Expand All @@ -2062,7 +2062,7 @@
D45F7C723822356F362B8262,
AF2216C76163EB0A76390FE9, ); name = libFLAC; sourceTree = "<group>"; };
1EA82693D5711953C949B39F = {isa = PBXGroup; children = (
DC301071305052CAAA2F0AB6,
2FC2E6E13664F64828C03461,
C68F078AF94886343CBF6DAD,
18ADA4B7F8ABC14FC3ABCD39,
BFD1914F80C897BF775D7C92,
Expand Down Expand Up @@ -3340,6 +3340,7 @@
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = (
"_DEBUG=1",
Expand Down
4 changes: 2 additions & 2 deletions PluginGenerator/JuceLibraryCode/BinaryData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ static const unsigned char temp_binary_data_6[] =
" #include <Windows.h>\n"
" #define EXPORT __declspec(dllexport)\n"
"#else\n"
" #define EXPORT\n"
" #define EXPORT __attribute__((visibility(\"default\")))\n"
"#endif\n"
"\n"
"using namespace Plugin;\n"
Expand Down Expand Up @@ -6076,7 +6076,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
case 0x9a9516bc: numBytes = 1817; return openEphys_DataThreadPluginTemplate_h;
case 0xd768da9a: numBytes = 1487; return openEphys_FileSourcePluginTemplate_cpp;
case 0xdc872b1f: numBytes = 1450; return openEphys_FileSourcePluginTemplate_h;
case 0x354e9a48: numBytes = 4216; return openEphys_OpenEphysLibTemplate_cpp;
case 0x354e9a48: numBytes = 4255; return openEphys_OpenEphysLibTemplate_cpp;
case 0xbf9557ba: numBytes = 923; return openEphys_PluginMakefile_example;
case 0x0d98caa2: numBytes = 2993; return openEphys_ProcessorContentComponentTemplate_cpp;
case 0x20837d27: numBytes = 2348; return openEphys_ProcessorContentComponentTemplate_h;
Expand Down
2 changes: 1 addition & 1 deletion PluginGenerator/JuceLibraryCode/BinaryData.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace BinaryData
const int openEphys_FileSourcePluginTemplate_hSize = 1450;

extern const char* openEphys_OpenEphysLibTemplate_cpp;
const int openEphys_OpenEphysLibTemplate_cppSize = 4216;
const int openEphys_OpenEphysLibTemplate_cppSize = 4255;

extern const char* openEphys_PluginMakefile_example;
const int openEphys_PluginMakefile_exampleSize = 923;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/ArduinoOutput/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/BasicSpikeDisplay/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/BinaryWriter/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif


Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/CAR/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/ChannelMappingNode/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/EcubeSource/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/EventBroadcaster/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/FilterNode/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/JuliaProcessor/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/KWIKFormat/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif


Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/LfpDisplayNode/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/LfpDisplayNodeBeta/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/NetworkEvents/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/PCIeRhythm/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/PhaseDetector/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/PulsePalOutput/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/RecordControl/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/Rectifier/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/SerialInput/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/SpikeRaster/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/SpikeSorter/OpenEphysLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <Windows.h>
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#define EXPORT __attribute__((visibility("default")))
#endif

using namespace Plugin;
Expand Down
3 changes: 2 additions & 1 deletion Source/Processors/RecordNode/OriginalRecording.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@ void OriginalRecording::writeContinuousBuffer(const float* data, int nSamples, i
//std::cout << channel << " : " << nSamples << " : " << count << std::endl;

jassert(count == nSamples); // make sure all the data was written
(void)count; // Suppress unused variable warning in release builds

diskWriteLock.exit();

Expand Down Expand Up @@ -719,4 +720,4 @@ RecordEngineManager* OriginalRecording::getEngineManager()
param = new EngineParameter(EngineParameter::STR, 2, "Renamed files prefix", "CH");
man->addParameter(param);
return man;
}
}
2 changes: 1 addition & 1 deletion open-ephys.jucer
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
osxSDK="default" osxCompatibility="10.9 SDK" osxArchitecture="default"
headerPath="JuceLibraryCode/" libraryPath="" defines=""/>
headerPath="JuceLibraryCode/" libraryPath="" defines="" customXcodeFlags="GCC_INLINES_ARE_PRIVATE_EXTERN = NO"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="open-ephys"
osxSDK="default" osxCompatibility="10.9 SDK" osxArchitecture="default"
headerPath="JuceLibraryCode/" libraryPath="" defines=""/>
Expand Down