VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 23:27:48 -04:00
Code Issues Projects Releases Wiki Activity

Renamed the UDPSink from sdrbase utils to UDPSinkUtil

Browse Source
This commit is contained in:
f4exb 2018-09-11 23:45:56 +02:00
parent 6f368d123b
commit f8e90827ac
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@
#include "dsp/afsquelch.h" #include "dsp/afsquelch.h"
#include "audio/audiofifo.h" #include "audio/audiofifo.h"
#include "util/message.h" #include "util/message.h"
#include "util/udpsink.h"
#include "util/doublebufferfifo.h" #include "util/doublebufferfifo.h"
#include "dsddemodsettings.h" #include "dsddemodsettings.h"

6
plugins/channelrx/udpsrc/udpsrc.cpp
View File

@ -62,9 +62,9 @@ UDPSrc::UDPSrc(DeviceSourceAPI *deviceAPI) :
{ {
setObjectName(m_channelId); setObjectName(m_channelId);
m_udpBuffer16 = new UDPSink<Sample16>(this, udpBlockSize, m_settings.m_udpPort); m_udpBuffer16 = new UDPSinkUtil<Sample16>(this, udpBlockSize, m_settings.m_udpPort);
m_udpBufferMono16 = new UDPSink<int16_t>(this, udpBlockSize, m_settings.m_udpPort); m_udpBufferMono16 = new UDPSinkUtil<int16_t>(this, udpBlockSize, m_settings.m_udpPort);
m_udpBuffer24 = new UDPSink<Sample24>(this, udpBlockSize, m_settings.m_udpPort); m_udpBuffer24 = new UDPSinkUtil<Sample24>(this, udpBlockSize, m_settings.m_udpPort);
m_audioSocket = new QUdpSocket(this); m_audioSocket = new QUdpSocket(this);
m_udpAudioBuf = new char[m_udpAudioPayloadSize]; m_udpAudioBuf = new char[m_udpAudioPayloadSize];

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

@ -30,7 +30,7 @@
#include "dsp/movingaverage.h" #include "dsp/movingaverage.h"
#include "dsp/agc.h" #include "dsp/agc.h"
#include "dsp/bandpass.h" #include "dsp/bandpass.h"
#include "util/udpsink.h" #include "util/udpsinkutil.h"
#include "util/message.h" #include "util/message.h"
#include "audio/audiofifo.h" #include "audio/audiofifo.h"
@ -197,9 +197,9 @@ protected:
fftfilt* UDPFilter; fftfilt* UDPFilter;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
UDPSink<Sample16> *m_udpBuffer16; UDPSinkUtil<Sample16> *m_udpBuffer16;
UDPSink<int16_t> *m_udpBufferMono16; UDPSinkUtil<int16_t> *m_udpBufferMono16;
UDPSink<Sample24> *m_udpBuffer24; UDPSinkUtil<Sample24> *m_udpBuffer24;
AudioVector m_audioBuffer; AudioVector m_audioBuffer;
uint m_audioBufferFill; uint m_audioBufferFill;

10
sdrbase/util/udpsink.h → sdrbase/util/udpsinkutil.h
View File

@ -26,10 +26,10 @@
#include <cassert> #include <cassert>
template<typename T> template<typename T>
class UDPSink class UDPSinkUtil
{ {
public: public:
UDPSink(QObject *parent, unsigned int udpSize) : UDPSinkUtil(QObject *parent, unsigned int udpSize) :
m_udpSize(udpSize), m_udpSize(udpSize),
m_udpSamples(udpSize/sizeof(T)), m_udpSamples(udpSize/sizeof(T)),
m_address(QHostAddress::LocalHost), m_address(QHostAddress::LocalHost),
@ -41,7 +41,7 @@ public:
m_socket = new QUdpSocket(parent); m_socket = new QUdpSocket(parent);
} }
UDPSink(QObject *parent, unsigned int udpSize, unsigned int port) : UDPSinkUtil(QObject *parent, unsigned int udpSize, unsigned int port) :
m_udpSize(udpSize), m_udpSize(udpSize),
m_udpSamples(udpSize/sizeof(T)), m_udpSamples(udpSize/sizeof(T)),
m_address(QHostAddress::LocalHost), m_address(QHostAddress::LocalHost),
@ -53,7 +53,7 @@ public:
m_socket = new QUdpSocket(parent); m_socket = new QUdpSocket(parent);
} }
UDPSink (QObject *parent, unsigned int udpSize, QHostAddress& address, unsigned int port) : UDPSinkUtil (QObject *parent, unsigned int udpSize, QHostAddress& address, unsigned int port) :
m_udpSize(udpSize), m_udpSize(udpSize),
m_udpSamples(udpSize/sizeof(T)), m_udpSamples(udpSize/sizeof(T)),
m_address(address), m_address(address),
@ -65,7 +65,7 @@ public:
m_socket = new QUdpSocket(parent); m_socket = new QUdpSocket(parent);
} }
~UDPSink() ~UDPSinkUtil()
{ {
delete[] m_sampleBuffer; delete[] m_sampleBuffer;
delete m_socket; delete m_socket;