1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00

SoapySDR support: use singleton for enumeration and device management

This commit is contained in:
f4exb
2018-10-29 17:20:04 +01:00
parent c82d838708
commit 0e9a0f4f6d
4 changed files with 119 additions and 4 deletions
@@ -18,7 +18,7 @@
#include "plugin/pluginapi.h"
#include "util/simpleserializer.h"
#include "device/devicesourceapi.h"
#include "soapysdr/devicesoapysdrscan.h"
#include "soapysdr/devicesoapysdr.h"
#include "soapysdrinputplugin.h"
@@ -58,9 +58,8 @@ void SoapySDRInputPlugin::initPlugin(PluginAPI* pluginAPI)
PluginInterface::SamplingDevices SoapySDRInputPlugin::enumSampleSources()
{
SamplingDevices result;
DeviceSoapySDRScan scanner;
scanner.scan();
const std::vector<DeviceSoapySDRScan::SoapySDRDeviceEnum>& devicesEnumeration = scanner.getDevicesEnumeration();
DeviceSoapySDR& deviceSoapySDR = DeviceSoapySDR::instance();
const std::vector<DeviceSoapySDRScan::SoapySDRDeviceEnum>& devicesEnumeration = deviceSoapySDR.getDevicesEnumeration();
qDebug("SoapySDRInputPlugin::enumSampleSources: found %lu devices", devicesEnumeration.size());
std::vector<DeviceSoapySDRScan::SoapySDRDeviceEnum>::const_iterator it = devicesEnumeration.begin();