diff --git a/.gitignore b/.gitignore index 6e4009d..708e16f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ build* /installer/packages/com.dkmtech.pacalculator/data/* *.exe *.app +*.dmg diff --git a/installer/config/config_mac.xml b/installer/config/config_mac.xml new file mode 100644 index 0000000..8cef738 --- /dev/null +++ b/installer/config/config_mac.xml @@ -0,0 +1,9 @@ + + + PA Calculator + 1.2.0 + PA Calculator Installer + DKM-Tech + DKM-Tech + @ApplicationsDir@/PA Calculator + diff --git a/installer/config/config.xml b/installer/config/config_win.xml similarity index 90% rename from installer/config/config.xml rename to installer/config/config_win.xml index 8d7fef5..02f276f 100644 --- a/installer/config/config.xml +++ b/installer/config/config_win.xml @@ -1,7 +1,7 @@ PA Calculator - 1.1.0 + 1.2.0 PA Calculator Installer DKM-Tech DKM-Tech diff --git a/installer/createInstaller_mac.sh b/installer/createInstaller_mac.sh new file mode 100755 index 0000000..8a3a2b1 --- /dev/null +++ b/installer/createInstaller_mac.sh @@ -0,0 +1,26 @@ +#!/bin/sh +releaseFolder=$(find ../ -path "*-Release" -type d) +fileName="${releaseFolder}/PA Calculator.app" +if [[ -e $fileName ]]; then + rm -rf "PA Calculator.app" + rm -rf "Install PA Calculator.app" + rm -rf setup64bit.dmg + cp -R "${fileName}" "PA Calculator.app" + macdeployqt 'PA Calculator.app' + VERSION=$(grep VERSION= "../source/PA_Calculator.pro" | awk -F= '{print $2;exit}') + echo "verwendet Version $VERSION" + DATE=$(date +%F) + sed -i '' 's/.*<\/Version>/'"$VERSION"'<\/Version>/g' packages/com.dkmtech.pacalculator/meta/package.xml + sed -i '' 's/.*<\/ReleaseDate>/'"$DATE"'<\/ReleaseDate>/g' packages/com.dkmtech.pacalculator/meta/package.xml + rm -rf packages/com.dkmtech.pacalculator/data + mkdir packages/com.dkmtech.pacalculator/data + cp -R 'PA Calculator.app' 'packages/com.dkmtech.pacalculator/data/PA Calculator.app' + binarycreator -c config/config_mac.xml -p packages 'Install PA Calculator' + rm -rf 'PA Calculator.app' + hdiutil create -srcfolder "Install PA Calculator.app" setup64bit.dmg + rm -rf "Install PA Calculator.app" + echo "Done" +else + echo "Could not find PA Calculator.app. Please build it first!" +fi + diff --git a/installer/createInstaller_win.bat b/installer/createInstaller_win.bat new file mode 100644 index 0000000..556568d --- /dev/null +++ b/installer/createInstaller_win.bat @@ -0,0 +1,20 @@ +@echo off +del /s /q setup64bit.exe +echo "Ändern Sie alle notwendigen Einstellungen!" +packages\com.dkmtech.pacalculator\meta\package.xml +cd .. +FOR /F "tokens=* USEBACKQ" %%F IN (`dir /b *-Release`) DO ( +set releaseFolder=%%F +) +cd %releaseFolder%\Release +del /s /q ..\..\installer\packages\com.dkmtech.pacalculator\data\* +mkdir ..\..\installer\packages\com.dkmtech.pacalculator\data\setup +copy "PA Calculator.exe" "..\..\installer\packages\com.dkmtech.pacalculator\data\setup\PA Calculator.exe" +cd ..\..\installer\packages\com.dkmtech.pacalculator\data\setup +windeployqt --translations de,en "PA Calculator.exe" +7z a -r ../setup * +cd .. +rmdir /s /q setup +cd ..\..\..\ +binarycreator -c config\config_win.xml -p packages setup64bit.exe +del /s packages\com.dkmtech.pacalculator\data\setup.7z \ No newline at end of file diff --git a/installer/packages/com.dkmtech.installer/meta/package.xml b/installer/packages/com.dkmtech.installer/meta/package.xml index 94b7f57..199fac1 100644 --- a/installer/packages/com.dkmtech.installer/meta/package.xml +++ b/installer/packages/com.dkmtech.installer/meta/package.xml @@ -6,5 +6,5 @@ 2022-02-06 com.dkmtech.installer true - First Installer + DKM-Teh Installer \ No newline at end of file diff --git a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs index 9ad78af..11cdf9c 100644 --- a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs +++ b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs @@ -11,8 +11,8 @@ Component.prototype.createOperations = function() try { var userProfile = installer.environmentVariable("USERPROFILE"); installer.setValue("UserProfile", userProfile); - component.addOperation("CreateShortcut", "@TargetDir@\\PA_Calculator.exe", "@UserProfile@\\Desktop\\PA Calculator.lnk"); - component.addOperation("CreateShortcut", "@TargetDir@\\PA_Calculator.exe", "@StartMenuDir@/PA Calculator.lnk","workingDirectory=@TargetDir@","description=Start PA-Calculator"); + component.addOperation("CreateShortcut", "@TargetDir@\\PA Calculator.exe", "@UserProfile@\\Desktop\\PA Calculator.lnk"); + component.addOperation("CreateShortcut", "@TargetDir@\\PA Calculator.exe", "@StartMenuDir@/PA Calculator.lnk","workingDirectory=@TargetDir@","description=Start PA-Calculator"); } catch (e) { // Do nothing if key doesn't exist } diff --git a/installer/packages/com.dkmtech.pacalculator/meta/package.xml b/installer/packages/com.dkmtech.pacalculator/meta/package.xml index 5f25ae1..2bee589 100644 --- a/installer/packages/com.dkmtech.pacalculator/meta/package.xml +++ b/installer/packages/com.dkmtech.pacalculator/meta/package.xml @@ -2,8 +2,8 @@ PA-Calculator Install PA-Calculator - 1.1 - 2022-02-06 + 1.2.0 + 2022-02-20 diff --git a/source/PA_Calculator.pro b/source/PA_Calculator.pro index ee3ce9e..2813e3a 100644 --- a/source/PA_Calculator.pro +++ b/source/PA_Calculator.pro @@ -55,7 +55,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin RESOURCES += \ resources.qrc -VERSION=1.1.0 +VERSION=1.2.0 QMAKE_TARGET_PRODUCT = "PA-Calculator" QMAKE_TARGET_COMPANY = "DKM-Tech" QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2022 by Alexander Diamadis" diff --git a/source/analyzer.cpp b/source/analyzer.cpp index 73149ec..cf51fcb 100644 --- a/source/analyzer.cpp +++ b/source/analyzer.cpp @@ -45,11 +45,11 @@ void analyzer::on_pushButton_calculate_clicked() delete [] songList; } countSongs=0; - QDirIterator it_counter(ui->lineEdit_path->text(), {"*.mp3", "*.wav", "*.flac", "*.ogg"}, QDir::NoFilter, QDirIterator::Subdirectories); + QDirIterator it_counter(ui->lineEdit_path->text(), {"*.mp3", "*.wav", "*.flac", "*.ogg" ,"*.opus", "*.wv", "*.mpc"}, QDir::NoFilter, QDirIterator::Subdirectories); while (it_counter.next()!="") { countSongs+=1; } - QDirIterator it(ui->lineEdit_path->text(), {"*.mp3", "*.wav"}, QDir::NoFilter, QDirIterator::Subdirectories); + QDirIterator it(ui->lineEdit_path->text(), {"*.mp3", "*.wav", "*.flac", "*.ogg" ,"*.opus", "*.wv", "*.mpc"}, QDir::NoFilter, QDirIterator::Subdirectories); unsigned int k=0; songList=new csong[countSongs]; float preferedLoudness=ui->doubleSpinBox_preferredLoudness->value(); diff --git a/source/csong.cpp b/source/csong.cpp index 3349ceb..f931eb5 100644 --- a/source/csong.cpp +++ b/source/csong.cpp @@ -85,7 +85,6 @@ void csong::analyze(float preferedLoudness) m_loudness=loudness[0]; m_widgetItem[1].setData(Qt::EditRole,QVariant(m_loudness)); - m_peakLevel=0; for (unsigned int i=0;isamples.size();i++){ if (abs(fileData->samples[i])>m_peakLevel){ @@ -110,19 +109,27 @@ void csong::analyze(float preferedLoudness) } } catch (const UnsupportedExtensionEx & e) { - std::cerr << "Caught: " << e.what() << std::endl; + //std::cerr << "Caught: " << e.what() << std::endl; + m_widgetItem[1].setText("Nicht unterstützte Dateiendung!"); + m_widgetItem[2].setText("-"); + m_widgetItem[3].setText("-"); + m_widgetItem[4].setText("-"); } catch (const LoadPathNotImplEx & e) { - std::cerr << "Caught: " << e.what() << std::endl; + //std::cerr << "Caught: " << e.what() << std::endl; } catch (const LoadBufferNotImplEx & e) { - std::cerr << "Caught: " << e.what() << std::endl; + //std::cerr << "Caught: " << e.what() << std::endl; } catch (const std::exception & e) { - std::cerr << "Caught: " << e.what() << std::endl; + //std::cerr << "Caught: " << e.what() << std::endl; + m_widgetItem[1].setText("Nicht unterstützter Codec!"); + m_widgetItem[2].setText("-"); + m_widgetItem[3].setText("-"); + m_widgetItem[4].setText("-"); } } diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp index 9a8d6f4..22fa399 100644 --- a/source/mainwindow.cpp +++ b/source/mainwindow.cpp @@ -115,8 +115,11 @@ void MainWindow::on_pushButton_requestLimiter_clicked() }else if (vAmpsens_dBulabel_thresholdRMS->setText(QString::number(thresholdRMS,'f',1)+QString(" dBFS")); + if (QString::number(thresholdRMS,'f',1)==QString::number(-18-(ui->spinBox_digitalNominalLevel->value()-vAmpsens_dBu),'f',1)){ + ui->label_thresholdRMS->setText(QString("not required")); + }else{ + ui->label_thresholdRMS->setText(QString::number(thresholdRMS,'f',1)+QString(" dBFS")); + } ui->label_attackTimeRMS->setText(QString::number(attackTimeRMS,'f',2)+QString(" ms")); ui->label_releaseTimeRMS->setText(QString::number(releaseTimeRMS,'f',2)+QString(" ms")); ui->label_UMaxSpeakerInRMS->setText(QString::number(vMaxSpeakerInRMS,'f',2)+QString(" dBU (")+QString::number(qSqrt(speakerImp*speakerRMS),'f',2)+QString(" V)"));