diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index d372ce5..6e88450 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -1741,7 +1741,7 @@ bool AppFrame::loadSession(std::string fileName) { demodsLoaded.push_back(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\tSquelch Level: " << squelch_level << std::endl; // std::cout << "\t\tSquelch Enabled: " << (squelch_enabled ? "true" : "false") << std::endl; diff --git a/src/audio/AudioThread.cpp b/src/audio/AudioThread.cpp index 23507c4..62cec69 100644 --- a/src/audio/AudioThread.cpp +++ b/src/audio/AudioThread.cpp @@ -368,7 +368,7 @@ void AudioThread::run() { pthread_setschedparam(tID, SCHED_RR, &prio); #endif - std::cout << "Audio thread initializing.." << std::endl; +// std::cout << "Audio thread initializing.." << std::endl; if (dac.getDeviceCount() < 1) { std::cout << "No audio devices found!" << std::endl; @@ -377,7 +377,7 @@ void AudioThread::run() { 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(getInputQueue("AudioDataInput")); threadQueueNotify = static_cast(getOutputQueue("NotifyQueue")); @@ -414,7 +414,7 @@ void AudioThread::run() { tCmd.context = this; threadQueueNotify->push(tCmd); } - std::cout << "Audio thread done." << std::endl; +// std::cout << "Audio thread done." << std::endl; } void AudioThread::terminate() { diff --git a/src/demod/DemodulatorInstance.cpp b/src/demod/DemodulatorInstance.cpp index 0a1595a..49bc552 100644 --- a/src/demod/DemodulatorInstance.cpp +++ b/src/demod/DemodulatorInstance.cpp @@ -89,7 +89,7 @@ void DemodulatorInstance::run() { pthread_create(&t_Demod, &attr, &DemodulatorThread::pthread_helper, demodulatorThread); 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 t_PreDemod = new std::thread(&DemodulatorPreThread::threadMain, demodulatorPreThread); @@ -109,11 +109,11 @@ void DemodulatorInstance::updateLabel(long long freq) { } void DemodulatorInstance::terminate() { - std::cout << "Terminating demodulator audio thread.." << std::endl; +// std::cout << "Terminating demodulator audio thread.." << std::endl; audioThread->terminate(); - std::cout << "Terminating demodulator thread.." << std::endl; +// std::cout << "Terminating demodulator thread.." << std::endl; demodulatorThread->terminate(); - std::cout << "Terminating demodulator preprocessor thread.." << std::endl; +// std::cout << "Terminating demodulator preprocessor thread.." << std::endl; demodulatorPreThread->terminate(); } diff --git a/src/demod/DemodulatorPreThread.cpp b/src/demod/DemodulatorPreThread.cpp index 6b128ea..31f9dfc 100644 --- a/src/demod/DemodulatorPreThread.cpp +++ b/src/demod/DemodulatorPreThread.cpp @@ -52,7 +52,7 @@ void DemodulatorPreThread::run() { pthread_setschedparam(tID, SCHED_FIFO, &prio); #endif - std::cout << "Demodulator preprocessor thread started.." << std::endl; +// std::cout << "Demodulator preprocessor thread started.." << std::endl; ReBuffer buffers("DemodulatorPreThreadBuffers"); @@ -276,7 +276,7 @@ void DemodulatorPreThread::run() { DemodulatorThreadCommand tCmd(DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_PREPROCESS_TERMINATED); tCmd.context = this; 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) { diff --git a/src/demod/DemodulatorThread.cpp b/src/demod/DemodulatorThread.cpp index f71eaec..8dba9ed 100644 --- a/src/demod/DemodulatorThread.cpp +++ b/src/demod/DemodulatorThread.cpp @@ -64,7 +64,7 @@ void DemodulatorThread::run() { pthread_setschedparam(tID, SCHED_FIFO, &prio); #endif - std::cout << "Demodulator thread started.." << std::endl; +// std::cout << "Demodulator thread started.." << std::endl; iqInputQueue = static_cast(getInputQueue("IQDataInput")); audioOutputQueue = static_cast(getOutputQueue("AudioDataOutput")); @@ -290,7 +290,7 @@ void DemodulatorThread::run() { tCmd.context = this; threadQueueNotify->push(tCmd); - std::cout << "Demodulator thread done." << std::endl; +// std::cout << "Demodulator thread done." << std::endl; } void DemodulatorThread::terminate() { diff --git a/src/demod/DemodulatorWorkerThread.cpp b/src/demod/DemodulatorWorkerThread.cpp index 3b1a28d..4d4a27d 100644 --- a/src/demod/DemodulatorWorkerThread.cpp +++ b/src/demod/DemodulatorWorkerThread.cpp @@ -12,7 +12,7 @@ DemodulatorWorkerThread::~DemodulatorWorkerThread() { void DemodulatorWorkerThread::run() { - std::cout << "Demodulator worker thread started.." << std::endl; +// std::cout << "Demodulator worker thread started.." << std::endl; commandQueue = static_cast(getInputQueue("WorkerCommandQueue")); resultQueue = static_cast(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() { diff --git a/src/process/FFTVisualDataThread.cpp b/src/process/FFTVisualDataThread.cpp index 86f7caf..fc93b60 100644 --- a/src/process/FFTVisualDataThread.cpp +++ b/src/process/FFTVisualDataThread.cpp @@ -35,7 +35,7 @@ void FFTVisualDataThread::run() { wproc.attachOutput(pipeFFTDataOut); 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) { @@ -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; } diff --git a/src/process/SpectrumVisualDataThread.cpp b/src/process/SpectrumVisualDataThread.cpp index e6dc1ac..d981297 100644 --- a/src/process/SpectrumVisualDataThread.cpp +++ b/src/process/SpectrumVisualDataThread.cpp @@ -13,7 +13,7 @@ SpectrumVisualProcessor *SpectrumVisualDataThread::getProcessor() { } void SpectrumVisualDataThread::run() { - std::cout << "Spectrum visual data thread started." << std::endl; +// std::cout << "Spectrum visual data thread started." << std::endl; while(!terminated) { std::this_thread::sleep_for(std::chrono::milliseconds(10)); @@ -21,6 +21,6 @@ void SpectrumVisualDataThread::run() { sproc.run(); } - std::cout << "Spectrum visual data thread done." << std::endl; +// std::cout << "Spectrum visual data thread done." << std::endl; } diff --git a/src/sdr/SDRPostThread.cpp b/src/sdr/SDRPostThread.cpp index 190eb0e..a29f4a1 100644 --- a/src/sdr/SDRPostThread.cpp +++ b/src/sdr/SDRPostThread.cpp @@ -171,7 +171,7 @@ void SDRPostThread::run() { pthread_setschedparam(tID, SCHED_FIFO, &prio); #endif - std::cout << "SDR post-processing thread started.." << std::endl; +// std::cout << "SDR post-processing thread started.." << std::endl; iqDataInQueue = static_cast(getInputQueue("IQDataInput")); iqDataOutQueue = static_cast(getOutputQueue("IQDataOutput")); @@ -223,7 +223,7 @@ void SDRPostThread::run() { // buffers.purge(); // visualDataBuffers.purge(); - std::cout << "SDR post-processing thread done." << std::endl; +// std::cout << "SDR post-processing thread done." << std::endl; } void SDRPostThread::terminate() {