From bacc6659b0f7e5c9ba25109f68af052642fbd113 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 22 Jan 2018 03:00:08 +0100
Subject: [PATCH] 24 bit DSP: use a different define for Tx chain so that it
 can stay on 16 bit DSP

---
 sdrbase/dsp/interpolators.h   | 4 ++--
 sdrbase/dsp/upchannelizer.cpp | 2 +-
 sdrbase/dsp/upchannelizer.h   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sdrbase/dsp/interpolators.h b/sdrbase/dsp/interpolators.h
index 0188cfb30..42e7640f3 100644
--- a/sdrbase/dsp/interpolators.h
+++ b/sdrbase/dsp/interpolators.h
@@ -18,7 +18,7 @@
 #define INCLUDE_GPL_DSP_INTERPOLATORS_H_
 
 #include "dsp/dsptypes.h"
-#ifdef SDR_SAMPLE_24BIT
+#ifdef SDR_TX_SAMPLE_24BIT
 #include "dsp/inthalfbandfilterdb.h"
 #else
 #ifdef USE_SSE4_1
@@ -118,7 +118,7 @@ public:
 	void interpolate64_cen(SampleVector::iterator* it, T* buf, qint32 len);
 
 private:
-#ifdef SDR_SAMPLE_24BIT
+#ifdef SDR_TX_SAMPLE_24BIT
     IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_FIRST> m_interpolator2;  // 1st stages
     IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_SECOND> m_interpolator4;  // 2nd stages
     IntHalfbandFilterDB<qint64, INTERPOLATORS_HB_FILTER_ORDER_NEXT> m_interpolator8;  // 3rd stages
diff --git a/sdrbase/dsp/upchannelizer.cpp b/sdrbase/dsp/upchannelizer.cpp
index c2415a186..fa1e26b52 100644
--- a/sdrbase/dsp/upchannelizer.cpp
+++ b/sdrbase/dsp/upchannelizer.cpp
@@ -207,7 +207,7 @@ void UpChannelizer::applyConfiguration()
     }
 }
 
-#ifdef SDR_SAMPLE_24BIT
+#ifdef SDR_TX_SAMPLE_24BIT
 UpChannelizer::FilterStage::FilterStage(Mode mode) :
     m_filter(new IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>),
     m_workFunction(0)
diff --git a/sdrbase/dsp/upchannelizer.h b/sdrbase/dsp/upchannelizer.h
index ee6f5fa35..dc6bb3015 100644
--- a/sdrbase/dsp/upchannelizer.h
+++ b/sdrbase/dsp/upchannelizer.h
@@ -23,7 +23,7 @@
 #include <QMutex>
 #include "util/export.h"
 #include "util/message.h"
-#ifdef SDR_SAMPLE_24BIT
+#ifdef SDR_TX_SAMPLE_24BIT
 #include "dsp/inthalfbandfilterdb.h"
 #else
 #ifdef USE_SSE4_1
@@ -87,7 +87,7 @@ protected:
             ModeUpperHalf
         };
 
-#ifdef SDR_SAMPLE_24BIT
+#ifdef SDR_TX_SAMPLE_24BIT
         typedef bool (IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>::*WorkFunction)(Sample* sIn, Sample *sOut);
         IntHalfbandFilterDB<qint64, UPCHANNELIZER_HB_FILTER_ORDER>* m_filter;
 #else