|
|
|
|
@ -30,6 +30,7 @@
@@ -30,6 +30,7 @@
|
|
|
|
|
#include "device/devicesourceapi.h" |
|
|
|
|
#include "device/devicesinkapi.h" |
|
|
|
|
#include "device/deviceuiset.h" |
|
|
|
|
#include "device/deviceenumerator.h" |
|
|
|
|
#include "audio/audiodeviceinfo.h" |
|
|
|
|
#include "gui/indicator.h" |
|
|
|
|
#include "gui/presetitem.h" |
|
|
|
|
@ -138,36 +139,42 @@ MainWindow::MainWindow(QWidget* parent) :
@@ -138,36 +139,42 @@ MainWindow::MainWindow(QWidget* parent) :
|
|
|
|
|
|
|
|
|
|
qDebug() << "MainWindow::MainWindow: select SampleSource from settings..."; |
|
|
|
|
|
|
|
|
|
int sampleSourceIndex = m_settings.getSourceIndex(); |
|
|
|
|
sampleSourceIndex = m_pluginManager->selectSampleSourceByIndex(sampleSourceIndex, m_deviceUIs.back()->m_deviceSourceAPI); |
|
|
|
|
int deviceIndex = DeviceEnumerator::instance()->getRxSamplingDeviceIndex(m_settings.getSourceDeviceId(), m_settings.getSourceIndex()); |
|
|
|
|
|
|
|
|
|
if (sampleSourceIndex < 0) |
|
|
|
|
if (deviceIndex >= 0) |
|
|
|
|
{ |
|
|
|
|
qCritical("MainWindow::MainWindow: no sample source. Exit"); |
|
|
|
|
exit(0); |
|
|
|
|
} |
|
|
|
|
// delete previous plugin GUI
|
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourcePluginInstanceGUI()); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->resetSampleSourceId(); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceInput( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists
|
|
|
|
|
|
|
|
|
|
// delete previous plugin GUI
|
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourcePluginInstanceGUI()); |
|
|
|
|
m_deviceUIs.back()->m_samplingDeviceControl->setSelectedDeviceIndex(deviceIndex); |
|
|
|
|
|
|
|
|
|
DeviceSampleSource *source = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), m_deviceUIs.back()->m_deviceSourceAPI); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSource(source); |
|
|
|
|
QWidget *gui; |
|
|
|
|
PluginInstanceGUI *pluginGUI = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), |
|
|
|
|
&gui, |
|
|
|
|
m_deviceUIs.back()); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginGUI->getInputMessageQueue()); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginGUI); |
|
|
|
|
setDeviceGUI(0, gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName()); |
|
|
|
|
PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceIndex); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSerial(samplingDevice.serial); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceDisplayName(samplingDevice.displayedName); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(deviceIndex)); |
|
|
|
|
|
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setBuddyLeader(true); // the first device is always the leader
|
|
|
|
|
DeviceSampleSource *source = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), m_deviceUIs.back()->m_deviceSourceAPI); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSource(source); |
|
|
|
|
QWidget *gui; |
|
|
|
|
PluginInstanceGUI *pluginGUI = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceGUI( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), |
|
|
|
|
&gui, |
|
|
|
|
m_deviceUIs.back()); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginGUI->getInputMessageQueue()); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginGUI); |
|
|
|
|
setDeviceGUI(0, gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool sampleSourceSignalsBlocked = m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->blockSignals(true); |
|
|
|
|
m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->setCurrentIndex(sampleSourceIndex); |
|
|
|
|
m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->blockSignals(sampleSourceSignalsBlocked); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setBuddyLeader(true); // the first device is always the leader
|
|
|
|
|
|
|
|
|
|
qDebug() << "MainWindow::MainWindow: load current preset settings..."; |
|
|
|
|
|
|
|
|
|
@ -205,7 +212,7 @@ void MainWindow::addSourceDevice()
@@ -205,7 +212,7 @@ void MainWindow::addSourceDevice()
|
|
|
|
|
sprintf(uidCStr, "UID:%d", dspDeviceSourceEngineUID); |
|
|
|
|
|
|
|
|
|
int deviceTabIndex = m_deviceUIs.size(); |
|
|
|
|
m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_masterTimer)); |
|
|
|
|
m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, true, m_masterTimer)); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceEngine = dspDeviceSourceEngine; |
|
|
|
|
|
|
|
|
|
char tabNameCStr[16]; |
|
|
|
|
@ -227,24 +234,28 @@ void MainWindow::addSourceDevice()
@@ -227,24 +234,28 @@ void MainWindow::addSourceDevice()
|
|
|
|
|
ui->tabSpectraGUI->addTab(m_deviceUIs.back()->m_spectrumGUI, tabNameCStr); |
|
|
|
|
ui->tabChannels->addTab(m_deviceUIs.back()->m_channelWindow, tabNameCStr); |
|
|
|
|
|
|
|
|
|
bool sampleSourceSignalsBlocked = m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->blockSignals(true); |
|
|
|
|
m_pluginManager->duplicateLocalSampleSourceDevices(dspDeviceSourceEngineUID); |
|
|
|
|
// FIXME: replace with the device selection dialog based on static enumeration
|
|
|
|
|
m_pluginManager->fillSampleSourceSelector(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector(), dspDeviceSourceEngineUID); |
|
|
|
|
|
|
|
|
|
connect(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelectionConfirm(), SIGNAL(clicked(bool)), this, SLOT(on_sampleSource_confirmClicked(bool))); |
|
|
|
|
connect(m_deviceUIs.back()->m_samplingDeviceControl, SIGNAL(changed()), this, SLOT(on_sampleSource_changed())); |
|
|
|
|
|
|
|
|
|
m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->blockSignals(sampleSourceSignalsBlocked); |
|
|
|
|
ui->tabInputsSelect->addTab(m_deviceUIs.back()->m_samplingDeviceControl, tabNameCStr); |
|
|
|
|
ui->tabInputsSelect->setTabToolTip(deviceTabIndex, QString(uidCStr)); |
|
|
|
|
|
|
|
|
|
// Create a file source instance by default
|
|
|
|
|
m_pluginManager->selectSampleSourceBySerialOrSequence("sdrangel.samplesource.filesource", "0", 0, m_deviceUIs.back()->m_deviceSourceAPI); |
|
|
|
|
int fileSourceDeviceIndex = DeviceEnumerator::instance()->getFileSourceDeviceIndex(); |
|
|
|
|
PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(fileSourceDeviceIndex); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceSerial(samplingDevice.serial); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourceDisplayName(samplingDevice.displayedName); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(fileSourceDeviceIndex)); |
|
|
|
|
|
|
|
|
|
m_deviceUIs.back()->m_samplingDeviceControl->setSelectedDeviceIndex(fileSourceDeviceIndex); |
|
|
|
|
|
|
|
|
|
// delete previous plugin GUI
|
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourcePluginInstanceGUI()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DeviceSampleSource *source = m_deviceUIs.back()->m_deviceSourceAPI->getPluginInterface()->createSampleSourcePluginInstanceInput( |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceId(), m_deviceUIs.back()->m_deviceSourceAPI); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSource(source); |
|
|
|
|
@ -256,7 +267,6 @@ void MainWindow::addSourceDevice()
@@ -256,7 +267,6 @@ void MainWindow::addSourceDevice()
|
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->getSampleSource()->setMessageQueueToGUI(pluginGUI->getInputMessageQueue()); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceAPI->setSampleSourcePluginInstanceGUI(pluginGUI); |
|
|
|
|
setDeviceGUI(deviceTabIndex, gui, m_deviceUIs.back()->m_deviceSourceAPI->getSampleSourceDisplayName()); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void MainWindow::addSinkDevice() |
|
|
|
|
@ -269,7 +279,7 @@ void MainWindow::addSinkDevice()
@@ -269,7 +279,7 @@ void MainWindow::addSinkDevice()
|
|
|
|
|
sprintf(uidCStr, "UID:%d", dspDeviceSinkEngineUID); |
|
|
|
|
|
|
|
|
|
int deviceTabIndex = m_deviceUIs.size(); |
|
|
|
|
m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, m_masterTimer)); |
|
|
|
|
m_deviceUIs.push_back(new DeviceUISet(deviceTabIndex, false, m_masterTimer)); |
|
|
|
|
m_deviceUIs.back()->m_deviceSourceEngine = 0; |
|
|
|
|
m_deviceUIs.back()->m_deviceSinkEngine = dspDeviceSinkEngine; |
|
|
|
|
|
|
|
|
|
@ -293,19 +303,22 @@ void MainWindow::addSinkDevice()
@@ -293,19 +303,22 @@ void MainWindow::addSinkDevice()
|
|
|
|
|
ui->tabSpectraGUI->addTab(m_deviceUIs.back()->m_spectrumGUI, tabNameCStr); |
|
|
|
|
ui->tabChannels->addTab(m_deviceUIs.back()->m_channelWindow, tabNameCStr); |
|
|
|
|
|
|
|
|
|
bool sampleSourceSignalsBlocked = m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->blockSignals(true); |
|
|
|
|
m_pluginManager->duplicateLocalSampleSinkDevices(dspDeviceSinkEngineUID); |
|
|
|
|
// FIXME: replace with the device selection dialog based on static enumeration
|
|
|
|
|
m_pluginManager->fillSampleSinkSelector(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector(), dspDeviceSinkEngineUID); |
|
|
|
|
|
|
|
|
|
connect(m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelectionConfirm(), SIGNAL(clicked(bool)), this, SLOT(on_sampleSink_confirmClicked(bool))); |
|
|
|
|
connect(m_deviceUIs.back()->m_samplingDeviceControl, SIGNAL(changed()), this, SLOT(on_sampleSink_changed())); |
|
|
|
|
|
|
|
|
|
m_deviceUIs.back()->m_samplingDeviceControl->getDeviceSelector()->blockSignals(sampleSourceSignalsBlocked); |
|
|
|
|
ui->tabInputsSelect->addTab(m_deviceUIs.back()->m_samplingDeviceControl, tabNameCStr); |
|
|
|
|
ui->tabInputsSelect->setTabToolTip(deviceTabIndex, QString(uidCStr)); |
|
|
|
|
|
|
|
|
|
// create a file sink by default
|
|
|
|
|
m_pluginManager->selectSampleSinkBySerialOrSequence("sdrangel.samplesink.filesink", "0", 0, m_deviceUIs.back()->m_deviceSinkAPI); |
|
|
|
|
int fileSinkDeviceIndex = DeviceEnumerator::instance()->getFileSinkDeviceIndex(); |
|
|
|
|
PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(fileSinkDeviceIndex); |
|
|
|
|
m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); |
|
|
|
|
m_deviceUIs.back()->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); |
|
|
|
|
m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); |
|
|
|
|
m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkSerial(samplingDevice.serial); |
|
|
|
|
m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkDisplayName(samplingDevice.displayedName); |
|
|
|
|
m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkPluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(fileSinkDeviceIndex)); |
|
|
|
|
|
|
|
|
|
m_deviceUIs.back()->m_samplingDeviceControl->setSelectedDeviceIndex(fileSinkDeviceIndex); |
|
|
|
|
|
|
|
|
|
// delete previous plugin GUI if it exists
|
|
|
|
|
m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI( |
|
|
|
|
@ -862,7 +875,7 @@ void MainWindow::on_action_DV_Serial_triggered(bool checked)
@@ -862,7 +875,7 @@ void MainWindow::on_action_DV_Serial_triggered(bool checked)
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unused))) |
|
|
|
|
void MainWindow::on_sampleSource_changed() |
|
|
|
|
{ |
|
|
|
|
// Do it in the currently selected source tab
|
|
|
|
|
int currentSourceTabIndex = ui->tabInputsSelect->currentIndex(); |
|
|
|
|
@ -872,8 +885,6 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
@@ -872,8 +885,6 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
|
|
|
|
|
qDebug("MainWindow::on_sampleSource_confirmClicked: tab at %d", currentSourceTabIndex); |
|
|
|
|
DeviceUISet *deviceUI = m_deviceUIs[currentSourceTabIndex]; |
|
|
|
|
deviceUI->m_deviceSourceAPI->saveSourceSettings(m_settings.getWorkingPreset()); // save old API settings
|
|
|
|
|
int selectedComboIndex = deviceUI->m_samplingDeviceControl->getDeviceSelector()->currentIndex(); |
|
|
|
|
void *devicePtr = deviceUI->m_samplingDeviceControl->getDeviceSelector()->itemData(selectedComboIndex).value<void *>(); |
|
|
|
|
deviceUI->m_deviceSourceAPI->stopAcquisition(); |
|
|
|
|
|
|
|
|
|
// deletes old UI and input object
|
|
|
|
|
@ -885,7 +896,13 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
@@ -885,7 +896,13 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
|
|
|
|
|
deviceUI->m_deviceSourceAPI->getSampleSource()); |
|
|
|
|
deviceUI->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists
|
|
|
|
|
|
|
|
|
|
m_pluginManager->selectSampleSourceByDevice(devicePtr, deviceUI->m_deviceSourceAPI); // sets the new API
|
|
|
|
|
PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getRxSamplingDevice(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex()); |
|
|
|
|
deviceUI->m_deviceSourceAPI->setSampleSourceSequence(samplingDevice.sequence); |
|
|
|
|
deviceUI->m_deviceSourceAPI->setHardwareId(samplingDevice.hardwareId); |
|
|
|
|
deviceUI->m_deviceSourceAPI->setSampleSourceId(samplingDevice.id); |
|
|
|
|
deviceUI->m_deviceSourceAPI->setSampleSourceSerial(samplingDevice.serial); |
|
|
|
|
deviceUI->m_deviceSourceAPI->setSampleSourceDisplayName(samplingDevice.displayedName); |
|
|
|
|
deviceUI->m_deviceSourceAPI->setSampleSourcePluginInterface(DeviceEnumerator::instance()->getRxPluginInterface(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex())); |
|
|
|
|
|
|
|
|
|
// add to buddies list
|
|
|
|
|
std::vector<DeviceUISet*>::iterator it = m_deviceUIs.begin(); |
|
|
|
|
@ -936,14 +953,15 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
@@ -936,14 +953,15 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
|
|
|
|
|
|
|
|
|
|
deviceUI->m_deviceSourceAPI->loadSourceSettings(m_settings.getWorkingPreset()); // load new API settings
|
|
|
|
|
|
|
|
|
|
if (currentSourceTabIndex == 0) |
|
|
|
|
if (currentSourceTabIndex == 0) // save as default starting device
|
|
|
|
|
{ |
|
|
|
|
m_settings.setSourceIndex(deviceUI->m_samplingDeviceControl->getDeviceSelector()->currentIndex()); |
|
|
|
|
m_settings.setSourceIndex(samplingDevice.sequence); |
|
|
|
|
m_settings.setSourceDeviceId(samplingDevice.id); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused))) |
|
|
|
|
void MainWindow::on_sampleSink_changed() |
|
|
|
|
{ |
|
|
|
|
// Do it in the currently selected source tab
|
|
|
|
|
int currentSinkTabIndex = ui->tabInputsSelect->currentIndex(); |
|
|
|
|
@ -953,8 +971,6 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused
@@ -953,8 +971,6 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused
|
|
|
|
|
qDebug("MainWindow::on_sampleSink_confirmClicked: tab at %d", currentSinkTabIndex); |
|
|
|
|
DeviceUISet *deviceUI = m_deviceUIs[currentSinkTabIndex]; |
|
|
|
|
deviceUI->m_deviceSinkAPI->saveSinkSettings(m_settings.getWorkingPreset()); // save old API settings
|
|
|
|
|
int selectedComboIndex = deviceUI->m_samplingDeviceControl->getDeviceSelector()->currentIndex(); |
|
|
|
|
void *devicePtr = deviceUI->m_samplingDeviceControl->getDeviceSelector()->itemData(selectedComboIndex).value<void *>(); |
|
|
|
|
deviceUI->m_deviceSinkAPI->stopGeneration(); |
|
|
|
|
|
|
|
|
|
// deletes old UI and output object
|
|
|
|
|
@ -966,7 +982,13 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused
@@ -966,7 +982,13 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused
|
|
|
|
|
deviceUI->m_deviceSinkAPI->getSampleSink()); |
|
|
|
|
deviceUI->m_deviceSinkAPI->clearBuddiesLists(); // clear old API buddies lists
|
|
|
|
|
|
|
|
|
|
m_pluginManager->selectSampleSinkByDevice(devicePtr, deviceUI->m_deviceSinkAPI); // sets the new API
|
|
|
|
|
PluginInterface::SamplingDevice samplingDevice = DeviceEnumerator::instance()->getTxSamplingDevice(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex()); |
|
|
|
|
deviceUI->m_deviceSinkAPI->setSampleSinkSequence(samplingDevice.sequence); |
|
|
|
|
deviceUI->m_deviceSinkAPI->setHardwareId(samplingDevice.hardwareId); |
|
|
|
|
deviceUI->m_deviceSinkAPI->setSampleSinkId(samplingDevice.id); |
|
|
|
|
deviceUI->m_deviceSinkAPI->setSampleSinkSerial(samplingDevice.serial); |
|
|
|
|
deviceUI->m_deviceSinkAPI->setSampleSinkDisplayName(samplingDevice.displayedName); |
|
|
|
|
deviceUI->m_deviceSinkAPI->setSampleSinkPluginInterface(DeviceEnumerator::instance()->getTxPluginInterface(deviceUI->m_samplingDeviceControl->getSelectedDeviceIndex())); |
|
|
|
|
|
|
|
|
|
// add to buddies list
|
|
|
|
|
std::vector<DeviceUISet*>::iterator it = m_deviceUIs.begin(); |
|
|
|
|
@ -1043,7 +1065,6 @@ void MainWindow::on_channel_addClicked(bool checked __attribute__((unused)))
@@ -1043,7 +1065,6 @@ void MainWindow::on_channel_addClicked(bool checked __attribute__((unused)))
|
|
|
|
|
m_pluginManager->createTxChannelInstance(deviceUI->m_samplingDeviceControl->getChannelSelector()->currentIndex(), deviceUI); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void MainWindow::on_action_About_triggered() |
|
|
|
|
@ -1074,62 +1095,6 @@ void MainWindow::on_action_reloadDevices_triggered()
@@ -1074,62 +1095,6 @@ void MainWindow::on_action_reloadDevices_triggered()
|
|
|
|
|
{ |
|
|
|
|
QMessageBox::information(this, tr("Message"), tr("Not implemented")); |
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
// // all devices must be stopped
|
|
|
|
|
// std::vector<DeviceUISet*>::iterator it = m_deviceUIs.begin();
|
|
|
|
|
// for (; it != m_deviceUIs.end(); ++it)
|
|
|
|
|
// {
|
|
|
|
|
// if ((*it)->m_deviceSourceEngine) // it is a source device
|
|
|
|
|
// {
|
|
|
|
|
// if ((*it)->m_deviceSourceEngine->state() == DSPDeviceSourceEngine::StRunning)
|
|
|
|
|
// {
|
|
|
|
|
// QMessageBox::information(this, tr("Message"), tr("Stop all devices for reload to take effect"));
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// if ((*it)->m_deviceSinkEngine) // it is a sink device
|
|
|
|
|
// {
|
|
|
|
|
// if ((*it)->m_deviceSinkEngine->state() == DSPDeviceSinkEngine::StRunning)
|
|
|
|
|
// {
|
|
|
|
|
// QMessageBox::information(this, tr("Message"), tr("Stop all devices for reload to take effect"));
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// // re-scan devices
|
|
|
|
|
// m_pluginManager->updateSampleSourceDevices();
|
|
|
|
|
// m_pluginManager->updateSampleSinkDevices();
|
|
|
|
|
//
|
|
|
|
|
// // re-populate device selectors keeping the same selection
|
|
|
|
|
// it = m_deviceUIs.begin();
|
|
|
|
|
// for (; it != m_deviceUIs.end(); ++it)
|
|
|
|
|
// {
|
|
|
|
|
// if ((*it)->m_deviceSourceEngine) // it is a source device
|
|
|
|
|
// {
|
|
|
|
|
// QComboBox *deviceSelectorComboBox = (*it)->m_samplingDeviceControl->getDeviceSelector();
|
|
|
|
|
// bool sampleSourceSignalsBlocked = deviceSelectorComboBox->blockSignals(true);
|
|
|
|
|
// uint dspDeviceSourceEngineUID = (*it)->m_deviceSourceEngine->getUID();
|
|
|
|
|
// m_pluginManager->duplicateLocalSampleSourceDevices(dspDeviceSourceEngineUID);
|
|
|
|
|
// m_pluginManager->fillSampleSourceSelector(deviceSelectorComboBox, dspDeviceSourceEngineUID);
|
|
|
|
|
// int newIndex = m_pluginManager->getSampleSourceSelectorIndex(deviceSelectorComboBox, (*it)->m_deviceSourceAPI);
|
|
|
|
|
// deviceSelectorComboBox->setCurrentIndex(newIndex);
|
|
|
|
|
// deviceSelectorComboBox->blockSignals(sampleSourceSignalsBlocked);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// if ((*it)->m_deviceSinkEngine) // it is a sink device
|
|
|
|
|
// {
|
|
|
|
|
// QComboBox *deviceSelectorComboBox = (*it)->m_samplingDeviceControl->getDeviceSelector();
|
|
|
|
|
// bool sampleSinkSignalsBlocked = deviceSelectorComboBox->blockSignals(true);
|
|
|
|
|
// uint dspDeviceSinkEngineUID = (*it)->m_deviceSinkEngine->getUID();
|
|
|
|
|
// m_pluginManager->duplicateLocalSampleSinkDevices(dspDeviceSinkEngineUID);
|
|
|
|
|
// m_pluginManager->fillSampleSinkSelector(deviceSelectorComboBox, dspDeviceSinkEngineUID);
|
|
|
|
|
// int newIndex = m_pluginManager->getSampleSinkSelectorIndex(deviceSelectorComboBox, (*it)->m_deviceSinkAPI);
|
|
|
|
|
// deviceSelectorComboBox->setCurrentIndex(newIndex);
|
|
|
|
|
// deviceSelectorComboBox->blockSignals(sampleSinkSignalsBlocked);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void MainWindow::on_action_Exit_triggered() |
|
|
|
|
|