From 3b6a8a1c0ae3e04e22726bf3db4bad566359a2cf Mon Sep 17 00:00:00 2001
From: Christopher Stawarz <cstawarz@mit.edu>
Date: Thu, 24 Sep 2015 10:25:25 -0400
Subject: [PATCH] Removed duplicate/conflicting definitions of
 MAX_NUM_DATA_STREAMS

---
 Source/Processors/DataThreads/EcubeThread.h   | 2 --
 Source/Processors/DataThreads/RHD2000Thread.h | 1 -
 2 files changed, 3 deletions(-)

diff --git a/Source/Processors/DataThreads/EcubeThread.h b/Source/Processors/DataThreads/EcubeThread.h
index 481cff3da..4c33915b5 100644
--- a/Source/Processors/DataThreads/EcubeThread.h
+++ b/Source/Processors/DataThreads/EcubeThread.h
@@ -35,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "DataThread.h"
 #include "../GenericProcessor/GenericProcessor.h"
 
-#define MAX_NUM_DATA_STREAMS 8
-
 class SourceNode;
 
 #if JUCE_WINDOWS
diff --git a/Source/Processors/DataThreads/RHD2000Thread.h b/Source/Processors/DataThreads/RHD2000Thread.h
index bc774a300..e60296ee4 100644
--- a/Source/Processors/DataThreads/RHD2000Thread.h
+++ b/Source/Processors/DataThreads/RHD2000Thread.h
@@ -43,7 +43,6 @@
 #define MAX_NUM_DATA_STREAMS_USB3 16
 #define MAX_NUM_HEADSTAGES 8
 
-#define MAX_NUM_DATA_STREAMS(u3) (u3 ? MAX_NUM_DATA_STREAMS_USB3 : MAX_NUM_DATA_STREAMS_USB2)
 #define MAX_NUM_CHANNELS MAX_NUM_DATA_STREAMS_USB3*35
 
 class SourceNode;
-- 
GitLab