Moved audio sample definitions to dsp types definitions

plugins/channelrx/demodam/amdemod.h

@@ -87,12 +87,6 @@ private:
 		{ }
 	};
 
-	struct AudioSample {
-		qint16 l;
-		qint16 r;
-	};
-	typedef std::vector<AudioSample> AudioVector;
-
 	enum RateState {
 		RSInitialFill,
 		RSRunning

plugins/channelrx/demodbfm/bfmdemod.h

@@ -143,12 +143,6 @@ private:
 		{ }
 	};
 
-	struct AudioSample {
-		qint16 l;
-		qint16 r;
-	};
-	typedef std::vector<AudioSample> AudioVector;
-
 	enum RateState {
 		RSInitialFill,
 		RSRunning

plugins/channelrx/demoddsd/dsddemod.h

@@ -234,12 +234,6 @@ private:
 		{ }
 	};
 
-	struct AudioSample {
-		qint16 l;
-		qint16 r;
-	};
-	typedef std::vector<AudioSample> AudioVector;
-
 	enum RateState {
 		RSInitialFill,
 		RSRunning

plugins/channelrx/demodnfm/nfmdemod.h

@@ -160,12 +160,6 @@ private:
 		{ }
 	};
 
-	struct AudioSample {
-		qint16 l;
-		qint16 r;
-	};
-	typedef std::vector<AudioSample> AudioVector;
-
 	enum RateState {
 		RSInitialFill,
 		RSRunning

plugins/channelrx/demodssb/ssbdemod.h

@@ -164,13 +164,6 @@ private:
 		{ }
 	};
 
-	struct AudioSample {
-		qint16 l;
-		qint16 r;
-	};
-
-	typedef std::vector<AudioSample> AudioVector;
-
 	Real m_Bandwidth;
 	Real m_LowCutoff;
 	Real m_volume;

plugins/channelrx/demodwfm/wfmdemod.h

@@ -97,12 +97,6 @@ private:
 		{ }
 	};
 
-	struct AudioSample {
-		qint16 l;
-		qint16 r;
-	};
-	typedef std::vector<AudioSample> AudioVector;
-
 	enum RateState {
 		RSInitialFill,
 		RSRunning

plugins/channelrx/udpsrc/udpsrc.h

@@ -54,13 +54,6 @@ public:
 		FormatNone
 	};
 
-	struct AudioSample {
-		qint16 l;
-		qint16 r;
-	};
-
-	typedef std::vector<AudioSample> AudioVector;
-
 	UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampleSink* spectrum);
 	virtual ~UDPSrc();
 

plugins/channeltx/modam/ammod.h

@@ -243,12 +243,6 @@ private:
 
     //=================================================================
 
-    struct AudioSample {
-        qint16 l;
-        qint16 r;
-    };
-    typedef std::vector<AudioSample> AudioVector;
-
     enum RateState {
         RSInitialFill,
         RSRunning

plugins/channeltx/modnfm/nfmmod.h

@@ -281,12 +281,6 @@ private:
 
     //=================================================================
 
-    struct AudioSample {
-        qint16 l;
-        qint16 r;
-    };
-    typedef std::vector<AudioSample> AudioVector;
-
     enum RateState {
         RSInitialFill,
         RSRunning

plugins/channeltx/modssb/ssbmod.h

@@ -329,12 +329,6 @@ private:
 
     //=================================================================
 
-    struct AudioSample {
-        qint16 l;
-        qint16 r;
-    };
-    typedef std::vector<AudioSample> AudioVector;
-
     enum RateState {
         RSInitialFill,
         RSRunning

plugins/channeltx/modwfm/wfmmod.h

@@ -266,12 +266,6 @@ private:
 
     //=================================================================
 
-    struct AudioSample {
-        qint16 l;
-        qint16 r;
-    };
-    typedef std::vector<AudioSample> AudioVector;
-
     enum RateState {
         RSInitialFill,
         RSRunning

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);
 

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<Sample> SampleVector;
+typedef std::vector<AudioSample> AudioVector;
 
 #endif // INCLUDE_DSPTYPES_H

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<AudioSample> AudioVector;
-
     void upsample6(short *in, short *out, int nbSamplesIn);
     void upsample6(short *in, int nbSamplesIn, unsigned char channels);