comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-03 21:57:51 -04:00
Code Issues Projects Releases Wiki Activity

comment out some noisy stdout logging until there's a proper facility for log outputs

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-06-02 19:45:34 -04:00
parent 99f7beba49
commit 6d63d570aa
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppFrame.cpp
View File

@ -1741,7 +1741,7 @@ bool AppFrame::loadSession(std::string fileName) {
demodsLoaded.push_back(newDemod); demodsLoaded.push_back(newDemod);
// wxGetApp().bindDemodulator(newDemod); // wxGetApp().bindDemodulator(newDemod);
// std::cout << "\tAdded demodulator at frequency " << freq << " type " << type << std::endl; std::cout << "\tAdded demodulator at frequency " << newDemod->getFrequency() << " type " << type << std::endl;
// std::cout << "\t\tBandwidth: " << bandwidth << std::endl; // std::cout << "\t\tBandwidth: " << bandwidth << std::endl;
// std::cout << "\t\tSquelch Level: " << squelch_level << std::endl; // std::cout << "\t\tSquelch Level: " << squelch_level << std::endl;
// std::cout << "\t\tSquelch Enabled: " << (squelch_enabled ? "true" : "false") << std::endl; // std::cout << "\t\tSquelch Enabled: " << (squelch_enabled ? "true" : "false") << std::endl;

6
src/audio/AudioThread.cpp
View File

@ -368,7 +368,7 @@ void AudioThread::run() {
pthread_setschedparam(tID, SCHED_RR, &prio); pthread_setschedparam(tID, SCHED_RR, &prio);
#endif #endif
std::cout << "Audio thread initializing.." << std::endl; // std::cout << "Audio thread initializing.." << std::endl;
if (dac.getDeviceCount() < 1) { if (dac.getDeviceCount() < 1) {
std::cout << "No audio devices found!" << std::endl; std::cout << "No audio devices found!" << std::endl;
@ -377,7 +377,7 @@ void AudioThread::run() {
setupDevice((outputDevice.load() == -1) ? (dac.getDefaultOutputDevice()) : outputDevice.load()); setupDevice((outputDevice.load() == -1) ? (dac.getDefaultOutputDevice()) : outputDevice.load());
std::cout << "Audio thread started." << std::endl; // std::cout << "Audio thread started." << std::endl;
inputQueue = static_cast<AudioThreadInputQueue *>(getInputQueue("AudioDataInput")); inputQueue = static_cast<AudioThreadInputQueue *>(getInputQueue("AudioDataInput"));
threadQueueNotify = static_cast<DemodulatorThreadCommandQueue*>(getOutputQueue("NotifyQueue")); threadQueueNotify = static_cast<DemodulatorThreadCommandQueue*>(getOutputQueue("NotifyQueue"));
@ -414,7 +414,7 @@ void AudioThread::run() {
tCmd.context = this; tCmd.context = this;
threadQueueNotify->push(tCmd); threadQueueNotify->push(tCmd);
} }
std::cout << "Audio thread done." << std::endl; // std::cout << "Audio thread done." << std::endl;
} }
void AudioThread::terminate() { void AudioThread::terminate() {

8
src/demod/DemodulatorInstance.cpp
View File

@ -89,7 +89,7 @@ void DemodulatorInstance::run() {
pthread_create(&t_Demod, &attr, &DemodulatorThread::pthread_helper, demodulatorThread); pthread_create(&t_Demod, &attr, &DemodulatorThread::pthread_helper, demodulatorThread);
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
std::cout << "Initialized demodulator stack size of " << size << std::endl; // std::cout << "Initialized demodulator stack size of " << size << std::endl;
#else #else
t_PreDemod = new std::thread(&DemodulatorPreThread::threadMain, demodulatorPreThread); t_PreDemod = new std::thread(&DemodulatorPreThread::threadMain, demodulatorPreThread);
@ -109,11 +109,11 @@ void DemodulatorInstance::updateLabel(long long freq) {
} }
void DemodulatorInstance::terminate() { void DemodulatorInstance::terminate() {
std::cout << "Terminating demodulator audio thread.." << std::endl; // std::cout << "Terminating demodulator audio thread.." << std::endl;
audioThread->terminate(); audioThread->terminate();
std::cout << "Terminating demodulator thread.." << std::endl; // std::cout << "Terminating demodulator thread.." << std::endl;
demodulatorThread->terminate(); demodulatorThread->terminate();
std::cout << "Terminating demodulator preprocessor thread.." << std::endl; // std::cout << "Terminating demodulator preprocessor thread.." << std::endl;
demodulatorPreThread->terminate(); demodulatorPreThread->terminate();
} }

4
src/demod/DemodulatorPreThread.cpp
View File

@ -52,7 +52,7 @@ void DemodulatorPreThread::run() {
pthread_setschedparam(tID, SCHED_FIFO, &prio); pthread_setschedparam(tID, SCHED_FIFO, &prio);
#endif #endif
std::cout << "Demodulator preprocessor thread started.." << std::endl; // std::cout << "Demodulator preprocessor thread started.." << std::endl;
ReBuffer<DemodulatorThreadPostIQData> buffers("DemodulatorPreThreadBuffers"); ReBuffer<DemodulatorThreadPostIQData> buffers("DemodulatorPreThreadBuffers");
@ -276,7 +276,7 @@ void DemodulatorPreThread::run() {
DemodulatorThreadCommand tCmd(DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_PREPROCESS_TERMINATED); DemodulatorThreadCommand tCmd(DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_PREPROCESS_TERMINATED);
tCmd.context = this; tCmd.context = this;
threadQueueNotify->push(tCmd); threadQueueNotify->push(tCmd);
std::cout << "Demodulator preprocessor thread done." << std::endl; // std::cout << "Demodulator preprocessor thread done." << std::endl;
} }
void DemodulatorPreThread::setDemodType(std::string demodType) { void DemodulatorPreThread::setDemodType(std::string demodType) {

4
src/demod/DemodulatorThread.cpp
View File

@ -64,7 +64,7 @@ void DemodulatorThread::run() {
pthread_setschedparam(tID, SCHED_FIFO, &prio); pthread_setschedparam(tID, SCHED_FIFO, &prio);
#endif #endif
std::cout << "Demodulator thread started.." << std::endl; // std::cout << "Demodulator thread started.." << std::endl;
iqInputQueue = static_cast<DemodulatorThreadPostInputQueue*>(getInputQueue("IQDataInput")); iqInputQueue = static_cast<DemodulatorThreadPostInputQueue*>(getInputQueue("IQDataInput"));
audioOutputQueue = static_cast<AudioThreadInputQueue*>(getOutputQueue("AudioDataOutput")); audioOutputQueue = static_cast<AudioThreadInputQueue*>(getOutputQueue("AudioDataOutput"));
@ -290,7 +290,7 @@ void DemodulatorThread::run() {
tCmd.context = this; tCmd.context = this;
threadQueueNotify->push(tCmd); threadQueueNotify->push(tCmd);
std::cout << "Demodulator thread done." << std::endl; // std::cout << "Demodulator thread done." << std::endl;
} }
void DemodulatorThread::terminate() { void DemodulatorThread::terminate() {

4
src/demod/DemodulatorWorkerThread.cpp
View File

@ -12,7 +12,7 @@ DemodulatorWorkerThread::~DemodulatorWorkerThread() {
void DemodulatorWorkerThread::run() { void DemodulatorWorkerThread::run() {
std::cout << "Demodulator worker thread started.." << std::endl; // std::cout << "Demodulator worker thread started.." << std::endl;
commandQueue = static_cast<DemodulatorThreadWorkerCommandQueue *>(getInputQueue("WorkerCommandQueue")); commandQueue = static_cast<DemodulatorThreadWorkerCommandQueue *>(getInputQueue("WorkerCommandQueue"));
resultQueue = static_cast<DemodulatorThreadWorkerResultQueue *>(getOutputQueue("WorkerResultQueue")); resultQueue = static_cast<DemodulatorThreadWorkerResultQueue *>(getOutputQueue("WorkerResultQueue"));
@ -99,7 +99,7 @@ void DemodulatorWorkerThread::run() {
} }
std::cout << "Demodulator worker thread done." << std::endl; // std::cout << "Demodulator worker thread done." << std::endl;
} }
void DemodulatorWorkerThread::terminate() { void DemodulatorWorkerThread::terminate() {

4
src/process/FFTVisualDataThread.cpp
View File

@ -35,7 +35,7 @@ void FFTVisualDataThread::run() {
wproc.attachOutput(pipeFFTDataOut); wproc.attachOutput(pipeFFTDataOut);
wproc.setup(DEFAULT_FFT_SIZE); wproc.setup(DEFAULT_FFT_SIZE);
std::cout << "FFT visual data thread started." << std::endl; // std::cout << "FFT visual data thread started." << std::endl;
while(!terminated) { while(!terminated) {
@ -63,6 +63,6 @@ void FFTVisualDataThread::run() {
} }
} }
std::cout << "FFT visual data thread done." << std::endl; // std::cout << "FFT visual data thread done." << std::endl;
} }

4
src/process/SpectrumVisualDataThread.cpp
View File

@ -13,7 +13,7 @@ SpectrumVisualProcessor *SpectrumVisualDataThread::getProcessor() {
} }
void SpectrumVisualDataThread::run() { void SpectrumVisualDataThread::run() {
std::cout << "Spectrum visual data thread started." << std::endl; // std::cout << "Spectrum visual data thread started." << std::endl;
while(!terminated) { while(!terminated) {
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
@ -21,6 +21,6 @@ void SpectrumVisualDataThread::run() {
sproc.run(); sproc.run();
} }
std::cout << "Spectrum visual data thread done." << std::endl; // std::cout << "Spectrum visual data thread done." << std::endl;
} }

4
src/sdr/SDRPostThread.cpp
View File

@ -171,7 +171,7 @@ void SDRPostThread::run() {
pthread_setschedparam(tID, SCHED_FIFO, &prio); pthread_setschedparam(tID, SCHED_FIFO, &prio);
#endif #endif
std::cout << "SDR post-processing thread started.." << std::endl; // std::cout << "SDR post-processing thread started.." << std::endl;
iqDataInQueue = static_cast<SDRThreadIQDataQueue*>(getInputQueue("IQDataInput")); iqDataInQueue = static_cast<SDRThreadIQDataQueue*>(getInputQueue("IQDataInput"));
iqDataOutQueue = static_cast<DemodulatorThreadInputQueue*>(getOutputQueue("IQDataOutput")); iqDataOutQueue = static_cast<DemodulatorThreadInputQueue*>(getOutputQueue("IQDataOutput"));
@ -223,7 +223,7 @@ void SDRPostThread::run() {
// buffers.purge(); // buffers.purge();
// visualDataBuffers.purge(); // visualDataBuffers.purge();
std::cout << "SDR post-processing thread done." << std::endl; // std::cout << "SDR post-processing thread done." << std::endl;
} }
void SDRPostThread::terminate() { void SDRPostThread::terminate() {