In the process of switching to channel-based settings

Builds/Linux/Makefile

@@ -63,6 +63,7 @@ OBJECTS := \
   $(OBJDIR)/RootFinder_239a995f.o \
   $(OBJDIR)/State_22979684.o \
   $(OBJDIR)/AudioComponent_521bd9c9.o \
+  $(OBJDIR)/Channel_33a3e5fe.o \
   $(OBJDIR)/ofArduino_12f202a5.o \
   $(OBJDIR)/ofSerial_c3b0a9e1.o \
   $(OBJDIR)/EventDetector_4807aa7b.o \
@@ -253,6 +254,11 @@ $(OBJDIR)/AudioComponent_521bd9c9.o: ../../Source/Audio/AudioComponent.cpp
 	@echo "Compiling AudioComponent.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/Channel_33a3e5fe.o: ../../Source/Processors/Channel.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling Channel.cpp"
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 $(OBJDIR)/ofArduino_12f202a5.o: ../../Source/Processors/Serial/ofArduino.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling ofArduino.cpp"

Builds/VisualStudio2010/open-ephys.sln

-Microsoft Visual Studio Solution File, Format Version 11.00
-Project("{8FA1AFF1-2558-DDD8-66E3-3288408D9CDF}") = "open-ephys", "open-ephys.vcxproj", "{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Debug|Win32.Build.0 = Debug|Win32
-		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Release|Win32.ActiveCfg = Release|Win32
-		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+Project("{8FA1AFF1-2558-DDD8-66E3-3288408D9CDF}") = "open-ephys", "open-ephys.vcxproj", "{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Debug|Win32.Build.0 = Debug|Win32
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Release|Win32.ActiveCfg = Release|Win32
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Source/Processors/AudioNode.h

@@ -59,7 +59,7 @@ public:
 
   void setChannelStatus(int, bool);
 
-  bool isAudioOrRecordNode() {return true;}
+ // bool isAudioOrRecordNode() {return true;}
 
   void enableCurrentChannel(bool);
 

Source/Processors/GenericProcessor.cpp

@@ -284,15 +284,12 @@ void GenericProcessor::setDestNode(GenericProcessor* dn)
 
 void GenericProcessor::clearSettings()
 {
-	settings.originalSource = 0;
-	settings.numInputs = 0;
-	settings.numOutputs = 0;
-	settings.inputChannelNames.clear();
-	settings.outputChannelNames.clear();
-	settings.bitVolts.clear();
-	settings.eventChannelIds.clear();
-	settings.eventChannelNames.clear();
-	settings.eventChannelTypes.clear();
+	originalSource = 0;
+	numInputs = 0;
+	numOutputs = 0;
+
+	channels.clear();
+
 }
 
 void GenericProcessor::update()
@@ -356,18 +353,18 @@ bool GenericProcessor::audioStatus(int chan)
 
 }
 
-void GenericProcessor::generateDefaultChannelNames(StringArray& names)
-{
-	names.clear();
+// void GenericProcessor::generateDefaultChannelNames(StringArray& names)
+// {
+// 	names.clear();
 
-	for (int i = 0; i < settings.numOutputs; i++)
-	{
-		String channelName = "CH";
-		channelName += (i+1);
-		names.add(channelName);
-	}
+// 	for (int i = 0; i < settings.numOutputs; i++)
+// 	{
+// 		String channelName = "CH";
+// 		channelName += (i+1);
+// 		names.add(channelName);
+// 	}
 
-}
+// }
 
 
 int GenericProcessor::checkForEvents(MidiBuffer& midiMessages)

Source/Processors/GenericProcessor.h

@@ -41,6 +41,7 @@ class DataViewport;
 class UIComponent;
 class GenericEditor;
 class Parameter;
+class Channel;
 
 /**
   
@@ -215,34 +216,42 @@ public:
 	virtual GenericEditor* getEditor() {return editor;}
 	ScopedPointer<GenericEditor> editor;
 
-	struct ProcessorSettings {
+	GenericProcessor* originalSource;
 
-		GenericProcessor* originalSource;
+	OwnedArray<Channel*> channels;
 
-		int numInputs;
-		int numOutputs;
-		StringArray inputChannelNames;
-		StringArray outputChannelNames;
+	int numInputs;
+	int numOutputs;
 
-		float sampleRate;
-		Array<float> bitVolts;
+	// OBSOLETE PROCESSOR SETTINGS:
+	// struct ProcessorSettings {
 
-		Array<int> eventChannelIds;
-		StringArray eventChannelNames;
-		Array<int> eventChannelTypes;
+	// 	GenericProcessor* originalSource;
 
-	};
+	// 	int numInputs;
+	// 	int numOutputs;
+	// 	StringArray inputChannelNames;
+	// 	StringArray outputChannelNames;
 
-	ProcessorSettings settings;
+	// 	float sampleRate;
+	// 	Array<float> bitVolts;
 
-	virtual bool isAudioOrRecordNode() {return false;}
+	// 	Array<int> eventChannelIds;
+	// 	StringArray eventChannelNames;
+	// 	Array<int> eventChannelTypes;
 
-	virtual bool recordStatus (int chan);
-	virtual bool audioStatus (int chan);
+	// };
+
+	//ProcessorSettings settings;
+
+	//virtual bool isAudioOrRecordNode() {return false;}
+
+	//virtual bool recordStatus (int chan);
+	//virtual bool audioStatus (int chan);
 
 	virtual void clearSettings();
 
-	virtual void generateDefaultChannelNames(StringArray&);
+	//virtual void generateDefaultChannelNames(StringArray&);
 
 	virtual void update(); // default node updating
 	virtual void updateSettings() {} // custom node updating

Source/Processors/RecordNode.h

@@ -94,7 +94,7 @@ public:
 
   /** Overrides implementation by GenericProcessor.
   */
-  bool isAudioOrRecordNode() {return true;}
+ // bool isAudioOrRecordNode() {return true;}
 
   /** Callback to indicate when user has chosen a new data directory.
   */

open-ephys.jucer

@@ -193,6 +193,8 @@
               file="Source/Audio/AudioComponent.h"/>
       </GROUP>
       <GROUP id="yQmqZWk" name="Processors">
+        <FILE id="oYWM1J" name="Channel.cpp" compile="1" resource="0" file="Source/Processors/Channel.cpp"/>
+        <FILE id="oBVEMRc" name="Channel.h" compile="0" resource="0" file="Source/Processors/Channel.h"/>
         <GROUP id="gFSbZKw" name="Serial">
           <FILE id="3t2ez3c" name="ofArduino.cpp" compile="1" resource="0" file="Source/Processors/Serial/ofArduino.cpp"/>
           <FILE id="bXASAoT" name="ofArduino.h" compile="0" resource="0" file="Source/Processors/Serial/ofArduino.h"/>