From 4ec08b8b689e8f2596140d739e139c03cb4d7931 Mon Sep 17 00:00:00 2001
From: vsonnier <vsonnier@users.noreply.github.com>
Date: Thu, 9 Jun 2016 19:20:16 +0200
Subject: [PATCH] MISC 1 : Create ReBuffer by default with refcount 1, so
 remove redundant refCount(1) evertwhere

---
 src/IOThread.h                     | 7 ++++++-
 src/demod/DemodulatorPreThread.cpp | 1 -
 src/demod/DemodulatorThread.cpp    | 2 --
 src/sdr/SoapySDRThread.cpp         | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/IOThread.h b/src/IOThread.h
index 0197894..f4645a8 100644
--- a/src/IOThread.h
+++ b/src/IOThread.h
@@ -23,6 +23,11 @@ struct map_string_less : public std::binary_function<std::string,std::string,boo
 class ReferenceCounter {
 
 public:
+
+    //default constructor, initialized with refcont 1, sounds very natural
+    ReferenceCounter() {
+        refCount = 1;
+    }
     
 //    void setIndex(int idx) {
 //        std::lock_guard < std::recursive_mutex > lock(m_mutex);
@@ -139,8 +144,8 @@ public:
             std::cout << "Warning: ReBuffer '" << bufferId << "' count '" << outputBuffers.size() << "' exceeds threshold of '" << REBUFFER_WARNING_THRESHOLD << "'" << std::endl;
         }
 
+        //by default created with refcount = 1
         buf = new BufferType();
-        buf->setRefCount(1);
 //        buf->setIndex(indexCounter++);
         outputBuffers.push_back(buf);
         
diff --git a/src/demod/DemodulatorPreThread.cpp b/src/demod/DemodulatorPreThread.cpp
index e1a438c..554b221 100644
--- a/src/demod/DemodulatorPreThread.cpp
+++ b/src/demod/DemodulatorPreThread.cpp
@@ -198,7 +198,6 @@ void DemodulatorPreThread::run() {
             unsigned int numWritten;
             msresamp_crcf_execute(iqResampler, in_buf, bufSize, &resampledData[0], &numWritten);
 
-            resamp->setRefCount(1);
             resamp->data.assign(resampledData.begin(), resampledData.begin() + numWritten);
 
             resamp->modemType = cModem->getType();
diff --git a/src/demod/DemodulatorThread.cpp b/src/demod/DemodulatorThread.cpp
index 9ec0cab..c9b8a96 100644
--- a/src/demod/DemodulatorThread.cpp
+++ b/src/demod/DemodulatorThread.cpp
@@ -120,7 +120,6 @@ void DemodulatorThread::run() {
         
         modemData.sampleRate = inp->sampleRate;
         modemData.data.assign(inputData->begin(), inputData->end());
-        modemData.setRefCount(1);
         
         AudioThreadInput *ati = nullptr;
         
@@ -186,7 +185,6 @@ void DemodulatorThread::run() {
         if (ati && localAudioVisOutputQueue != nullptr && localAudioVisOutputQueue->empty()) {
             AudioThreadInput *ati_vis = new AudioThreadInput;
 
-            ati_vis->setRefCount(1);
             ati_vis->sampleRate = inp->sampleRate;
             ati_vis->inputRate = inp->sampleRate;
             
diff --git a/src/sdr/SoapySDRThread.cpp b/src/sdr/SoapySDRThread.cpp
index d3a1620..f283b53 100644
--- a/src/sdr/SoapySDRThread.cpp
+++ b/src/sdr/SoapySDRThread.cpp
@@ -207,7 +207,6 @@ void SDRThread::readStream(SDRThreadIQDataQueue* iqDataOutQueue) {
             dataOut->data.assign(inpBuffer.data.begin(), inpBuffer.data.begin()+n_read);
         }
         
-        dataOut->setRefCount(1);
         dataOut->frequency = frequency.load();
         dataOut->sampleRate = sampleRate.load();
         dataOut->dcCorrected = hasHardwareDC.load();