comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-12 18:58:46 -04:00
Code Issues Projects Releases Wiki Activity

Basic cleanup / mutex additions / bulk demod add

Browse Source
This commit is contained in:
Charles J. Cliffe
2016-05-31 19:58:37 -04:00
parent a75faaf4f2
commit c1863d9319
8 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AppFrame.cpp
+5 -5
View File
@@ -1627,6 +1627,7 @@ bool AppFrame::loadSession(std::string fileName) {
int numDemodulators = 0;
DemodulatorInstance *loadedDemod = NULL;
DemodulatorInstance *newDemod = NULL;
std::vector<DemodulatorInstance *> demodsLoaded;
while (demodulators->hasAnother("demodulator")) {
DataNode *demod = demodulators->getNext("demodulator");
@@ -1727,8 +1728,9 @@ bool AppFrame::loadSession(std::string fileName) {
}
newDemod->run();
newDemod->setActive(false);
wxGetApp().bindDemodulator(newDemod);
newDemod->setActive(true);
demodsLoaded.push_back(newDemod);
// wxGetApp().bindDemodulator(newDemod);
std::cout << "\tAdded demodulator at frequency " << freq << " type " << type << std::endl;
std::cout << "\t\tBandwidth: " << bandwidth << std::endl;
@@ -1740,9 +1742,7 @@ bool AppFrame::loadSession(std::string fileName) {
DemodulatorInstance *focusDemod = loadedDemod?loadedDemod:newDemod;
if (focusDemod) {
focusDemod->setActive(true);
focusDemod->setFollow(true);
focusDemod->setTracking(true);
wxGetApp().bindDemodulators(&demodsLoaded);
wxGetApp().getDemodMgr().setActiveDemodulator(focusDemod, false);
}
} catch (DataInvalidChildException &e) {