Merge pull request #711 from cjcliffe/vso_dataelement_rework

Tentative fix for #760
cjcliffe · Mar 2, 2019 · 792bf20 · 792bf20
2 parents b0505b0 + 44a9274
commit 792bf20
Show file tree

Hide file tree

Showing 3 changed files with 507 additions and 1,014 deletions.
diff --git a/src/demod/DemodulatorMgr.cpp b/src/demod/DemodulatorMgr.cpp
@@ -485,7 +485,7 @@ DemodulatorInstancePtr DemodulatorMgr::loadInstance(DataNode *node) {
 
     DataNode *demodTypeNode = node->hasAnother("type")?node->getNext("type"):nullptr;
 
-    if (demodTypeNode && demodTypeNode->element()->getDataType() == DATA_INT) {
+    if (demodTypeNode && demodTypeNode->element()->getDataType() == DataElement::DATA_INT) {
         int legacyType = *demodTypeNode;
         int legacyStereo = node->hasAnother("stereo") ? (int) *node->getNext("stereo") : 0;
         switch (legacyType) {   // legacy demod ID
@@ -507,7 +507,7 @@ DemodulatorInstancePtr DemodulatorMgr::loadInstance(DataNode *node) {
             case 16: type = "I/Q"; break;
             default: type = "FM"; break;
         }
-    } else if (demodTypeNode && demodTypeNode->element()->getDataType() == DATA_STRING) {
+    } else if (demodTypeNode && demodTypeNode->element()->getDataType() == DataElement::DATA_STRING) {
         demodTypeNode->element()->get(type);
     }