From ccca87477d1c6c0700599048355dd688350c1fc9 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 4 May 2016 17:07:26 +0200 Subject: [PATCH] Moved audio dialog in global Preferences menu. Check for DV Serial library and set flags --- CMakeLists.txt | 11 ++++-- ...{preferencesdialog.cpp => audiodialog.cpp} | 12 +++---- sdrbase/gui/audiodialog.h | 34 +++++++++++++++++++ .../{preferencesdialog.ui => audiodialog.ui} | 8 ++--- sdrbase/gui/preferencesdialog.h | 34 ------------------- sdrbase/mainwindow.cpp | 10 +++--- sdrbase/mainwindow.h | 2 +- sdrbase/mainwindow.ui | 20 +++++++++-- 8 files changed, 76 insertions(+), 55 deletions(-) rename sdrbase/gui/{preferencesdialog.cpp => audiodialog.cpp} (82%) create mode 100644 sdrbase/gui/audiodialog.h rename sdrbase/gui/{preferencesdialog.ui => audiodialog.ui} (92%) delete mode 100644 sdrbase/gui/preferencesdialog.h diff --git a/CMakeLists.txt b/CMakeLists.txt index bef3f85f9..089972311 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,11 @@ find_package(Boost) find_package(FFTW3F) find_package(LibDSDcc) find_package(LibMbe) +find_package(SerialDV) + +if (LIBSERIALDV_FOUND) + add_definitions(-DDSD_USE_SERIALDV) +endif() IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|x86") SET(USE_SIMD "SSE2" CACHE STRING "Use SIMD instructions") @@ -127,7 +132,7 @@ set(sdrbase_SOURCES sdrbase/gui/glspectrumgui.cpp sdrbase/gui/indicator.cpp sdrbase/gui/pluginsdialog.cpp - sdrbase/gui/preferencesdialog.cpp + sdrbase/gui/audiodialog.cpp sdrbase/gui/presetitem.cpp sdrbase/gui/rollupwidget.cpp sdrbase/gui/scale.cpp @@ -212,7 +217,7 @@ set(sdrbase_HEADERS sdrbase/gui/indicator.h sdrbase/gui/physicalunit.h sdrbase/gui/pluginsdialog.h - sdrbase/gui/preferencesdialog.h + sdrbase/gui/audiodialog.h sdrbase/gui/presetitem.h sdrbase/gui/rollupwidget.h sdrbase/gui/scale.h @@ -256,7 +261,7 @@ set(sdrbase_FORMS sdrbase/gui/glscopegui.ui sdrbase/gui/glspectrumgui.ui sdrbase/gui/pluginsdialog.ui - sdrbase/gui/preferencesdialog.ui + sdrbase/gui/audiodialog.ui ) set(sdrbase_RESOURCES diff --git a/sdrbase/gui/preferencesdialog.cpp b/sdrbase/gui/audiodialog.cpp similarity index 82% rename from sdrbase/gui/preferencesdialog.cpp rename to sdrbase/gui/audiodialog.cpp index 077ef451b..912118a9e 100644 --- a/sdrbase/gui/preferencesdialog.cpp +++ b/sdrbase/gui/audiodialog.cpp @@ -1,11 +1,11 @@ +#include #include -#include "gui/preferencesdialog.h" -#include "ui_preferencesdialog.h" +#include "ui_audiodialog.h" #include "audio/audiodeviceinfo.h" -PreferencesDialog::PreferencesDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent) : +AudioDialog::AudioDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent) : QDialog(parent), - ui(new Ui::PreferencesDialog), + ui(new Ui::AudioDialog), m_audioDeviceInfo(audioDeviceInfo) { ui->setupUi(this); @@ -44,12 +44,12 @@ PreferencesDialog::PreferencesDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* ui->tabWidget->setCurrentIndex(0); } -PreferencesDialog::~PreferencesDialog() +AudioDialog::~AudioDialog() { delete ui; } -void PreferencesDialog::accept() +void AudioDialog::accept() { QDialog::accept(); } diff --git a/sdrbase/gui/audiodialog.h b/sdrbase/gui/audiodialog.h new file mode 100644 index 000000000..50ff9423a --- /dev/null +++ b/sdrbase/gui/audiodialog.h @@ -0,0 +1,34 @@ +#ifndef INCLUDE_AUDIODIALOG_H +#define INCLUDE_AUDIODIALOG_H + +#include + +class AudioDeviceInfo; + +namespace Ui { + class AudioDialog; +} + +class AudioDialog : public QDialog { + Q_OBJECT + +public: + explicit AudioDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent = NULL); + ~AudioDialog(); + +private: + enum Audio { + ATDefault, + ATInterface, + ATDevice + }; + + Ui::AudioDialog* ui; + + AudioDeviceInfo* m_audioDeviceInfo; + +private slots: + void accept(); +}; + +#endif // INCLUDE_AUDIODIALOG_H diff --git a/sdrbase/gui/preferencesdialog.ui b/sdrbase/gui/audiodialog.ui similarity index 92% rename from sdrbase/gui/preferencesdialog.ui rename to sdrbase/gui/audiodialog.ui index af404fa5e..2046b8990 100644 --- a/sdrbase/gui/preferencesdialog.ui +++ b/sdrbase/gui/audiodialog.ui @@ -1,7 +1,7 @@ - PreferencesDialog - + AudioDialog + 0 @@ -65,7 +65,7 @@ buttonBox accepted() - PreferencesDialog + AudioDialog accept() @@ -81,7 +81,7 @@ buttonBox rejected() - PreferencesDialog + AudioDialog reject() diff --git a/sdrbase/gui/preferencesdialog.h b/sdrbase/gui/preferencesdialog.h deleted file mode 100644 index 86247f325..000000000 --- a/sdrbase/gui/preferencesdialog.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef INCLUDE_PREFERENCESDIALOG_H -#define INCLUDE_PREFERENCESDIALOG_H - -#include - -class AudioDeviceInfo; - -namespace Ui { - class PreferencesDialog; -} - -class PreferencesDialog : public QDialog { - Q_OBJECT - -public: - explicit PreferencesDialog(AudioDeviceInfo* audioDeviceInfo, QWidget* parent = NULL); - ~PreferencesDialog(); - -private: - enum Audio { - ATDefault, - ATInterface, - ATDevice - }; - - Ui::PreferencesDialog* ui; - - AudioDeviceInfo* m_audioDeviceInfo; - -private slots: - void accept(); -}; - -#endif // INCLUDE_PREFERENCESDIALOG_H diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index 10bfda2eb..1e189857c 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -31,10 +31,10 @@ #include "gui/presetitem.h" #include "gui/addpresetdialog.h" #include "gui/pluginsdialog.h" -#include "gui/preferencesdialog.h" #include "gui/aboutdialog.h" #include "gui/rollupwidget.h" #include "gui/channelwindow.h" +#include "gui/audiodialog.h" #include "dsp/dspengine.h" #include "dsp/spectrumvis.h" #include "dsp/filesink.h" @@ -522,7 +522,7 @@ void MainWindow::on_presetSave_clicked() void MainWindow::on_presetUpdate_clicked() { QTreeWidgetItem* item = ui->presetTree->currentItem(); - + if(item != 0) { if(item->type() == PItem) { const Preset* preset = qvariant_cast(item->data(0, Qt::UserRole)); @@ -681,11 +681,11 @@ void MainWindow::on_action_Loaded_Plugins_triggered() pluginsDialog.exec(); } -void MainWindow::on_action_Preferences_triggered() +void MainWindow::on_action_Audio_triggered() { - PreferencesDialog preferencesDialog(m_audioDeviceInfo, this); + AudioDialog audioDialog(m_audioDeviceInfo, this); - preferencesDialog.exec(); + audioDialog.exec(); } void MainWindow::on_sampleSource_currentIndexChanged(int index) diff --git a/sdrbase/mainwindow.h b/sdrbase/mainwindow.h index 585c9c826..a32cf22c8 100644 --- a/sdrbase/mainwindow.h +++ b/sdrbase/mainwindow.h @@ -152,7 +152,7 @@ private slots: void on_presetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); void on_presetTree_itemActivated(QTreeWidgetItem *item, int column); void on_action_Loaded_Plugins_triggered(); - void on_action_Preferences_triggered(); + void on_action_Audio_triggered(); void on_sampleSource_currentIndexChanged(int index); void on_action_About_triggered(); }; diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui index 41bbd3b58..ab550fdf5 100644 --- a/sdrbase/mainwindow.ui +++ b/sdrbase/mainwindow.ui @@ -79,8 +79,6 @@ &File - - @@ -147,11 +145,19 @@ &Window + + + &Preferences + + + + + @@ -564,6 +570,16 @@ F8 + + + Audio + + + + + DV Serial + + presetDock channelDock