Skip to content

Commit 5b93b43

Browse files
aacuevasaacuevas
committed
Merge branch 'testing' into development
2 parents 537bfff + d227ee1 commit 5b93b43

16 files changed

Lines changed: 3553 additions & 4657 deletions

File tree

‎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 "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.4" -D "JUCE_APP_VERSION_HEX=0x404" -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.4.1" -D "JUCE_APP_VERSION_HEX=0x40401" -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 "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.4" -D "JUCE_APP_VERSION_HEX=0x404" -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.4.1" -D "JUCE_APP_VERSION_HEX=0x40401" -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/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.4</string>
21+
<string>0.4.4.1</string>
2222
<key>CFBundleVersion</key>
23-
<string>0.4.4</string>
23+
<string>0.4.4.1</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string>Open Ephys</string>
2626
<key>NSHighResolutionCapable</key>

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

Lines changed: 3481 additions & 4576 deletions
Large diffs are not rendered by default.

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
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.31101.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
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE917D74-FAF2-41E9-BE61-CD40C62EB7D0}"
86
ProjectSection(SolutionItems) = preProject
@@ -12,25 +10,17 @@ EndProject
1210
Global
1311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1412
Debug|Win32 = Debug|Win32
15-
Debug|x64 = Debug|x64
16-
Debug64|Win32 = Debug64|Win32
17-
Debug64|x64 = Debug64|x64
1813
Release|Win32 = Release|Win32
19-
Release|x64 = Release|x64
20-
Release64|Win32 = Release64|Win32
14+
Debug64|x64 = Debug64|x64
2115
Release64|x64 = Release64|x64
2216
EndGlobalSection
2317
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2418
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
2519
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
26-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
27-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
28-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
29-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
3020
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
3121
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
32-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
33-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
22+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
23+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
3424
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
3525
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
3626
EndGlobalSection

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
<ClCompile>
8585
<Optimization>Disabled</Optimization>
8686
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
87-
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
87+
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4.1;JUCE_APP_VERSION_HEX=0x40401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9090
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9191
<PrecompiledHeader/>
@@ -130,8 +130,8 @@
130130
</Midl>
131131
<ClCompile>
132132
<Optimization>Full</Optimization>
133-
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4.1;JUCE_APP_VERSION_HEX=0x40401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135135
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
136136
<RuntimeTypeInfo>true</RuntimeTypeInfo>
137137
<PrecompiledHeader/>
@@ -178,8 +178,8 @@
178178
<ClCompile>
179179
<Optimization>Disabled</Optimization>
180180
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
181-
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181+
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4.1;JUCE_APP_VERSION_HEX=0x40401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183183
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
184184
<RuntimeTypeInfo>true</RuntimeTypeInfo>
185185
<PrecompiledHeader/>
@@ -222,8 +222,8 @@
222222
</Midl>
223223
<ClCompile>
224224
<Optimization>Full</Optimization>
225-
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
225+
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4.1;JUCE_APP_VERSION_HEX=0x40401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227227
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
228228
<RuntimeTypeInfo>true</RuntimeTypeInfo>
229229
<PrecompiledHeader/>

‎Builds/VisualStudio2013/resources.rc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
#include <windows.h>
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 0,4,4,0
10+
FILEVERSION 0,4,4,1
1111
BEGIN
1212
BLOCK "StringFileInfo"
1313
BEGIN
1414
BLOCK "040904E4"
1515
BEGIN
1616
VALUE "CompanyName", "Open Ephys\0"
1717
VALUE "FileDescription", "open-ephys\0"
18-
VALUE "FileVersion", "0.4.4\0"
18+
VALUE "FileVersion", "0.4.4.1\0"
1919
VALUE "ProductName", "open-ephys\0"
20-
VALUE "ProductVersion", "0.4.4\0"
20+
VALUE "ProductVersion", "0.4.4.1\0"
2121
END
2222
END
2323

‎JuceLibraryCode/JuceHeader.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
namespace ProjectInfo
4343
{
4444
const char* const projectName = "open-ephys";
45-
const char* const versionString = "0.4.4";
46-
const int versionNumber = 0x404;
45+
const char* const versionString = "0.4.4.1";
46+
const int versionNumber = 0x40401;
4747
}
4848
#endif
4949

‎Source/Plugins/EventBroadcaster/EventBroadcaster.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ int EventBroadcaster::setListeningPort(int port, bool forceRestart)
189189
return 0;
190190
#endif
191191
}
192-
return 0; // CJB added
192+
return -1;
193193
}
194194

195195

‎Source/Processors/AudioNode/AudioNode.cpp‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,16 @@ void AudioNode::updateBufferSize()
7575
void AudioNode::setChannel(const DataChannel* ch)
7676
{
7777

78-
int channelNum = getDataChannelIndex(ch->getSourceIndex(), ch->getSourceNodeID(), ch->getSubProcessorIdx());
78+
int channelNum;
79+
80+
try
81+
{
82+
channelNum = audioDataChannelMap.at(ch->getCurrentNodeID()).at(ch->getCurrentNodeChannelIdx());
83+
}
84+
catch (...)
85+
{
86+
channelNum = -1;
87+
}
7988

8089
std::cout << "Audio node setting channel to " << channelNum << std::endl;
8190

@@ -254,7 +263,7 @@ void AudioNode::process(AudioSampleBuffer& buffer)
254263

255264
for (int i = 0; i < buffer.getNumChannels()-2; i++) // cycle through them all
256265
{
257-
266+
258267
if (dataChannelArray[i]->isMonitored())
259268
{
260269
tempBuffer->clear();
@@ -481,6 +490,14 @@ void AudioNode::updateRecordChannelIndexes()
481490
{
482491
//Keep the nodeIDs of the original processor from each channel comes from
483492
updateChannelIndexes(false);
493+
//and update the internal map
494+
audioDataChannelMap.clear();
495+
unsigned int nChans = dataChannelArray.size();
496+
for (int i = 0; i < nChans; i++)
497+
{
498+
DataChannel* ch = dataChannelArray[i];
499+
audioDataChannelMap[ch->getCurrentNodeID()][ch->getCurrentNodeChannelIdx()] = i;
500+
}
484501
}
485502

486503
// ==========================================================

‎Source/Processors/AudioNode/AudioNode.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ class AudioNode : public GenericProcessor
161161
// Temporary buffer for data
162162
ScopedPointer<AudioSampleBuffer> tempBuffer;
163163

164+
//private map for datachannels with info relative to multiple processors
165+
std::unordered_map<uint16, std::map<uint16, int>> audioDataChannelMap;
166+
164167
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AudioNode);
165168

166169
};

0 commit comments

Comments
 (0)