From fad3ed66b69b531b9c269d49b410da97802de42f Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 7 May 2019 21:13:32 +0200 Subject: [PATCH] GUI: removed multiple source channel warning popup --- sdrbase/device/devicesinkapi.cpp | 5 ----- sdrbase/device/devicesinkapi.h | 1 - sdrbase/dsp/dspdevicesinkengine.h | 2 -- sdrgui/mainwindow.cpp | 6 ------ 4 files changed, 14 deletions(-) diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp index 5c50b73da..f21e19997 100644 --- a/sdrbase/device/devicesinkapi.cpp +++ b/sdrbase/device/devicesinkapi.cpp @@ -108,11 +108,6 @@ void DeviceSinkAPI::renumerateChannels() } -uint32_t DeviceSinkAPI::getNumberOfSources() -{ - return m_deviceSinkEngine->getNumberOfSources(); -} - void DeviceSinkAPI::setSampleSink(DeviceSampleSink* sink) { m_deviceSinkEngine->setSink(sink); diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index 8e6e1b9ac..aa5034512 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -51,7 +51,6 @@ public: void removeThreadedSource(ThreadedBasebandSampleSource* sink); //!< Remove a baseband sample source that runs on its own thread from device engine void addChannelAPI(ChannelSourceAPI* channelAPI); void removeChannelAPI(ChannelSourceAPI* channelAPI); - uint32_t getNumberOfSources(); void setSampleSink(DeviceSampleSink* sink); //!< Set device engine sample sink type DeviceSampleSink *getSampleSink(); //!< Return pointer to the device sample sink bool initGeneration(); //!< Initialize device engine generation sequence diff --git a/sdrbase/dsp/dspdevicesinkengine.h b/sdrbase/dsp/dspdevicesinkengine.h index a96de9f0b..a4ecc9894 100644 --- a/sdrbase/dsp/dspdevicesinkengine.h +++ b/sdrbase/dsp/dspdevicesinkengine.h @@ -73,8 +73,6 @@ public: void addThreadedSource(ThreadedBasebandSampleSource* source); //!< Add a baseband sample source that will run on its own thread void removeThreadedSource(ThreadedBasebandSampleSource* source); //!< Remove a baseband sample source that runs on its own thread - uint32_t getNumberOfSources() const { return m_basebandSampleSources.size() + m_threadedBasebandSampleSources.size(); } - void addSpectrumSink(BasebandSampleSink* spectrumSink); //!< Add a spectrum vis baseband sample sink void removeSpectrumSink(BasebandSampleSink* spectrumSink); //!< Add a spectrum vis baseband sample sink diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index dab6b9c9e..299ce1e90 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -1673,12 +1673,6 @@ void MainWindow::channelAddClicked(bool checked) } else if (deviceUI->m_deviceSinkEngine) // sink device => Tx channels { - uint32_t nbSources = deviceUI->m_deviceSinkAPI->getNumberOfSources(); - - if (nbSources > 0) { - QMessageBox::information(this, tr("Message"), tr("%1 channel(s) already in use. Multiple transmission channels is experimental. You may experience performance problems").arg(nbSources)); - } - m_pluginManager->createTxChannelInstance(deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI, deviceUI->m_deviceSinkAPI); } }