diff --git a/sdrdaemon/channel/sdrdaemonchannelsink.cpp b/sdrdaemon/channel/sdrdaemonchannelsink.cpp index 6bd9b2d87..90c13db21 100644 --- a/sdrdaemon/channel/sdrdaemonchannelsink.cpp +++ b/sdrdaemon/channel/sdrdaemonchannelsink.cpp @@ -48,7 +48,6 @@ SDRDaemonChannelSink::SDRDaemonChannelSink(DeviceSourceAPI *deviceAPI) : m_centerFrequency(0), m_sampleRate(48000), m_sampleBytes(SDR_RX_SAMP_SZ/8), - m_sampleBits(8), m_nbBlocksFEC(0), m_txDelay(100) { @@ -105,7 +104,7 @@ void SDRDaemonChannelSink::feed(const SampleVector::const_iterator& begin, const metaData.m_centerFrequency = m_centerFrequency; metaData.m_sampleRate = m_sampleRate; metaData.m_sampleBytes = m_sampleBytes; - metaData.m_sampleBits = m_sampleBits; + metaData.m_sampleBits = 0; // TODO: deprecated metaData.m_nbOriginalBlocks = SDRDaemonNbOrginalBlocks; metaData.m_nbFECBlocks = m_nbBlocksFEC; metaData.m_tv_sec = tv.tv_sec; diff --git a/sdrdaemon/channel/sdrdaemonchannelsink.h b/sdrdaemon/channel/sdrdaemonchannelsink.h index 1f659b60c..7e617cca1 100644 --- a/sdrdaemon/channel/sdrdaemonchannelsink.h +++ b/sdrdaemon/channel/sdrdaemonchannelsink.h @@ -63,7 +63,6 @@ public: void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; } void setSampleBytes(uint8_t sampleBytes) { m_sampleBytes = sampleBytes; } - void setSampleBits(uint8_t sampleBits) { m_sampleBits = sampleBits; } void setNbBlocksFEC(int nbBlocksFEC); void setTxDelay(int txDelay); @@ -92,7 +91,6 @@ private: uint64_t m_centerFrequency; uint32_t m_sampleRate; uint8_t m_sampleBytes; - uint8_t m_sampleBits; int m_nbBlocksFEC; int m_txDelay; }; diff --git a/sdrdaemon/channel/sdrdaemondatablock.h b/sdrdaemon/channel/sdrdaemondatablock.h index 4733462e6..da51e4896 100644 --- a/sdrdaemon/channel/sdrdaemondatablock.h +++ b/sdrdaemon/channel/sdrdaemondatablock.h @@ -37,7 +37,7 @@ struct SDRDaemonMetaDataFEC uint32_t m_centerFrequency; //!< 4 center frequency in kHz uint32_t m_sampleRate; //!< 8 sample rate in Hz uint8_t m_sampleBytes; //!< 9 number of bytes per sample (2 or 3) - uint8_t m_sampleBits; //!< 10 number of effective bits per sample (8 t0 24) + uint8_t m_sampleBits; //!< 10 number of effective bits per sample (deprecated) uint8_t m_nbOriginalBlocks; //!< 11 number of blocks with original (protected) data uint8_t m_nbFECBlocks; //!< 12 number of blocks carrying FEC uint32_t m_tv_sec; //!< 16 seconds of timestamp at start time of super-frame processing