Remove public access to demod internal state vars and clean-up improper use

This commit is contained in:
Charles J. Cliffe
2015-02-02 18:24:04 -05:00
parent 48399ccc68
commit b4e4f3017f
5 changed files with 7 additions and 12 deletions
-4
View File
@@ -91,10 +91,6 @@ DemodulatorThreadCommandQueue *DemodulatorInstance::getCommandQueue() {
return threadQueueCommand;
}
DemodulatorThreadParameters &DemodulatorInstance::getParams() {
return demodulatorPreThread->getParams();
}
void DemodulatorInstance::terminate() {
std::cout << "Terminating demodulator audio thread.." << std::endl;
audioThread->terminate();
-1
View File
@@ -36,7 +36,6 @@ public:
void setVisualOutputQueue(DemodulatorThreadOutputQueue *tQueue);
DemodulatorThreadCommandQueue *getCommandQueue();
DemodulatorThreadParameters &getParams();
void run();
void terminate();
+2 -2
View File
@@ -70,8 +70,8 @@ std::vector<DemodulatorInstance *> *DemodulatorMgr::getDemodulatorsAt(long long
for (int i = 0, iMax = demods.size(); i < iMax; i++) {
DemodulatorInstance *testDemod = demods[i];
long long freqTest = testDemod->getParams().frequency;
long long bandwidthTest = testDemod->getParams().bandwidth;
long long freqTest = testDemod->getFrequency();
long long bandwidthTest = testDemod->getBandwidth();
long long halfBandwidthTest = bandwidthTest / 2;
long long halfBuffer = bandwidth / 2;