From b731ff851a8fd7cc2bbd0ecc56be8b9dc5327c9c Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 2 Jan 2018 01:04:49 +0100 Subject: [PATCH] Renamed some DSP messages to make them more explicit --- sdrbase/dsp/dspcommands.cpp | 8 ++++---- sdrbase/dsp/dspcommands.h | 16 ++++++++-------- sdrbase/dsp/dspdevicesourceengine.cpp | 24 ++++++++++++------------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sdrbase/dsp/dspcommands.cpp b/sdrbase/dsp/dspcommands.cpp index b5d1fb969..38cf6227d 100644 --- a/sdrbase/dsp/dspcommands.cpp +++ b/sdrbase/dsp/dspcommands.cpp @@ -29,15 +29,15 @@ MESSAGE_CLASS_DEFINITION(DSPGetSinkDeviceDescription, Message) MESSAGE_CLASS_DEFINITION(DSPGetErrorMessage, Message) MESSAGE_CLASS_DEFINITION(DSPSetSource, Message) MESSAGE_CLASS_DEFINITION(DSPSetSink, Message) -MESSAGE_CLASS_DEFINITION(DSPAddSink, Message) +MESSAGE_CLASS_DEFINITION(DSPAddBasebandSampleSink, Message) MESSAGE_CLASS_DEFINITION(DSPAddSpectrumSink, Message) MESSAGE_CLASS_DEFINITION(DSPAddSource, Message) -MESSAGE_CLASS_DEFINITION(DSPRemoveSink, Message) +MESSAGE_CLASS_DEFINITION(DSPRemoveBasebandSampleSink, Message) MESSAGE_CLASS_DEFINITION(DSPRemoveSpectrumSink, Message) MESSAGE_CLASS_DEFINITION(DSPRemoveSource, Message) -MESSAGE_CLASS_DEFINITION(DSPAddThreadedSampleSink, Message) +MESSAGE_CLASS_DEFINITION(DSPAddThreadedBasebandSampleSink, Message) MESSAGE_CLASS_DEFINITION(DSPAddThreadedSampleSource, Message) -MESSAGE_CLASS_DEFINITION(DSPRemoveThreadedSampleSink, Message) +MESSAGE_CLASS_DEFINITION(DSPRemoveThreadedBasebandSampleSink, Message) MESSAGE_CLASS_DEFINITION(DSPRemoveThreadedSampleSource, Message) MESSAGE_CLASS_DEFINITION(DSPAddAudioSink, Message) MESSAGE_CLASS_DEFINITION(DSPRemoveAudioSink, Message) diff --git a/sdrbase/dsp/dspcommands.h b/sdrbase/dsp/dspcommands.h index 8ba938381..101a51a7b 100644 --- a/sdrbase/dsp/dspcommands.h +++ b/sdrbase/dsp/dspcommands.h @@ -116,11 +116,11 @@ private: DeviceSampleSink* m_sampleSink; }; -class SDRANGEL_API DSPAddSink : public Message { +class SDRANGEL_API DSPAddBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: - DSPAddSink(BasebandSampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { } + DSPAddBasebandSampleSink(BasebandSampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { } BasebandSampleSink* getSampleSink() const { return m_sampleSink; } @@ -152,11 +152,11 @@ private: BasebandSampleSource* m_sampleSource; }; -class SDRANGEL_API DSPRemoveSink : public Message { +class SDRANGEL_API DSPRemoveBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: - DSPRemoveSink(BasebandSampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { } + DSPRemoveBasebandSampleSink(BasebandSampleSink* sampleSink) : Message(), m_sampleSink(sampleSink) { } BasebandSampleSink* getSampleSink() const { return m_sampleSink; } @@ -188,11 +188,11 @@ private: BasebandSampleSource* m_sampleSource; }; -class SDRANGEL_API DSPAddThreadedSampleSink : public Message { +class SDRANGEL_API DSPAddThreadedBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: - DSPAddThreadedSampleSink(ThreadedBasebandSampleSink* threadedSampleSink) : Message(), m_threadedSampleSink(threadedSampleSink) { } + DSPAddThreadedBasebandSampleSink(ThreadedBasebandSampleSink* threadedSampleSink) : Message(), m_threadedSampleSink(threadedSampleSink) { } ThreadedBasebandSampleSink* getThreadedSampleSink() const { return m_threadedSampleSink; } @@ -212,11 +212,11 @@ private: ThreadedBasebandSampleSource* m_threadedSampleSource; }; -class SDRANGEL_API DSPRemoveThreadedSampleSink : public Message { +class SDRANGEL_API DSPRemoveThreadedBasebandSampleSink : public Message { MESSAGE_CLASS_DECLARATION public: - DSPRemoveThreadedSampleSink(ThreadedBasebandSampleSink* threadedSampleSink) : Message(), m_threadedSampleSink(threadedSampleSink) { } + DSPRemoveThreadedBasebandSampleSink(ThreadedBasebandSampleSink* threadedSampleSink) : Message(), m_threadedSampleSink(threadedSampleSink) { } ThreadedBasebandSampleSink* getThreadedSampleSink() const { return m_threadedSampleSink; } diff --git a/sdrbase/dsp/dspdevicesourceengine.cpp b/sdrbase/dsp/dspdevicesourceengine.cpp index c8c9aeff5..8d77af6e0 100644 --- a/sdrbase/dsp/dspdevicesourceengine.cpp +++ b/sdrbase/dsp/dspdevicesourceengine.cpp @@ -125,28 +125,28 @@ void DSPDeviceSourceEngine::setSourceSequence(int sequence) void DSPDeviceSourceEngine::addSink(BasebandSampleSink* sink) { qDebug() << "DSPDeviceSourceEngine::addSink: " << sink->objectName().toStdString().c_str(); - DSPAddSink cmd(sink); + DSPAddBasebandSampleSink cmd(sink); m_syncMessenger.sendWait(cmd); } void DSPDeviceSourceEngine::removeSink(BasebandSampleSink* sink) { qDebug() << "DSPDeviceSourceEngine::removeSink: " << sink->objectName().toStdString().c_str(); - DSPRemoveSink cmd(sink); + DSPRemoveBasebandSampleSink cmd(sink); m_syncMessenger.sendWait(cmd); } void DSPDeviceSourceEngine::addThreadedSink(ThreadedBasebandSampleSink* sink) { qDebug() << "DSPDeviceSourceEngine::addThreadedSink: " << sink->objectName().toStdString().c_str(); - DSPAddThreadedSampleSink cmd(sink); + DSPAddThreadedBasebandSampleSink cmd(sink); m_syncMessenger.sendWait(cmd); } void DSPDeviceSourceEngine::removeThreadedSink(ThreadedBasebandSampleSink* sink) { qDebug() << "DSPDeviceSourceEngine::removeThreadedSink: " << sink->objectName().toStdString().c_str(); - DSPRemoveThreadedSampleSink cmd(sink); + DSPRemoveThreadedBasebandSampleSink cmd(sink); m_syncMessenger.sendWait(cmd); } @@ -555,14 +555,14 @@ void DSPDeviceSourceEngine::handleSynchronousMessages() else if (DSPSetSource::match(*message)) { handleSetSource(((DSPSetSource*) message)->getSampleSource()); } - else if (DSPAddSink::match(*message)) + else if (DSPAddBasebandSampleSink::match(*message)) { - BasebandSampleSink* sink = ((DSPAddSink*) message)->getSampleSink(); + BasebandSampleSink* sink = ((DSPAddBasebandSampleSink*) message)->getSampleSink(); m_basebandSampleSinks.push_back(sink); } - else if (DSPRemoveSink::match(*message)) + else if (DSPRemoveBasebandSampleSink::match(*message)) { - BasebandSampleSink* sink = ((DSPRemoveSink*) message)->getSampleSink(); + BasebandSampleSink* sink = ((DSPRemoveBasebandSampleSink*) message)->getSampleSink(); if(m_state == StRunning) { sink->stop(); @@ -570,9 +570,9 @@ void DSPDeviceSourceEngine::handleSynchronousMessages() m_basebandSampleSinks.remove(sink); } - else if (DSPAddThreadedSampleSink::match(*message)) + else if (DSPAddThreadedBasebandSampleSink::match(*message)) { - ThreadedBasebandSampleSink *threadedSink = ((DSPAddThreadedSampleSink*) message)->getThreadedSampleSink(); + ThreadedBasebandSampleSink *threadedSink = ((DSPAddThreadedBasebandSampleSink*) message)->getThreadedSampleSink(); m_threadedBasebandSampleSinks.push_back(threadedSink); // initialize sample rate and center frequency in the sink: DSPSignalNotification msg(m_sampleRate, m_centerFrequency); @@ -580,9 +580,9 @@ void DSPDeviceSourceEngine::handleSynchronousMessages() // start the sink: threadedSink->start(); } - else if (DSPRemoveThreadedSampleSink::match(*message)) + else if (DSPRemoveThreadedBasebandSampleSink::match(*message)) { - ThreadedBasebandSampleSink* threadedSink = ((DSPRemoveThreadedSampleSink*) message)->getThreadedSampleSink(); + ThreadedBasebandSampleSink* threadedSink = ((DSPRemoveThreadedBasebandSampleSink*) message)->getThreadedSampleSink(); threadedSink->stop(); m_threadedBasebandSampleSinks.remove(threadedSink); }