GL context init fixes and warning cleanup

This commit is contained in:
Charles J. Cliffe
2015-01-20 19:13:49 -05:00
parent 3b23813e7b
commit 4dad30e9bd
12 changed files with 33 additions and 20 deletions
-1
View File
@@ -292,7 +292,6 @@ void DemodulatorInstance::setFrequency(long long freq) {
command.llong_value = freq;
threadQueueCommand->push(command);
}
demodulatorPreThread->getParams().bandwidth;
}
long long DemodulatorInstance::getFrequency() {
+8
View File
@@ -100,6 +100,8 @@ void DemodulatorPreThread::threadMain() {
case DemodulatorThreadCommand::DEMOD_THREAD_CMD_SET_FREQUENCY:
params.frequency = command.llong_value;
break;
default:
break;
}
}
}
@@ -227,6 +229,8 @@ void DemodulatorPreThread::threadMain() {
params.bandwidth = result.bandwidth;
params.sampleRate = result.sampleRate;
break;
default:
break;
}
}
@@ -243,6 +247,10 @@ void DemodulatorPreThread::threadMain() {
tCmd.context = this;
threadQueueNotify->push(tCmd);
std::cout << "Demodulator preprocessor thread done." << std::endl;
#ifdef __APPLE__
return this;
#endif
}
void DemodulatorPreThread::terminate() {
+4
View File
@@ -410,6 +410,10 @@ void DemodulatorThread::threadMain() {
tCmd.context = this;
threadQueueNotify->push(tCmd);
std::cout << "Demodulator thread done." << std::endl;
#ifdef __APPLE__
return this;
#endif
}
void DemodulatorThread::setVisualOutputQueue(DemodulatorThreadOutputQueue *tQueue) {
+2
View File
@@ -27,6 +27,8 @@ void DemodulatorWorkerThread::threadMain() {
filterChanged = true;
filterCommand = command;
break;
default:
break;
}
done = commandQueue->empty();
}