Fix build errors

open-ephys · Aug 9, 2023 · d658945 · d658945
1 parent ca4165e
commit d658945
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/Processors/Parameter/Parameter.cpp b/Source/Processors/Parameter/Parameter.cpp
@@ -900,7 +900,7 @@ void SelectedStreamParameter::toXml(XmlElement* xml)
 void SelectedStreamParameter::fromXml(XmlElement* xml)
 {
  int loadValue = xml->getIntAttribute(getName(), defaultValue);
- currentValue = loadValue < streamNames.size() ? loadValue : defaultValue;
+ currentValue = loadValue < streamNames.size() ? (var)loadValue : defaultValue;
 }
 
 TimeParameter::TimeParameter(ParameterOwner* owner,

diff --git a/Source/Processors/Parameter/ParameterCollection.cpp b/Source/Processors/Parameter/ParameterCollection.cpp
@@ -266,23 +266,23 @@ void ParameterCollection::copyParametersFrom(ParameterOwner* pOwner)
  //if (s->hasDevice())
  // owner.deviceName = s->device->getName();
  }
- else if (pOwner->getType() == InfoObject::CONTINUOUS_CHANNEL)
+ else if (pOwner->getType() == ParameterOwner::CONTINUOUS_CHANNEL)
  {
  ContinuousChannel* s = (ContinuousChannel*)pOwner;
  owner.sample_rate = s->getSampleRate();
  owner.streamId = s->getStreamId();
  owner.name = s->getName();
  owner.sourceNodeId = s->getSourceNodeId();
  }
- else if (pOwner->getType() == InfoObject::SPIKE_CHANNEL)
+ else if (pOwner->getType() == ParameterOwner::SPIKE_CHANNEL)
  {
  SpikeChannel* s = (SpikeChannel*)pOwner;
  owner.sample_rate = s->getSampleRate();
  owner.streamId = s->getStreamId();
  owner.name = s->getName();
  owner.sourceNodeId = s->getSourceNodeId();
  }
- else if (pOwner->getType() == InfoObject::EVENT_CHANNEL)
+ else if (pOwner->getType() == ParameterOwner::EVENT_CHANNEL)
  {
  EventChannel* s = (EventChannel*)pOwner;
  owner.sample_rate = s->getSampleRate();