comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-12-24 11:20:23 -05:00
Code Issues Projects Releases Wiki Activity

more ReBuffer<> updates

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-07-28 22:14:48 -04:00
parent f731602017
commit 2d8c2800cb
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/demod/DemodulatorPreThread.cpp
View File

@ -98,8 +98,7 @@ void DemodulatorPreThread::threadMain() {
std::cout << "Demodulator preprocessor thread started.." << std::endl;
std::deque<DemodulatorThreadPostIQData *> buffers;
std::deque<DemodulatorThreadPostIQData *>::iterator buffers_i;
ReBuffer<DemodulatorThreadPostIQData> buffers;
std::vector<liquid_float_complex> in_buf_data;
std::vector<liquid_float_complex> out_buf_data;
@ -207,19 +206,7 @@ void DemodulatorPreThread::threadMain() {
out_buf = temp_buf;
}
DemodulatorThreadPostIQData *resamp = NULL;
for (buffers_i = buffers.begin(); buffers_i != buffers.end(); buffers_i++) {
if ((*buffers_i)->getRefCount() <= 0) {
resamp = (*buffers_i);
break;
}
}
if (resamp == NULL) {
resamp = new DemodulatorThreadPostIQData;
buffers.push_back(resamp);
}
DemodulatorThreadPostIQData *resamp = buffers.getBuffer();
int out_size = ceil((double) (bufSize) * iqResampleRatio) + 512;
@ -326,11 +313,7 @@ void DemodulatorPreThread::threadMain() {
}
}
while (!buffers.empty()) {
DemodulatorThreadPostIQData *iqDataDel = buffers.front();
buffers.pop_front();
delete iqDataDel;
}
buffers.purge();
DemodulatorThreadCommand tCmd(DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_PREPROCESS_TERMINATED);
tCmd.context = this;

2
src/sdr/SDRPostThread.cpp
View File

@ -229,7 +229,7 @@ void SDRPostThread::threadMain() {
data_in->decRefCount();
}
// buffers.purge();
buffers.purge();
if (iqVisualQueue.load() && !iqVisualQueue.load()->empty()) {
DemodulatorThreadIQData *visualDataDummy;

2
src/sdr/SDRThread.cpp
View File

@ -298,7 +298,7 @@ void SDRThread::threadMain() {
}
}
// buffers.purge();
buffers.purge();
std::cout << "SDR thread done." << std::endl;
}