VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-04 14:17:50 -04:00
Code Issues Projects Releases Wiki Activity

New audio devices dialog and handling: put the AudioDeviceInfo object on the main window stack instead of dynamically allocating

Browse Source
This commit is contained in:
f4exb 2017-01-06 19:00:45 +01:00
parent fb3e6dc90d
commit 83fcf912e9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdrbase/mainwindow.cpp
View File

@ -57,7 +57,6 @@
MainWindow::MainWindow(QWidget* parent) : MainWindow::MainWindow(QWidget* parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
m_audioDeviceInfo(new AudioDeviceInfo),
m_masterTabIndex(0), m_masterTabIndex(0),
m_settings(), m_settings(),
m_dspEngine(DSPEngine::instance()), m_dspEngine(DSPEngine::instance()),
@ -69,7 +68,7 @@ MainWindow::MainWindow(QWidget* parent) :
{ {
qDebug() << "MainWindow::MainWindow: start"; qDebug() << "MainWindow::MainWindow: start";
m_settings.setAudioDeviceInfo(m_audioDeviceInfo); m_settings.setAudioDeviceInfo(&m_audioDeviceInfo);
ui->setupUi(this); ui->setupUi(this);
createStatusBar(); createStatusBar();
@ -739,11 +738,11 @@ void MainWindow::on_action_Loaded_Plugins_triggered()
void MainWindow::on_action_Audio_triggered() void MainWindow::on_action_Audio_triggered()
{ {
AudioDialog audioDialog(m_audioDeviceInfo, this); AudioDialog audioDialog(&m_audioDeviceInfo, this);
audioDialog.exec(); audioDialog.exec();
m_dspEngine->setAudioInputVolume(m_audioDeviceInfo->getInputVolume()); m_dspEngine->setAudioInputVolume(m_audioDeviceInfo.getInputVolume());
m_dspEngine->setAudioInputDeviceIndex(m_audioDeviceInfo->getInputDeviceIndex()); m_dspEngine->setAudioInputDeviceIndex(m_audioDeviceInfo.getInputDeviceIndex());
m_dspEngine->setAudioOutputDeviceIndex(m_audioDeviceInfo->getOutputDeviceIndex()); m_dspEngine->setAudioOutputDeviceIndex(m_audioDeviceInfo.getOutputDeviceIndex());
} }
void MainWindow::on_action_My_Position_triggered() void MainWindow::on_action_My_Position_triggered()

2
sdrbase/mainwindow.h
View File

@ -101,7 +101,7 @@ private:
}; };
Ui::MainWindow* ui; Ui::MainWindow* ui;
AudioDeviceInfo* m_audioDeviceInfo; AudioDeviceInfo m_audioDeviceInfo;
MessageQueue m_inputMessageQueue; MessageQueue m_inputMessageQueue;
MainSettings m_settings; MainSettings m_settings;
std::vector<DeviceUISet*> m_deviceUIs; std::vector<DeviceUISet*> m_deviceUIs;