diff --git a/plugins/channelrx/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h index 5880d40ce..ef4a7d80e 100644 --- a/plugins/channelrx/demodam/amdemod.h +++ b/plugins/channelrx/demodam/amdemod.h @@ -87,12 +87,6 @@ private: { } }; - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channelrx/demodbfm/bfmdemod.h b/plugins/channelrx/demodbfm/bfmdemod.h index f830fdf27..5ff600f18 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.h +++ b/plugins/channelrx/demodbfm/bfmdemod.h @@ -143,12 +143,6 @@ private: { } }; - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h index 7155601c4..5bede2fd0 100644 --- a/plugins/channelrx/demoddsd/dsddemod.h +++ b/plugins/channelrx/demoddsd/dsddemod.h @@ -234,12 +234,6 @@ private: { } }; - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h index da3c41cc3..6b8f0d137 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.h +++ b/plugins/channelrx/demodnfm/nfmdemod.h @@ -160,12 +160,6 @@ private: { } }; - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index 97581f499..dd6e4f74b 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -164,13 +164,6 @@ private: { } }; - struct AudioSample { - qint16 l; - qint16 r; - }; - - typedef std::vector AudioVector; - Real m_Bandwidth; Real m_LowCutoff; Real m_volume; diff --git a/plugins/channelrx/demodwfm/wfmdemod.h b/plugins/channelrx/demodwfm/wfmdemod.h index 964052bf9..ed78f7a79 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.h +++ b/plugins/channelrx/demodwfm/wfmdemod.h @@ -97,12 +97,6 @@ private: { } }; - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channelrx/udpsrc/udpsrc.h b/plugins/channelrx/udpsrc/udpsrc.h index 2d871dd19..c392a1e17 100644 --- a/plugins/channelrx/udpsrc/udpsrc.h +++ b/plugins/channelrx/udpsrc/udpsrc.h @@ -54,13 +54,6 @@ public: FormatNone }; - struct AudioSample { - qint16 l; - qint16 r; - }; - - typedef std::vector AudioVector; - UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampleSink* spectrum); virtual ~UDPSrc(); diff --git a/plugins/channeltx/modam/ammod.h b/plugins/channeltx/modam/ammod.h index 8780d18e1..67fed36b0 100644 --- a/plugins/channeltx/modam/ammod.h +++ b/plugins/channeltx/modam/ammod.h @@ -243,12 +243,6 @@ private: //================================================================= - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channeltx/modnfm/nfmmod.h b/plugins/channeltx/modnfm/nfmmod.h index f7e848b72..db4856cfd 100644 --- a/plugins/channeltx/modnfm/nfmmod.h +++ b/plugins/channeltx/modnfm/nfmmod.h @@ -281,12 +281,6 @@ private: //================================================================= - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channeltx/modssb/ssbmod.h b/plugins/channeltx/modssb/ssbmod.h index b81c5f5ef..ea0037d2b 100644 --- a/plugins/channeltx/modssb/ssbmod.h +++ b/plugins/channeltx/modssb/ssbmod.h @@ -329,12 +329,6 @@ private: //================================================================= - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/plugins/channeltx/modwfm/wfmmod.h b/plugins/channeltx/modwfm/wfmmod.h index cc6202745..d217048cf 100644 --- a/plugins/channeltx/modwfm/wfmmod.h +++ b/plugins/channeltx/modwfm/wfmmod.h @@ -266,12 +266,6 @@ private: //================================================================= - struct AudioSample { - qint16 l; - qint16 r; - }; - typedef std::vector AudioVector; - enum RateState { RSInitialFill, RSRunning diff --git a/sdrbase/audio/audiofifo.cpp b/sdrbase/audio/audiofifo.cpp index ef8cdece2..6ffa572be 100644 --- a/sdrbase/audio/audiofifo.cpp +++ b/sdrbase/audio/audiofifo.cpp @@ -34,7 +34,9 @@ AudioFifo::AudioFifo() : } AudioFifo::AudioFifo(uint32_t sampleSize, uint32_t numSamples) : - m_fifo(0) + m_fifo(0), + m_udpSink(0), + m_copyToUDP(false) { QMutexLocker mutexLocker(&m_mutex); diff --git a/sdrbase/dsp/dsptypes.h b/sdrbase/dsp/dsptypes.h index 98f940933..3ac484eb0 100644 --- a/sdrbase/dsp/dsptypes.h +++ b/sdrbase/dsp/dsptypes.h @@ -51,8 +51,14 @@ struct Sample FixReal m_real; FixReal m_imag; }; + +struct AudioSample { + qint16 l; + qint16 r; +}; #pragma pack(pop) typedef std::vector SampleVector; +typedef std::vector AudioVector; #endif // INCLUDE_DSPTYPES_H diff --git a/sdrbase/dsp/dvserialworker.h b/sdrbase/dsp/dvserialworker.h index a9eae39cf..a79037770 100644 --- a/sdrbase/dsp/dvserialworker.h +++ b/sdrbase/dsp/dvserialworker.h @@ -30,6 +30,7 @@ #include "util/syncmessenger.h" #include "util/messagequeue.h" #include "dsp/filtermbe.h" +#include "dsp/dsptypes.h" class AudioFifo; @@ -115,13 +116,6 @@ public slots: void handleInputMessages(); private: - struct AudioSample { - qint16 l; - qint16 r; - }; - - typedef std::vector AudioVector; - void upsample6(short *in, short *out, int nbSamplesIn); void upsample6(short *in, int nbSamplesIn, unsigned char channels);