From 59a9bb0a8ec765ca541a5e59d02b9807c3c3f87a Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 28 Jul 2016 23:50:18 +0200 Subject: [PATCH] SDRdaemonFEC plugin: clean up commented out code --- plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp | 7 ------- plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h | 5 ----- 2 files changed, 12 deletions(-) diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp index a08e2abb0..c68d8e993 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp @@ -187,9 +187,6 @@ void SDRdaemonFECBuffer::checkSlotData(int slotIndex) << " m_blockCount: " << m_decoderSlots[slotIndex].m_blockCount << " m_recoveryCount: " << m_decoderSlots[slotIndex].m_recoveryCount; } - - // copy retrieved data to main buffer - copyOriginalBlocks(slotIndex); } void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) @@ -233,8 +230,6 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) if (blockIndex < m_nbOriginalBlocks) // original data { m_decoderSlots[decoderIndex].m_cm256DescriptorBlocks[blockCount].Block = (void *) storeOriginalBlock(decoderIndex, blockIndex, superBlock->protectedBlock); - // m_decoderSlots[decoderIndex].m_originalBlocks[blockIndex] = superBlock->protectedBlock; - // m_decoderSlots[decoderIndex].m_cm256DescriptorBlocks[blockCount].Block = (void *) &m_decoderSlots[decoderIndex].m_originalBlocks[blockIndex]; m_decoderSlots[decoderIndex].m_originalCount++; } else // recovery data @@ -299,7 +294,6 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) } storeOriginalBlock(decoderIndex, blockIndex, *recoveredBlock); - // m_decoderSlots[decoderIndex].m_originalBlocks[blockIndex] = *recoveredBlock; qDebug() << "SDRdaemonFECBuffer::writeData: recovered block #" << blockIndex; } // restore missing blocks @@ -308,7 +302,6 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) if (m_decoderSlots[decoderIndex].m_metaRetrieved) // block zero with its meta data has been received { - // MetaDataFEC *metaData = (MetaDataFEC *) &m_decoderSlots[decoderIndex].m_originalBlocks[0]; MetaDataFEC *metaData = getMetaData(decoderIndex); if (!(*metaData == m_currentMeta)) diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h index 84613d3ec..4c9814128 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h @@ -259,11 +259,6 @@ private: memset((void *) m_frames[slotIndex].m_blocks, 0, (m_nbOriginalBlocks - 1) * sizeof(ProtectedBlock)); } - inline void copyOriginalBlocks(int slotIndex) - { - // memcpy((void *) &m_frames[slotIndex].m_blocks[0], (const void *) &m_decoderSlots[slotIndex].m_originalBlocks[1], (m_nbOriginalBlocks - 1)*sizeof(ProtectedBlock)); - } - void initDecodeAllSlots(); void initReadIndex(); void rwCorrectionEstimate(int slotIndex);