Merge pull request #184 from kmichaelfox/testing

Fix bug with DataChannels and audio monitoring

Author: jsiegle

.gitignore

@@ -120,14 +120,36 @@ Builds/MacOSX/open-ephys.xcodeproj/*.pbxuser
 Builds/MacOSX/open-ephys.xcodeproj/xcuserdata
 Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace
 Builds/MacOSX/build
-Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.mode1v3
-Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.pbxuser
-Projucer/Builds/MacOSX/The Projucer.xcodeproj/xcuserdata
-Projucer/Builds/MacOSX/The Projucer.xcodeproj/project.xcworkspace
+Projucer/Builds/MacOSX/Projucer.xcodeproj/*.mode1v3
+Projucer/Builds/MacOSX/Projucer.xcodeproj/*.pbxuser
+Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
+Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
 Projucer/Builds/MacOSX/build
 Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
 Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
 
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+*default.perspectivev3
+xcuserdata/
+
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+
+PluginGenerator/Builds/MacOSX/OpenEphys_PluginGenerator.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+
 # 9. Plugin build dirs
 build/
 

Source/Processors/AudioNode/AudioNode.cpp

@@ -113,7 +113,11 @@ void AudioNode::addInputChannel(GenericProcessor* sourceNode, int chan)
 
     setPlayConfigDetails(channelIndex+1,0,44100.0,128);
 
-    dataChannelArray.add(new DataChannel(*sourceNode->getDataChannel(chan)));
+    auto dataChannel = sourceNode->getDataChannel(chan);
+    auto dataChannelCopy = new DataChannel(*dataChannel);
+    dataChannelCopy->setMonitored(dataChannel->isMonitored());
+    
+    dataChannelArray.add(dataChannelCopy);
 
 }
 
@@ -534,4 +538,4 @@ void Expander::process(float* sampleData, int numSamples)
 
         sampleData[i] = sampleData[i] * gain;
     }
-}
+}

Source/Processors/Channel/InfoObjects.cpp

@@ -683,4 +683,4 @@ void ConfigurationObject::setDefaultNameAndDescription()
 {
 	setName("Configuration Object");
 	setDescription("Generic configuration object");	
-}
+}

Source/Processors/Editors/ChannelSelector.cpp

@@ -655,19 +655,19 @@ void ChannelSelector::buttonClicked(Button* button)
             bool status = b->getToggleState();
 
          //   std::cout << "Requesting audio monitor for channel " << ch->nodeIndex + 1 << std::endl;
-
-            if (acquisitionIsActive) // use setParameter to change parameter safely
+            
+            // change parameter directly on editor
+            //     This is another of those ugly things that will go away once the
+            //     probe audio system is implemented, but is needed to maintain compatibility
+            //     between the older recording system and the newer channel objects.
+            const_cast<DataChannel*>(ch)->setMonitored(status);
+
+            
+            if (acquisitionIsActive) // use setParameter to change audio node's copy of parameter safely, if running
             {
                 AccessClass::getProcessorGraph()->
                 getAudioNode()->setChannelStatus(ch, status);
             }
-            else     // change parameter directly
-            {
-				//This is another of those ugly things that will go away once the
-				//probe audio system is implemented, but is needed to maintain compatibility
-				//between the older recording system and the newer channel objects.
-				const_cast<DataChannel*>(ch)->setMonitored(status);
-            }
         }
         else if (b->getType() == RECORD)
         {
@@ -680,9 +680,16 @@ void ChannelSelector::buttonClicked(Button* button)
 
             if (acquisitionIsActive) // use setParameter to change parameter safely
             {
-                AccessClass::getProcessorGraph()->
+                if ( AccessClass::getProcessorGraph()->
                 getRecordNode()->
-                setChannelStatus(ch, status);
+                setChannelStatus(ch, status) )
+                {
+                    const_cast<DataChannel*>(ch)->setRecordState(status);
+                }
+                
+                // make sure that the button matches the system's actual state, in case
+                // user's interaction was disallowed
+                b->setToggleState(const_cast<DataChannel*>(ch)->getRecordState(), dontSendNotification);
             }
             else     // change parameter directly
             {

Source/Processors/RecordNode/RecordNode.cpp

@@ -69,15 +69,16 @@ RecordNode::~RecordNode()
 
 void RecordNode::setChannel(const DataChannel* ch)
 {
-    int channelNum = dataChannelArray.indexOf(ch);
+//    int channelNum = dataChannelArray.indexOf(ch);
+    int channelNum = getDataChannelIndex(ch->getSourceIndex(), ch->getSourceNodeID(), ch->getSubProcessorIdx());
 
     std::cout << "Record node setting channel to " << channelNum << std::endl;
 
     setCurrentChannel(channelNum);
 
 }
 
-void RecordNode::setChannelStatus(const DataChannel* ch, bool status)
+bool RecordNode::setChannelStatus(const DataChannel* ch, bool status)
 {
 
     //std::cout << "Setting channel status!" << std::endl;
@@ -87,7 +88,8 @@ void RecordNode::setChannelStatus(const DataChannel* ch, bool status)
         setParameter(2, 1.0f);
     else
         setParameter(2, 0.0f);
-
+    
+    return status == dataChannelArray[currentChannel]->getRecordState();
 }
 
 
@@ -555,4 +557,4 @@ void RecordNode::updateRecordChannelIndexes()
 void RecordNode::addSpecialProcessorChannels(Array<EventChannel*>& channels)
 {
 	eventChannelArray.addArray(channels);
-}
+}

Source/Processors/RecordNode/RecordNode.h

@@ -106,8 +106,11 @@ class RecordNode : public GenericProcessor,
     /** Turns recording on and off for a particular channel.
 
         Channel numbers are absolute (based on RecordNode channel mapping).
+        
+        Returns a bool indicating whether the status update was successful (true)
+        or blocked (false) because recording is currently in progress.
     */
-    void setChannelStatus(const DataChannel* ch, bool status);
+    bool setChannelStatus(const DataChannel* ch, bool status);
 
     /** Used to clear all connections prior to the start of acquisition.
     */