mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-04-06 03:29:12 -04:00
Fixed warnings with g++ 6.3
This commit is contained in:
parent
4d07272503
commit
95b191353b
plugins/channelrx/udpsrc
sdrbase
@ -476,7 +476,7 @@ void UDPSrc::apply(bool force)
|
||||
m_outMovingAverage.resize(m_config.m_outputSampleRate * 0.01, 1e-10); // 10 ms
|
||||
}
|
||||
|
||||
if ((m_config.m_audioActive != m_config.m_audioActive) || force)
|
||||
if ((m_config.m_audioActive != m_running.m_audioActive) || force)
|
||||
{
|
||||
if (m_config.m_audioActive)
|
||||
{
|
||||
|
@ -395,8 +395,6 @@ bool DeviceSinkAPI::ChannelInstanceRegistration::operator<(const ChannelInstance
|
||||
|
||||
void DeviceSinkAPI::addSourceBuddy(DeviceSourceAPI* buddy)
|
||||
{
|
||||
std::vector<DeviceSourceAPI*>::iterator it = m_sourceBuddies.begin();
|
||||
|
||||
m_sourceBuddies.push_back(buddy);
|
||||
buddy->m_sinkBuddies.push_back(this);
|
||||
qDebug("DeviceSinkAPI::addSourceBuddy: added buddy %s(%s) to the list [%lx] <-> [%lx]",
|
||||
@ -408,8 +406,6 @@ void DeviceSinkAPI::addSourceBuddy(DeviceSourceAPI* buddy)
|
||||
|
||||
void DeviceSinkAPI::addSinkBuddy(DeviceSinkAPI* buddy)
|
||||
{
|
||||
std::vector<DeviceSinkAPI*>::iterator it = m_sinkBuddies.begin();
|
||||
|
||||
m_sinkBuddies.push_back(buddy);
|
||||
buddy->m_sinkBuddies.push_back(this);
|
||||
qDebug("DeviceSinkAPI::addSinkBuddy: added buddy %s(%s) to the list [%lx] <-> [%lx]",
|
||||
|
@ -398,8 +398,6 @@ bool DeviceSourceAPI::ChannelInstanceRegistration::operator<(const ChannelInstan
|
||||
|
||||
void DeviceSourceAPI::addSourceBuddy(DeviceSourceAPI* buddy)
|
||||
{
|
||||
std::vector<DeviceSourceAPI*>::iterator it = m_sourceBuddies.begin();
|
||||
|
||||
m_sourceBuddies.push_back(buddy);
|
||||
buddy->m_sourceBuddies.push_back(this);
|
||||
qDebug("DeviceSourceAPI::addSourceBuddy: added buddy %s(%s) [%lx] <-> [%lx]",
|
||||
@ -411,8 +409,6 @@ void DeviceSourceAPI::addSourceBuddy(DeviceSourceAPI* buddy)
|
||||
|
||||
void DeviceSourceAPI::addSinkBuddy(DeviceSinkAPI* buddy)
|
||||
{
|
||||
std::vector<DeviceSinkAPI*>::iterator it = m_sinkBuddies.begin();
|
||||
|
||||
m_sinkBuddies.push_back(buddy);
|
||||
buddy->m_sourceBuddies.push_back(this);
|
||||
qDebug("DeviceSourceAPI::addSinkBuddy: added buddy %s(%s) [%lx] <-> [%lx]",
|
||||
|
@ -54,11 +54,13 @@ AudioDialog::AudioDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent) :
|
||||
i++;
|
||||
}
|
||||
|
||||
if(ui->audioOutTree->currentItem() == NULL)
|
||||
if(ui->audioOutTree->currentItem() == 0) {
|
||||
ui->audioOutTree->setCurrentItem(ui->audioOutTree->topLevelItem(0));
|
||||
}
|
||||
|
||||
if(ui->audioInTree->currentItem() == NULL)
|
||||
if(ui->audioInTree->currentItem() == 0) {
|
||||
ui->audioInTree->setCurrentItem(ui->audioInTree->topLevelItem(0));
|
||||
}
|
||||
|
||||
ui->tabWidget->setCurrentIndex(0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user