mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-23 01:55:48 -05:00
Merge branch 'f4exb:master' into audio_errors
This commit is contained in:
commit
0464b40c9c
@ -611,6 +611,7 @@ void AMDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("AMDemodGUI::audioSelect");
|
qDebug("AMDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -532,6 +532,7 @@ void BFMDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("BFMDemodGUI::audioSelect");
|
qDebug("BFMDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -701,6 +701,7 @@ void DABDemodGUI::audioSelect(const QPoint& p)
|
|||||||
{
|
{
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -515,6 +515,7 @@ void DATVDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("DATVDemodGUI::audioSelect");
|
qDebug("DATVDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -59,7 +59,8 @@ DSDDemod::DSDDemod(DeviceAPI *deviceAPI) :
|
|||||||
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
|
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
|
||||||
m_deviceAPI(deviceAPI),
|
m_deviceAPI(deviceAPI),
|
||||||
m_running(false),
|
m_running(false),
|
||||||
m_basebandSampleRate(0)
|
m_basebandSampleRate(0),
|
||||||
|
m_scopeXYSink(nullptr)
|
||||||
{
|
{
|
||||||
qDebug("DSDDemod::DSDDemod");
|
qDebug("DSDDemod::DSDDemod");
|
||||||
setObjectName(m_channelId);
|
setObjectName(m_channelId);
|
||||||
@ -175,6 +176,7 @@ void DSDDemod::start()
|
|||||||
if (m_basebandSampleRate != 0) {
|
if (m_basebandSampleRate != 0) {
|
||||||
m_basebandSink->setBasebandSampleRate(m_basebandSampleRate);
|
m_basebandSink->setBasebandSampleRate(m_basebandSampleRate);
|
||||||
}
|
}
|
||||||
|
m_basebandSink->setScopeXYSink(m_scopeXYSink);
|
||||||
|
|
||||||
m_thread->start();
|
m_thread->start();
|
||||||
|
|
||||||
@ -198,6 +200,14 @@ void DSDDemod::stop()
|
|||||||
m_thread->wait();
|
m_thread->wait();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DSDDemod::setScopeXYSink(BasebandSampleSink* sampleSink)
|
||||||
|
{
|
||||||
|
m_scopeXYSink = sampleSink;
|
||||||
|
if (m_running) {
|
||||||
|
m_basebandSink->setScopeXYSink(sampleSink);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool DSDDemod::handleMessage(const Message& cmd)
|
bool DSDDemod::handleMessage(const Message& cmd)
|
||||||
{
|
{
|
||||||
qDebug() << "DSDDemod::handleMessage";
|
qDebug() << "DSDDemod::handleMessage";
|
||||||
|
@ -155,7 +155,7 @@ public:
|
|||||||
SWGSDRangel::SWGChannelSettings& response);
|
SWGSDRangel::SWGChannelSettings& response);
|
||||||
|
|
||||||
uint32_t getNumberOfDeviceStreams() const;
|
uint32_t getNumberOfDeviceStreams() const;
|
||||||
void setScopeXYSink(BasebandSampleSink* sampleSink) { if (m_running) { m_basebandSink->setScopeXYSink(sampleSink); } }
|
void setScopeXYSink(BasebandSampleSink* sampleSink);
|
||||||
void configureMyPosition(float myLatitude, float myLongitude) { if (m_running) { m_basebandSink->configureMyPosition(myLatitude, myLongitude); } }
|
void configureMyPosition(float myLatitude, float myLongitude) { if (m_running) { m_basebandSink->configureMyPosition(myLatitude, myLongitude); } }
|
||||||
double getMagSq() { return m_running ? m_basebandSink->getMagSq() : 0.0; }
|
double getMagSq() { return m_running ? m_basebandSink->getMagSq() : 0.0; }
|
||||||
bool getSquelchOpen() const { return m_running && m_basebandSink->getSquelchOpen(); }
|
bool getSquelchOpen() const { return m_running && m_basebandSink->getSquelchOpen(); }
|
||||||
@ -186,7 +186,7 @@ private:
|
|||||||
DSDDemodSettings m_settings;
|
DSDDemodSettings m_settings;
|
||||||
int m_basebandSampleRate; //!< stored from device message used when starting baseband sink
|
int m_basebandSampleRate; //!< stored from device message used when starting baseband sink
|
||||||
QHash<Feature*, DSDDemodSettings::AvailableAMBEFeature> m_availableAMBEFeatures;
|
QHash<Feature*, DSDDemodSettings::AvailableAMBEFeature> m_availableAMBEFeatures;
|
||||||
|
BasebandSampleSink *m_scopeXYSink;
|
||||||
QNetworkAccessManager *m_networkManager;
|
QNetworkAccessManager *m_networkManager;
|
||||||
QNetworkRequest m_networkRequest;
|
QNetworkRequest m_networkRequest;
|
||||||
|
|
||||||
|
@ -101,6 +101,11 @@ bool DSDDemodGUI::handleMessage(const Message& message)
|
|||||||
DSPSignalNotification& notif = (DSPSignalNotification&) message;
|
DSPSignalNotification& notif = (DSPSignalNotification&) message;
|
||||||
m_deviceCenterFrequency = notif.getCenterFrequency();
|
m_deviceCenterFrequency = notif.getCenterFrequency();
|
||||||
m_basebandSampleRate = notif.getSampleRate();
|
m_basebandSampleRate = notif.getSampleRate();
|
||||||
|
if (m_basebandSampleRate < 48000) {
|
||||||
|
setStatusText(QString("Sample rate must be >= 48000 Hz (Currently %1 Hz)").arg(m_basebandSampleRate));
|
||||||
|
} else {
|
||||||
|
setStatusText("");
|
||||||
|
}
|
||||||
ui->deltaFrequency->setValueRange(false, 7, -m_basebandSampleRate/2, m_basebandSampleRate/2);
|
ui->deltaFrequency->setValueRange(false, 7, -m_basebandSampleRate/2, m_basebandSampleRate/2);
|
||||||
ui->deltaFrequencyLabel->setToolTip(tr("Range %1 %L2 Hz").arg(QChar(0xB1)).arg(m_basebandSampleRate/2));
|
ui->deltaFrequencyLabel->setToolTip(tr("Range %1 %L2 Hz").arg(QChar(0xB1)).arg(m_basebandSampleRate/2));
|
||||||
updateAbsoluteCenterFrequency();
|
updateAbsoluteCenterFrequency();
|
||||||
@ -602,6 +607,7 @@ void DSDDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("DSDDemodGUI::audioSelect");
|
qDebug("DSDDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>650</width>
|
<width>500</width>
|
||||||
<height>392</height>
|
<height>392</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -54,7 +54,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>648</width>
|
<width>500</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -533,7 +533,7 @@
|
|||||||
<widget class="QLabel" name="formatStatusText">
|
<widget class="QLabel" name="formatStatusText">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>595</width>
|
<width>480</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -569,13 +569,13 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>10</x>
|
<x>10</x>
|
||||||
<y>180</y>
|
<y>180</y>
|
||||||
<width>600</width>
|
<width>480</width>
|
||||||
<height>210</height>
|
<height>210</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>600</width>
|
<width>480</width>
|
||||||
<height>210</height>
|
<height>210</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -1260,6 +1260,11 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
|
<customwidget>
|
||||||
|
<class>ButtonSwitch</class>
|
||||||
|
<extends>QToolButton</extends>
|
||||||
|
<header>gui/buttonswitch.h</header>
|
||||||
|
</customwidget>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>RollupContents</class>
|
<class>RollupContents</class>
|
||||||
<extends>QWidget</extends>
|
<extends>QWidget</extends>
|
||||||
@ -1278,11 +1283,6 @@
|
|||||||
<header>gui/levelmeter.h</header>
|
<header>gui/levelmeter.h</header>
|
||||||
<container>1</container>
|
<container>1</container>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
<customwidget>
|
|
||||||
<class>ButtonSwitch</class>
|
|
||||||
<extends>QToolButton</extends>
|
|
||||||
<header>gui/buttonswitch.h</header>
|
|
||||||
</customwidget>
|
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>TVScreen</class>
|
<class>TVScreen</class>
|
||||||
<extends>QWidget</extends>
|
<extends>QWidget</extends>
|
||||||
|
@ -441,6 +441,7 @@ void FreeDVDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("FreeDVDemodGUI::audioSelect");
|
qDebug("FreeDVDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "gui/basicchannelsettingsdialog.h"
|
#include "gui/basicchannelsettingsdialog.h"
|
||||||
#include "gui/devicestreamselectiondialog.h"
|
#include "gui/devicestreamselectiondialog.h"
|
||||||
#include "gui/crightclickenabler.h"
|
#include "gui/crightclickenabler.h"
|
||||||
#include "gui/audioselectdialog.h"
|
|
||||||
#include "gui/dialpopup.h"
|
#include "gui/dialpopup.h"
|
||||||
#include "gui/dialogpositioner.h"
|
#include "gui/dialogpositioner.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
|
@ -1278,6 +1278,7 @@ void ILSDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("ILSDemodGUI::audioSelect");
|
qDebug("ILSDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -644,6 +644,7 @@ void M17DemodGUI::audioSelect(const QPoint& p)
|
|||||||
{
|
{
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -584,6 +584,7 @@ void NFMDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("NFMDemodGUI::audioSelect");
|
qDebug("NFMDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -718,6 +718,7 @@ void SSBDemodGUI::audioSelect(const QPoint& p)
|
|||||||
{
|
{
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -417,6 +417,7 @@ void VORDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("VORDemodGUI::audioSelect");
|
qDebug("VORDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -1368,6 +1368,7 @@ void VORDemodMCGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("VORDemodMCGUI::audioSelect");
|
qDebug("VORDemodMCGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -337,6 +337,7 @@ void WFMDemodGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("WFMDemodGUI::audioSelect");
|
qDebug("WFMDemodGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName);
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
#include "gui/devicestreamselectiondialog.h"
|
#include "gui/devicestreamselectiondialog.h"
|
||||||
#include "dsp/dspengine.h"
|
#include "dsp/dspengine.h"
|
||||||
#include "gui/crightclickenabler.h"
|
#include "gui/crightclickenabler.h"
|
||||||
#include "gui/audioselectdialog.h"
|
|
||||||
#include "gui/dialpopup.h"
|
#include "gui/dialpopup.h"
|
||||||
#include "gui/dialogpositioner.h"
|
#include "gui/dialogpositioner.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
@ -503,7 +503,7 @@ void AMModGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("AMModGUI::audioSelect");
|
qDebug("AMModGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -550,6 +550,7 @@ void FreeDVModGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("FreeDVModGUI::audioSelect");
|
qDebug("FreeDVModGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -717,6 +717,7 @@ void M17ModGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("M17ModGUI::audioSelect");
|
qDebug("M17ModGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
@ -731,6 +732,7 @@ void M17ModGUI::audioFeedbackSelect(const QPoint& p)
|
|||||||
qDebug("M17ModGUI::audioFeedbackSelect");
|
qDebug("M17ModGUI::audioFeedbackSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -623,6 +623,7 @@ void NFMModGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("NFMModGUI::audioSelect");
|
qDebug("NFMModGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
@ -637,6 +638,7 @@ void NFMModGUI::audioFeedbackSelect(const QPoint& p)
|
|||||||
qDebug("NFMModGUI::audioFeedbackSelect");
|
qDebug("NFMModGUI::audioFeedbackSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -770,6 +770,7 @@ void SSBModGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("SSBModGUI::audioSelect");
|
qDebug("SSBModGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
@ -784,6 +785,7 @@ void SSBModGUI::audioFeedbackSelect(const QPoint& p)
|
|||||||
qDebug("SSBModGUI::audioFeedbackSelect");
|
qDebug("SSBModGUI::audioFeedbackSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -518,6 +518,7 @@ void WFMModGUI::audioSelect(const QPoint& p)
|
|||||||
qDebug("WFMModGUI::audioSelect");
|
qDebug("WFMModGUI::audioSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, true); // true for input
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
@ -532,6 +533,7 @@ void WFMModGUI::audioFeedbackSelect(const QPoint& p)
|
|||||||
qDebug("WFMModGUI::audioFeedbackSelect");
|
qDebug("WFMModGUI::audioFeedbackSelect");
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_audioDeviceName, false); // false for output
|
||||||
audioSelect.move(p);
|
audioSelect.move(p);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -324,6 +324,7 @@ void AudioCATSISOGUI::on_transverter_clicked()
|
|||||||
void AudioCATSISOGUI::on_rxDeviceSelect_clicked()
|
void AudioCATSISOGUI::on_rxDeviceSelect_clicked()
|
||||||
{
|
{
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_txDeviceName, true, this);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_txDeviceName, true, this);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
@ -338,6 +339,7 @@ void AudioCATSISOGUI::on_rxDeviceSelect_clicked()
|
|||||||
void AudioCATSISOGUI::on_txDeviceSelect_clicked()
|
void AudioCATSISOGUI::on_txDeviceSelect_clicked()
|
||||||
{
|
{
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_txDeviceName, false, this);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_txDeviceName, false, this);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
@ -183,6 +183,7 @@ void AudioOutputGui::displaySettings()
|
|||||||
void AudioOutputGui::on_deviceSelect_clicked()
|
void AudioOutputGui::on_deviceSelect_clicked()
|
||||||
{
|
{
|
||||||
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_deviceName, false, this);
|
AudioSelectDialog audioSelect(DSPEngine::instance()->getAudioDeviceManager(), m_settings.m_deviceName, false, this);
|
||||||
|
new DialogPositioner(&audioSelect, false);
|
||||||
audioSelect.exec();
|
audioSelect.exec();
|
||||||
|
|
||||||
if (audioSelect.m_selected)
|
if (audioSelect.m_selected)
|
||||||
|
Loading…
Reference in New Issue
Block a user