mirror of https://github.com/f4exb/sdrangel.git
SoapySDR: added try/catch blocks around calls to SoapySDR interface methods where missing
This commit is contained in:
parent
00ca85c0bf
commit
932048dba0
|
@ -720,12 +720,19 @@ void SoapySDROutput::updateGains(SoapySDR::Device *dev, int requestedChannel, So
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
settings.m_globalGain = round(dev->getGain(SOAPY_SDR_TX, requestedChannel));
|
settings.m_globalGain = round(dev->getGain(SOAPY_SDR_TX, requestedChannel));
|
||||||
|
|
||||||
for (const auto &name : settings.m_individualGains.keys()) {
|
for (const auto &name : settings.m_individualGains.keys()) {
|
||||||
settings.m_individualGains[name] = dev->getGain(SOAPY_SDR_TX, requestedChannel, name.toStdString());
|
settings.m_individualGains[name] = dev->getGain(SOAPY_SDR_TX, requestedChannel, name.toStdString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (const std::exception &ex)
|
||||||
|
{
|
||||||
|
qCritical("SoapySDROutput::updateGains: caught exception: %s", ex.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void SoapySDROutput::updateTunableElements(SoapySDR::Device *dev, int requestedChannel, SoapySDROutputSettings& settings)
|
void SoapySDROutput::updateTunableElements(SoapySDR::Device *dev, int requestedChannel, SoapySDROutputSettings& settings)
|
||||||
{
|
{
|
||||||
|
@ -733,10 +740,17 @@ void SoapySDROutput::updateTunableElements(SoapySDR::Device *dev, int requestedC
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
for (const auto &name : settings.m_tunableElements.keys()) {
|
for (const auto &name : settings.m_tunableElements.keys()) {
|
||||||
settings.m_tunableElements[name] = dev->getFrequency(SOAPY_SDR_TX, requestedChannel, name.toStdString());
|
settings.m_tunableElements[name] = dev->getFrequency(SOAPY_SDR_TX, requestedChannel, name.toStdString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (const std::exception &ex)
|
||||||
|
{
|
||||||
|
qCritical("SoapySDROutput::updateTunableElements: caught exception: %s", ex.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool SoapySDROutput::handleMessage(const Message& message)
|
bool SoapySDROutput::handleMessage(const Message& message)
|
||||||
{
|
{
|
||||||
|
|
|
@ -749,12 +749,19 @@ void SoapySDRInput::updateGains(SoapySDR::Device *dev, int requestedChannel, Soa
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
settings.m_globalGain = round(dev->getGain(SOAPY_SDR_RX, requestedChannel));
|
settings.m_globalGain = round(dev->getGain(SOAPY_SDR_RX, requestedChannel));
|
||||||
|
|
||||||
for (const auto &name : settings.m_individualGains.keys()) {
|
for (const auto &name : settings.m_individualGains.keys()) {
|
||||||
settings.m_individualGains[name] = dev->getGain(SOAPY_SDR_RX, requestedChannel, name.toStdString());
|
settings.m_individualGains[name] = dev->getGain(SOAPY_SDR_RX, requestedChannel, name.toStdString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (const std::exception &ex)
|
||||||
|
{
|
||||||
|
qCritical("SoapySDRInput::updateGains: caught exception: %s", ex.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void SoapySDRInput::updateTunableElements(SoapySDR::Device *dev, int requestedChannel, SoapySDRInputSettings& settings)
|
void SoapySDRInput::updateTunableElements(SoapySDR::Device *dev, int requestedChannel, SoapySDRInputSettings& settings)
|
||||||
{
|
{
|
||||||
|
@ -762,10 +769,17 @@ void SoapySDRInput::updateTunableElements(SoapySDR::Device *dev, int requestedCh
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
for (const auto &name : settings.m_tunableElements.keys()) {
|
for (const auto &name : settings.m_tunableElements.keys()) {
|
||||||
settings.m_tunableElements[name] = dev->getFrequency(SOAPY_SDR_RX, requestedChannel, name.toStdString());
|
settings.m_tunableElements[name] = dev->getFrequency(SOAPY_SDR_RX, requestedChannel, name.toStdString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (const std::exception &ex)
|
||||||
|
{
|
||||||
|
qCritical("SoapySDRInput::updateTunableElements: caught exception: %s", ex.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool SoapySDRInput::handleMessage(const Message& message)
|
bool SoapySDRInput::handleMessage(const Message& message)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue