Fix selected channels parameter bug

Author: jsiegle

Source/Processors/Editors/GenericEditor.cpp

@@ -1061,7 +1061,7 @@ Array<GenericEditor*> GenericEditor::getConnectedEditors()
 void GenericEditor::updateSelectedStream(uint16 streamId) 
 {
 
-    LOGDD(getNameAndId(), " updating selected stream to ", streamId);
+    LOGD(getNameAndId(), " updating selected stream to ", streamId);
 
     selectedStream = streamId;
 
@@ -1075,17 +1075,28 @@ void GenericEditor::updateSelectedStream(uint16 streamId)
 
         if (param == nullptr)
             continue;
+
+        //LOGD("Parameter: ", param->getName());
 
         if (param->getScope() == Parameter::GLOBAL_SCOPE)
         {
+            //LOGD("Global scope");
             ed->setParameter(getProcessor()->getParameter(ed->getParameterName()));
         }
         else if (param->getScope() == Parameter::STREAM_SCOPE)
         {
             if (streamAvailable)
-                ed->setParameter(getProcessor()->getDataStream(streamId)->getParameter(param->getName()));
+            {
+               //LOGD("Stream scope");
+                Parameter* p2 = getProcessor()->getDataStream(streamId)->getParameter(param->getName());
+                ed->setParameter(p2);
+            }
             else
+            {
+                //LOGD("Stream not available");
                 ed->setParameter(nullptr);
+            }
+                
         }
 
         ed->updateView();

Source/Processors/GenericProcessor/GenericProcessor.cpp

@@ -960,6 +960,8 @@ void GenericProcessor::update()
 
                         p2->setChannelCount(stream->getChannelCount());
                         p2->setDataStream(stream);
+                        //LOGD("GenericProcessor::update() Adding SelectedChannelsParameter to stream ", stream->getStreamId(), " with ", stream->getChannelCount(), " channels");
+
                         stream->addParameter(p2);
                     }
                     else if (param->getType() == Parameter::MASK_CHANNELS_PARAM)
@@ -987,10 +989,13 @@ void GenericProcessor::update()
                     {
                         SelectedChannelsParameter* p = (SelectedChannelsParameter*) stream->getParameter(param->getName());
                         p->setChannelCount(stream->getChannelCount());
+                        //LOGD("GenericProcessor::update() Setting SelectedChannelsParameter channel count for ", stream->getStreamId(), " to ", stream->getChannelCount(), " channels");
+
                     } else if (param->getType() == Parameter::MASK_CHANNELS_PARAM)
                     {
                         MaskChannelsParameter* p = (MaskChannelsParameter*) stream->getParameter(param->getName());
                         p->setChannelCount(stream->getChannelCount());
+
                     }
                }
             }
@@ -1005,6 +1010,8 @@ void GenericProcessor::update()
 
             if (index > -1)
             {
+                //LOGD("GenericProcessor::update() Copying savedDataStreamParameters for ", stream->getStreamId());
+
                 //std::cout << "COPYING STREAM PARAMETERS TO" << std::endl;
                 savedDataStreamParameters[index]->copyParametersTo(stream);
                 savedDataStreamParameters.remove(index);

Source/Processors/Parameter/ParameterCollection.cpp

@@ -92,6 +92,14 @@ void ParameterCollection::copyParameterValuesTo(InfoObject* obj)
 
 void ParameterCollection::copyParametersTo(InfoObject* obj)
 {
+    int channelCount = -1;
+    
+    if (obj->getType() == InfoObject::DATASTREAM_INFO)
+    {
+        DataStream* s = (DataStream*)obj;
+		channelCount = s->getChannelCount();
+    }
+    
     obj->parameters.clear();
 
     for (auto parameter : parameters)
@@ -117,13 +125,21 @@ void ParameterCollection::copyParametersTo(InfoObject* obj)
         else if (parameter->getType() == Parameter::SELECTED_CHANNELS_PARAM)
         {
             SelectedChannelsParameter* p = (SelectedChannelsParameter*) parameter;
+            
+            if (channelCount != -1)
+                p->setChannelCount(channelCount);
+
             obj->addParameter(new SelectedChannelsParameter(*p));
             setParameterOwner(p, obj);
 
         }
         else if (parameter->getType() == Parameter::MASK_CHANNELS_PARAM)
         {
             MaskChannelsParameter* p = (MaskChannelsParameter*) parameter;
+
+            if (channelCount != -1)
+                p->setChannelCount(channelCount);
+            
             obj->addParameter(new MaskChannelsParameter(*p));
             setParameterOwner(p, obj);
 
@@ -261,10 +277,17 @@ void ParameterCollection::copyParametersFrom(InfoObject* obj)
 
 void ParameterCollection::addParameter(Parameter* p)
 {
-    parameters.add(p);
-    
-    //std::cout << "Adding parameter to " << p->getStreamId() << ": " << p->getName() << std::endl;
+
+    if (parameterMap.find(p->getName()) != parameterMap.end()) {
+        for (int i = 0; i < parameters.size(); i++) {
+			if (parameters[i]->getName() == p->getName()) {
+				parameters.remove(i);
+				break;
+			}
+        }   
+    }
 
+    parameters.add(p);
     parameterMap[p->getName()] = p;
 }
 

Source/Processors/Settings/InfoObject.cpp

@@ -250,7 +250,6 @@ void InfoObject::copyParameters(InfoObject* object)
 
 void InfoObject::addParameter(Parameter* p)
 {
-     parameters.addParameter(p);
 
     if (getType() == InfoObject::DATASTREAM_INFO)
         p->setDataStream((DataStream*) this);
@@ -260,6 +259,8 @@ void InfoObject::addParameter(Parameter* p)
         p->setContinuousChannel((ContinuousChannel*) this);
     else if (getType() == InfoObject::EVENT_CHANNEL)
         p->setEventChannel((EventChannel*) this);
+
+    parameters.addParameter(p);
 }
 
 ChannelInfoObject::ChannelInfoObject(InfoObject::Type type, DataStream* dataStream)