VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 09:48:45 -05:00
Code Issues Projects Releases Wiki Activity

Moved audio sample definitions to dsp types definitions

Browse Source
This commit is contained in:
f4exb 2017-08-24 15:24:28 +02:00
parent f74e74af12
commit d98d8757b0
14 changed files with 10 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channelrx/demodam/amdemod.h
View File

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

6
plugins/channelrx/demodbfm/bfmdemod.h
View File

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

6
plugins/channelrx/demoddsd/dsddemod.h
View File

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

6
plugins/channelrx/demodnfm/nfmdemod.h
View File

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

7
plugins/channelrx/demodssb/ssbdemod.h
View File

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

6
plugins/channelrx/demodwfm/wfmdemod.h
View File

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

7
plugins/channelrx/udpsrc/udpsrc.h
View File

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

6
plugins/channeltx/modam/ammod.h
View File

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

6
plugins/channeltx/modnfm/nfmmod.h
View File

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

6
plugins/channeltx/modssb/ssbmod.h
View File

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

6
plugins/channeltx/modwfm/wfmmod.h
View File

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

4
sdrbase/audio/audiofifo.cpp
View File

@ -34,7 +34,9 @@ AudioFifo::AudioFifo() :
} }
AudioFifo::AudioFifo(uint32_t sampleSize, uint32_t numSamples) : AudioFifo::AudioFifo(uint32_t sampleSize, uint32_t numSamples) :
m_fifo(0) m_fifo(0),
m_udpSink(0),
m_copyToUDP(false)
{ {
QMutexLocker mutexLocker(&m_mutex); QMutexLocker mutexLocker(&m_mutex);

6
sdrbase/dsp/dsptypes.h
View File

@ -51,8 +51,14 @@ struct Sample
FixReal m_real; FixReal m_real;
FixReal m_imag; FixReal m_imag;
}; };
struct AudioSample {
qint16 l;
qint16 r;
};
#pragma pack(pop) #pragma pack(pop)
typedef std::vector<Sample> SampleVector; typedef std::vector<Sample> SampleVector;
typedef std::vector<AudioSample> AudioVector;
#endif // INCLUDE_DSPTYPES_H #endif // INCLUDE_DSPTYPES_H

8
sdrbase/dsp/dvserialworker.h
View File

@ -30,6 +30,7 @@
#include "util/syncmessenger.h" #include "util/syncmessenger.h"
#include "util/messagequeue.h" #include "util/messagequeue.h"
#include "dsp/filtermbe.h" #include "dsp/filtermbe.h"
#include "dsp/dsptypes.h"
class AudioFifo; class AudioFifo;
@ -115,13 +116,6 @@ public slots:
void handleInputMessages(); void handleInputMessages();
private: private:
struct AudioSample {
qint16 l;
qint16 r;
};
typedef std::vector<AudioSample> AudioVector;
void upsample6(short *in, short *out, int nbSamplesIn); void upsample6(short *in, short *out, int nbSamplesIn);
void upsample6(short *in, int nbSamplesIn, unsigned char channels); void upsample6(short *in, int nbSamplesIn, unsigned char channels);