Merge branch 'master' of https://github.com/open-ephys/GUI

Source/Processors/AudioNode.cpp

@@ -73,9 +73,12 @@ void AudioNode::resetConnections()
 
 void AudioNode::setChannel(Channel* ch)
 {
-	std::cout << "Audio node setting channel." << std::endl;
 
-	setCurrentChannel(channelPointers.indexOf(ch)+2);
+	int channelNum = channelPointers.indexOf(ch);
+
+	std::cout << "Audio node setting channel to " << channelNum << std::endl;
+
+	setCurrentChannel(channelNum);
 }
 
 void AudioNode::setChannelStatus(Channel* chan, bool status)
@@ -90,7 +93,7 @@ void AudioNode::setChannelStatus(Channel* chan, bool status)
 void AudioNode::enableCurrentChannel(bool state)
 {
 
-	setCurrentChannel(nextAvailableChannel);
+	//setCurrentChannel(nextAvailableChannel);
 
 	if (state)
 	{

Source/Processors/Editors/ChannelSelector.cpp

@@ -454,7 +454,7 @@ void ChannelSelector::buttonClicked(Button* button)
 			// get audio node, and inform it of the change
 			GenericEditor* editor = (GenericEditor*) getParentComponent();
 
-			Channel* ch = editor->getChannel(b->getChannel());
+			Channel* ch = editor->getChannel(b->getChannel()-1);
 			//int channelNum = editor->getStartChannel() + b->getChannel() - 1;
 			bool status = b->getToggleState();
 			
@@ -473,7 +473,7 @@ void ChannelSelector::buttonClicked(Button* button)
 			// get record node, and inform it of the change
 			GenericEditor* editor = (GenericEditor*) getParentComponent();
 
-			Channel* ch = editor->getChannel(b->getChannel());
+			Channel* ch = editor->getChannel(b->getChannel()-1);
 			//int channelNum = editor->getStartChannel() + b->getChannel() - 1;
 			bool status = b->getToggleState();
 

Source/Processors/RecordNode.cpp

@@ -52,9 +52,11 @@ RecordNode::~RecordNode() {
 void RecordNode::setChannel(Channel* ch)
 {
 
-	std::cout << "Record node setting channel." << std::endl;
+	int channelNum = channelPointers.indexOf(ch);
 
-	setCurrentChannel(channelPointers.indexOf(ch));
+	std::cout << "Record node setting channel to " << channelNum << std::endl;
+
+	setCurrentChannel(channelNum);
 
 	// for (int i = 0; i < con.size(); i++)
 	// {
@@ -136,12 +138,12 @@ void RecordNode::addInputChannel(GenericProcessor* sourceNode, int chan)
         channelPointers[channelIndex]->filename = filename;
         channelPointers[channelIndex]->file = 0;
 
-		if (channelPointers[channelIndex]->isRecording)
-			std::cout << "  This channel will be recorded." << std::endl;
-		else 
-			std::cout << "  This channel will NOT be recorded." << std::endl;
+		//if (channelPointers[channelIndex]->isRecording)
+		//	std::cout << "  This channel will be recorded." << std::endl;
+		//else 
+		//	std::cout << "  This channel will NOT be recorded." << std::endl;
 	
-		std::cout << "adding channel " << getNextChannel(false) << std::endl;
+		//std::cout << "adding channel " << getNextChannel(false) << std::endl;
 
 		//std::pair<int, Channel> newPair (getNextChannel(false), newChannel);