VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-29 08:16:35 -04:00
Code Issues Projects Releases Wiki Activity

VOR localizer feature: some code simplifications

Browse Source
This commit is contained in:
f4exb 2022-03-26 09:47:15 +01:00
parent df287e8f29
commit a907b9f616
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/feature/vorlocalizer/vorlocalizer.cpp
View File

@ -30,7 +30,6 @@
#include "dsp/dspdevicesourceengine.h" #include "dsp/dspdevicesourceengine.h"
#include "dsp/devicesamplesource.h" #include "dsp/devicesamplesource.h"
#include "device/deviceset.h" #include "device/deviceset.h"
#include "device/deviceapi.h"
#include "channel/channelapi.h" #include "channel/channelapi.h"
#include "settings/serializable.h" #include "settings/serializable.h"
#include "maincore.h" #include "maincore.h"
@ -351,14 +350,11 @@ void VORLocalizer::updateChannels()
MainCore *mainCore = MainCore::instance(); MainCore *mainCore = MainCore::instance();
MessagePipes& messagePipes = mainCore->getMessagePipes(); MessagePipes& messagePipes = mainCore->getMessagePipes();
std::vector<DeviceSet*>& deviceSets = mainCore->getDeviceSets(); std::vector<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
std::vector<DeviceSet*>::const_iterator it = deviceSets.begin();
m_availableChannels.clear(); m_availableChannels.clear();
int deviceIndex = 0; for (const auto& deviceSet : deviceSets)
for (; it != deviceSets.end(); ++it, deviceIndex++)
{ {
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine; DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine;
if (deviceSourceEngine) if (deviceSourceEngine)
{ {
@ -366,9 +362,9 @@ void VORLocalizer::updateChannels()
quint64 deviceCenterFrequency = deviceSource->getCenterFrequency(); quint64 deviceCenterFrequency = deviceSource->getCenterFrequency();
int basebandSampleRate = deviceSource->getSampleRate(); int basebandSampleRate = deviceSource->getSampleRate();
for (int chi = 0; chi < (*it)->getNumberOfChannels(); chi++) for (int chi = 0; chi < deviceSet->getNumberOfChannels(); chi++)
{ {
ChannelAPI *channel = (*it)->getChannelAt(chi); ChannelAPI *channel = deviceSet->getChannelAt(chi);
if (channel->getURI() == "sdrangel.channel.vordemodsc") if (channel->getURI() == "sdrangel.channel.vordemodsc")
{ {
@ -387,7 +383,7 @@ void VORLocalizer::updateChannels()
} }
VORLocalizerSettings::AvailableChannel availableChannel = VORLocalizerSettings::AvailableChannel availableChannel =
VORLocalizerSettings::AvailableChannel{deviceIndex, chi, channel, deviceCenterFrequency, basebandSampleRate, -1}; VORLocalizerSettings::AvailableChannel{deviceSet->getIndex(), chi, channel, deviceCenterFrequency, basebandSampleRate, -1};
m_availableChannels[channel] = availableChannel; m_availableChannels[channel] = availableChannel;
} }
} }
@ -661,8 +657,8 @@ void VORLocalizer::handleChannelMessageQueue(MessageQueue* messageQueue)
void VORLocalizer::handleChannelAdded(int deviceSetIndex, ChannelAPI *channel) void VORLocalizer::handleChannelAdded(int deviceSetIndex, ChannelAPI *channel)
{ {
qDebug(" VORLocalizer::handleChannelAdded: deviceSetIndex: %d channel: %s", deviceSetIndex, qPrintable(channel->getURI())); qDebug(" VORLocalizer::handleChannelAdded: deviceSetIndex: %d channel: %s", deviceSetIndex, qPrintable(channel->getURI()));
DeviceAPI *device = MainCore::instance()->getDevice(deviceSetIndex); DeviceSet *deviceSet = MainCore::instance()->getDeviceSets()[deviceSetIndex];
DSPDeviceSourceEngine *deviceSourceEngine = device->getDeviceSourceEngine(); DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine;
if (deviceSourceEngine && (channel->getURI() == "sdrangel.channel.vordemodsc")) if (deviceSourceEngine && (channel->getURI() == "sdrangel.channel.vordemodsc"))
{ {