VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-04 16:01:14 -05:00
Code Issues Projects Releases Wiki Activity

GUI: removed multiple source channel warning popup

Browse Source
This commit is contained in:
f4exb 2019-05-07 21:13:32 +02:00
parent 7ea814c180
commit fad3ed66b6
4 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdrbase/device/devicesinkapi.cpp
View File

@ -108,11 +108,6 @@ void DeviceSinkAPI::renumerateChannels()
} }
uint32_t DeviceSinkAPI::getNumberOfSources()
{
return m_deviceSinkEngine->getNumberOfSources();
}
void DeviceSinkAPI::setSampleSink(DeviceSampleSink* sink) void DeviceSinkAPI::setSampleSink(DeviceSampleSink* sink)
{ {
m_deviceSinkEngine->setSink(sink); m_deviceSinkEngine->setSink(sink);

1
sdrbase/device/devicesinkapi.h
View File

@ -51,7 +51,6 @@ public:
void removeThreadedSource(ThreadedBasebandSampleSource* sink); //!< Remove a baseband sample source that runs on its own thread from device engine void removeThreadedSource(ThreadedBasebandSampleSource* sink); //!< Remove a baseband sample source that runs on its own thread from device engine
void addChannelAPI(ChannelSourceAPI* channelAPI); void addChannelAPI(ChannelSourceAPI* channelAPI);
void removeChannelAPI(ChannelSourceAPI* channelAPI); void removeChannelAPI(ChannelSourceAPI* channelAPI);
uint32_t getNumberOfSources();
void setSampleSink(DeviceSampleSink* sink); //!< Set device engine sample sink type void setSampleSink(DeviceSampleSink* sink); //!< Set device engine sample sink type
DeviceSampleSink *getSampleSink(); //!< Return pointer to the device sample sink DeviceSampleSink *getSampleSink(); //!< Return pointer to the device sample sink
bool initGeneration(); //!< Initialize device engine generation sequence bool initGeneration(); //!< Initialize device engine generation sequence

2
sdrbase/dsp/dspdevicesinkengine.h
View File

@ -73,8 +73,6 @@ public:
void addThreadedSource(ThreadedBasebandSampleSource* source); //!< Add a baseband sample source that will run on its own thread 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 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 addSpectrumSink(BasebandSampleSink* spectrumSink); //!< Add a spectrum vis baseband sample sink
void removeSpectrumSink(BasebandSampleSink* spectrumSink); //!< Add a spectrum vis baseband sample sink void removeSpectrumSink(BasebandSampleSink* spectrumSink); //!< Add a spectrum vis baseband sample sink

6
sdrgui/mainwindow.cpp
View File

@ -1673,12 +1673,6 @@ void MainWindow::channelAddClicked(bool checked)
} }
else if (deviceUI->m_deviceSinkEngine) // sink device => Tx channels 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); m_pluginManager->createTxChannelInstance(deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI, deviceUI->m_deviceSinkAPI);
} }
} }