diff --git a/source/PA_Calculator.pro b/source/PA_Calculator.pro index ee2d0a9..d253dbc 100644 --- a/source/PA_Calculator.pro +++ b/source/PA_Calculator.pro @@ -1,4 +1,4 @@ -QT += core gui +QT += core gui multimedia testlib greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -10,6 +10,7 @@ CONFIG+=sdk_no_version_check SOURCES += \ about.cpp \ + analyzer.cpp \ camp.cpp \ campmode.cpp \ cdac.cpp \ @@ -20,6 +21,7 @@ SOURCES += \ HEADERS += \ about.h \ + analyzer.h \ camp.h \ campmode.h \ cdac.h \ @@ -29,6 +31,7 @@ HEADERS += \ FORMS += \ about.ui \ + analyzer.ui \ library.ui \ mainwindow.ui @@ -50,7 +53,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin RESOURCES += \ resources.qrc -VERSION=1.0.0 +VERSION=1.1.0 QMAKE_TARGET_PRODUCT = "PA-Calculator" QMAKE_TARGET_COMPANY = "Alexander Diamadis" QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2021 by Alexander Diamadis (alex@dkm-tech.de)" diff --git a/source/analyzer.cpp b/source/analyzer.cpp new file mode 100644 index 0000000..c22bed7 --- /dev/null +++ b/source/analyzer.cpp @@ -0,0 +1,39 @@ +#include "analyzer.h" +#include "ui_analyzer.h" +#include "QFileDialog" +#include +#include +#include +#include + +analyzer::analyzer(QWidget *parent) : + QDialog(parent), + ui(new Ui::analyzer) +{ + ui->setupUi(this); +} + +analyzer::~analyzer() +{ + delete ui; +} + +void analyzer::on_pushButton_clicked() +{ + QString folder=QFileDialog::getExistingDirectory(this,"Select the folder that is containing audio",QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)); + ui->lineEdit_path->setText(folder); +} + + +void analyzer::on_pushButton_calculate_clicked() +{ + QDirIterator it(ui->lineEdit_path->text(), QStringList() << "*.mp3", QDir::NoFilter, QDirIterator::Subdirectories); + //while (it.hasNext()) { + QFileInfo f(it.next()); + CAudioSource src; + + src.decode(f.absoluteFilePath()); + + +} + diff --git a/source/analyzer.h b/source/analyzer.h new file mode 100644 index 0000000..43cc957 --- /dev/null +++ b/source/analyzer.h @@ -0,0 +1,29 @@ +#ifndef ANALYZER_H +#define ANALYZER_H + +#include +#include + + +namespace Ui { +class analyzer; +} + +class analyzer : public QDialog +{ + Q_OBJECT + +public: + explicit analyzer(QWidget *parent = nullptr); + ~analyzer(); + +private slots: + void on_pushButton_clicked(); + + void on_pushButton_calculate_clicked(); + +private: + Ui::analyzer *ui; +}; + +#endif // ANALYZER_H diff --git a/source/analyzer.ui b/source/analyzer.ui new file mode 100644 index 0000000..af81e8f --- /dev/null +++ b/source/analyzer.ui @@ -0,0 +1,107 @@ + + + analyzer + + + + 0 + 0 + 432 + 141 + + + + Dialog + + + + + + + + Folder containing Audio Files + + + + + + + + 0 + 0 + + + + C:/Users/fsx12/Downloads/Zeugnisverleihung + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + Browse + + + + + + + Qt::LeftToRight + + + preferred Loudness + + + + + + + dBFS + + + 1 + + + -100.000000000000000 + + + 0.000000000000000 + + + -18.000000000000000 + + + + + + + Calculate + + + + + + + + + + diff --git a/source/library.ui b/source/library.ui index 1b26e9f..cf19a75 100644 --- a/source/library.ui +++ b/source/library.ui @@ -474,8 +474,8 @@ accept() - 244 - 444 + 250 + 473 157 @@ -490,8 +490,8 @@ reject() - 312 - 444 + 318 + 473 286 diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp index de6853e..ce28665 100644 --- a/source/mainwindow.cpp +++ b/source/mainwindow.cpp @@ -9,6 +9,7 @@ #include #include #include "about.h" +#include "analyzer.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -29,6 +30,9 @@ MainWindow::MainWindow(QWidget *parent) refreshLibraryAmpModes(); refreshLibrarySpeaker(); refreshLibraryDacs(); + + analyzer analyzerWindow; + analyzerWindow.exec(); } MainWindow::~MainWindow() @@ -343,3 +347,10 @@ void MainWindow::on_actionAbout_triggered() aboutDialog.exec(); } + +void MainWindow::on_actionOpen_Loudness_Analyzer_triggered() +{ + analyzer analyzerWindow; + analyzerWindow.exec(); +} + diff --git a/source/mainwindow.h b/source/mainwindow.h index c5cbc7d..2311435 100644 --- a/source/mainwindow.h +++ b/source/mainwindow.h @@ -40,6 +40,8 @@ private slots: void on_actionAbout_triggered(); + void on_actionOpen_Loudness_Analyzer_triggered(); + private: Ui::MainWindow *ui; cAmp* m_pCAmp; diff --git a/source/mainwindow.ui b/source/mainwindow.ui index 3106a04..d6a12bb 100644 --- a/source/mainwindow.ui +++ b/source/mainwindow.ui @@ -578,7 +578,6 @@ 15 - 75 true @@ -696,7 +695,6 @@ 15 - 75 true @@ -771,7 +769,7 @@ 0 0 1242 - 21 + 17 @@ -788,8 +786,15 @@ + + + Tools + + + + @@ -811,6 +816,11 @@ About + + + Loudness Analyzer + +