VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-23 18:52:28 -04:00
Code Issues Projects Releases Wiki Activity

Renamed FileSink plugin to FileOutput: more name changes

Browse Source
This commit is contained in:
f4exb 2020-08-04 00:53:34 +02:00
parent 44a62ea505
commit eef1922b00
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdrbase/device/deviceenumerator.cpp
View File

@ -376,11 +376,11 @@ int DeviceEnumerator::getFileInputDeviceIndex() const
return -1; return -1;
} }
int DeviceEnumerator::getFileSinkDeviceIndex() const int DeviceEnumerator::getFileOutputDeviceIndex() const
{ {
for (DevicesEnumeration::const_iterator it = m_txEnumeration.begin(); it != m_txEnumeration.end(); ++it) for (DevicesEnumeration::const_iterator it = m_txEnumeration.begin(); it != m_txEnumeration.end(); ++it)
{ {
if (it->m_samplingDevice.id == PluginManager::getFileSinkDeviceId()) { if (it->m_samplingDevice.id == PluginManager::getFileOutputDeviceId()) {
return it->m_index; return it->m_index;
} }
} }

2
sdrbase/device/deviceenumerator.h
View File

@ -57,7 +57,7 @@ public:
PluginInterface *getTxPluginInterface(int deviceIndex) { return m_txEnumeration[deviceIndex].m_pluginInterface; } PluginInterface *getTxPluginInterface(int deviceIndex) { return m_txEnumeration[deviceIndex].m_pluginInterface; }
PluginInterface *getMIMOPluginInterface(int deviceIndex) { return m_mimoEnumeration[deviceIndex].m_pluginInterface; } PluginInterface *getMIMOPluginInterface(int deviceIndex) { return m_mimoEnumeration[deviceIndex].m_pluginInterface; }
int getFileInputDeviceIndex() const; //!< Get Rx default device int getFileInputDeviceIndex() const; //!< Get Rx default device
int getFileSinkDeviceIndex() const; //!< Get Tx default device int getFileOutputDeviceIndex() const; //!< Get Tx default device
int getRxSamplingDeviceIndex(const QString& deviceId, int sequence); int getRxSamplingDeviceIndex(const QString& deviceId, int sequence);
int getTxSamplingDeviceIndex(const QString& deviceId, int sequence); int getTxSamplingDeviceIndex(const QString& deviceId, int sequence);
int getMIMOSamplingDeviceIndex(const QString& deviceId, int sequence); int getMIMOSamplingDeviceIndex(const QString& deviceId, int sequence);

2
sdrbase/plugin/pluginmanager.h
View File

@ -91,7 +91,7 @@ public:
const PluginInterface *getDevicePluginInterface(const QString& deviceId) const; const PluginInterface *getDevicePluginInterface(const QString& deviceId) const;
static const QString& getFileInputDeviceId() { return m_fileInputDeviceTypeID; } static const QString& getFileInputDeviceId() { return m_fileInputDeviceTypeID; }
static const QString& getFileSinkDeviceId() { return m_fileOutputDeviceTypeID; } static const QString& getFileOutputDeviceId() { return m_fileOutputDeviceTypeID; }
private: private:
struct SamplingDevice { //!< This is the device registration struct SamplingDevice { //!< This is the device registration

4
sdrgui/mainwindow.cpp
View File

@ -406,7 +406,7 @@ void MainWindow::addSinkDevice()
ui->tabInputsSelect->setTabToolTip(deviceTabIndex, QString(uidCStr)); ui->tabInputsSelect->setTabToolTip(deviceTabIndex, QString(uidCStr));
// create a file sink by default // create a file sink by default
int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); m_deviceUIs.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
m_deviceUIs.back()->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems); m_deviceUIs.back()->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@ -1769,7 +1769,7 @@ void MainWindow::sampleSinkChanged()
if (deviceUI->m_deviceAPI->getSamplingDeviceId().size() == 0) // non existent device => replace by default if (deviceUI->m_deviceAPI->getSamplingDeviceId().size() == 0) // non existent device => replace by default
{ {
qDebug("MainWindow::sampleSinkChanged: non existent device replaced by File Sink"); qDebug("MainWindow::sampleSinkChanged: non existent device replaced by File Sink");
int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
deviceUI->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); deviceUI->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceUI->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems); deviceUI->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);

4
sdrsrv/maincore.cpp
View File

@ -299,7 +299,7 @@ void MainCore::addSinkDevice()
QList<QString> channelNames; QList<QString> channelNames;
// create a file sink by default // create a file sink by default
int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
m_deviceSets.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); m_deviceSets.back()->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
m_deviceSets.back()->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems); m_deviceSets.back()->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);
@ -523,7 +523,7 @@ void MainCore::changeSampleSink(int deviceSetIndex, int selectedDeviceIndex)
if (deviceSet->m_deviceAPI->getSamplingDeviceId().size() == 0) // non existent device => replace by default if (deviceSet->m_deviceAPI->getSamplingDeviceId().size() == 0) // non existent device => replace by default
{ {
qDebug("MainCore::changeSampleSink: non existent device replaced by File Sink"); qDebug("MainCore::changeSampleSink: non existent device replaced by File Sink");
int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileOutputDeviceIndex();
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex);
deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence); deviceSet->m_deviceAPI->setSamplingDeviceSequence(samplingDevice->sequence);
deviceSet->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems); deviceSet->m_deviceAPI->setDeviceNbItems(samplingDevice->deviceNbItems);