diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 7de6f833..55ef5789 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -1740,7 +1740,7 @@
-
+
Access Denied
@@ -1928,7 +1928,7 @@
-
+
Discard
@@ -2469,136 +2469,138 @@
-
-
-
-
+
+
+
+
+
+
Quality Level %1
-
-
-
+
+
+
Compression %1
-
-
-
+
+
+
Uncompressed
-
+
Best Quality (Very Slow)
-
+
High Quality (Recommended)
-
+
Average Quality (Default)
-
+
Low Quality (Fast)
-
+
Poor Quality (Very Fast)
-
+
File name without extension
-
+
Track number with leading zero
-
+
Track title
-
+
Artist name
-
+
Album name
-
+
Year with (at least) four digits
-
+
Comment
-
+
Characters forbidden in file names:
-
+
Rename Macros
-
+
%n Instance(s)
-
+
Cannot write to the selected directory. Please choose another directory!
-
+
Overwrite Mode
-
+
Warning: This mode may overwrite existing files with no way to revert!
-
+
Continue
-
+
Revert
-
+
Already Running
-
+
LameXP is already running, please use the running instance!
diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts
index 9c9ff0b2..fea7af81 100644
--- a/etc/Translation/LameXP_EN.ts
+++ b/etc/Translation/LameXP_EN.ts
@@ -63,7 +63,7 @@
-
+
%n Instance(s)
%n Instance
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index 1514adca..ce57827c 100644
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -1747,7 +1747,7 @@
-
+
Access Denied
Dostęp zablokowany
@@ -1877,7 +1877,7 @@
-
+
Discard
Zamknij
@@ -2484,99 +2484,101 @@
Obecny koder AAC: %1
-
-
-
-
+
+
+
+
+
+
Quality Level %1
Poziom jakości %1
-
-
-
+
+
+
Compression %1
Kompresja %1
-
-
-
+
+
+
Uncompressed
Nieskompresowany
-
+
Best Quality (Very Slow)
Najlepsza jakość (Bardzo wolno)
-
+
High Quality (Recommended)
Wysoka jakość (Zalecane)
-
+
Average Quality (Default)
Średnia jakość (Domyślnie)
-
+
Low Quality (Fast)
Niska jakość (Szybko)
-
+
Poor Quality (Very Fast)
Najniższa jakość (Bardzo szybko)
-
+
File name without extension
Nazwa pliku bez rozszerzenia
-
+
Track number with leading zero
Numer ścieżki z zerem na początku
-
+
Track title
Nazwa ścieżki
-
+
Artist name
Nazwa Artysty
-
+
Album name
Nazwa Albumu
-
+
Year with (at least) four digits
Rok z (przynajmniej) czterema cyframi
-
+
Comment
Komentarz
-
+
Characters forbidden in file names:
Zabronione znaki w nazwach plików:
-
+
Rename Macros
Zmień nazwy makr
-
+
%n Instance(s)
%n wątek
@@ -2585,37 +2587,37 @@
-
+
Cannot write to the selected directory. Please choose another directory!
Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację!
-
+
Overwrite Mode
Tryb nadpisywania
-
+
Warning: This mode may overwrite existing files with no way to revert!
Ostrzeżenie: W tym trybie istniejące pliki będą nadpisywane bez możliwości ich odzyskania!
-
+
Continue
Kontynuuj
-
+
Revert
Cofnij
-
+
Already Running
Już działa
-
+
LameXP is already running, please use the running instance!
LameXP już działa, przejdź do działającego procesu!
diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index cf811185..54dbf297 100644
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -1744,7 +1744,7 @@
-
+
Access Denied
Åtkomst nekad
@@ -1936,7 +1936,7 @@
-
+
Discard
Stäng
@@ -2477,99 +2477,101 @@
Aktuell AAC-kodare: %1
-
-
-
-
+
+
+
+
+
+
Quality Level %1
Kvallitetsnivå %1
-
-
-
+
+
+
Compression %1
Kompression %1
-
-
-
+
+
+
Uncompressed
Okomprimerad
-
+
Best Quality (Very Slow)
Bäst kvallitet (långsam)
-
+
High Quality (Recommended)
Hög kvallitet (rekommenderas)
-
+
Average Quality (Default)
Medelkvallitet (standard)
-
+
Low Quality (Fast)
Låg kvallitet (snabb)
-
+
Poor Quality (Very Fast)
Dålig kvallitet (mycket snabb)
-
+
File name without extension
Filnamn utan filtillägg
-
+
Track number with leading zero
Spårnummer med inledande nolla
-
+
Track title
Spårtitel
-
+
Artist name
Artistnamn
-
+
Album name
Albumnamn
-
+
Year with (at least) four digits
Årtal med (minst) fyra siffror
-
+
Comment
Kommentar
-
+
Characters forbidden in file names:
Förbjudna tecken i filnamn:
-
+
Rename Macros
Namnändra macron
-
+
%n Instance(s)
%n instans
@@ -2577,37 +2579,37 @@
-
+
Cannot write to the selected directory. Please choose another directory!
Kan inte skriva till den specificerade mappen. Välj en annan destination!
-
+
Overwrite Mode
Överskrivningsläge
-
+
Warning: This mode may overwrite existing files with no way to revert!
Varning! Det här läget kan skriva över befintliga filer, utan möjlighet att återskapa!
-
+
Continue
Fortsätt
-
+
Revert
Återställ
-
+
Already Running
Körs redan
-
+
LameXP is already running, please use the running instance!
LameXP körs redan, använd den redan startade instansen!
diff --git a/src/Config.h b/src/Config.h
index 3eb5e405..7aedeffc 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Beta
-#define VER_LAMEXP_PATCH 7
-#define VER_LAMEXP_BUILD 1250
+#define VER_LAMEXP_PATCH 8
+#define VER_LAMEXP_BUILD 1252
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index dfb460c1..c77422f4 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -3367,8 +3367,21 @@ void MainWindow::updateRCMode(int id)
switch(m_settings->compressionRCMode())
{
case SettingsModel::VBRMode:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(20);
+ if(m_qaacEncoderAvailable)
+ {
+ ui->sliderBitrate->setMinimum(0);
+ ui->sliderBitrate->setMaximum(32);
+ }
+ else if(m_fhgEncoderAvailable)
+ {
+ ui->sliderBitrate->setMinimum(1);
+ ui->sliderBitrate->setMaximum(6);
+ }
+ else
+ {
+ ui->sliderBitrate->setMinimum(0);
+ ui->sliderBitrate->setMaximum(20);
+ }
break;
default:
ui->sliderBitrate->setMinimum(4);
@@ -3421,7 +3434,18 @@ void MainWindow::updateBitrate(int value)
ui->labelBitrate->setText(tr("Quality Level %1").arg(value));
break;
case SettingsModel::AACEncoder:
- ui->labelBitrate->setText(tr("Quality Level %1").arg(QString().sprintf("%.2f", static_cast(value * 5) / 100.0)));
+ if(m_qaacEncoderAvailable)
+ {
+ ui->labelBitrate->setText(tr("Quality Level %1").arg(QString::number(qBound(0, value * 4 , 127))));
+ }
+ else if(m_fhgEncoderAvailable)
+ {
+ ui->labelBitrate->setText(tr("Quality Level %1").arg(QString::number(value)));
+ }
+ else
+ {
+ ui->labelBitrate->setText(tr("Quality Level %1").arg(QString().sprintf("%.2f", static_cast(value) / 20.0)));
+ }
break;
case SettingsModel::FLACEncoder:
ui->labelBitrate->setText(tr("Compression %1").arg(value));
diff --git a/src/Encoder_AAC.cpp b/src/Encoder_AAC.cpp
index e6f6d1f3..ebfff67e 100644
--- a/src/Encoder_AAC.cpp
+++ b/src/Encoder_AAC.cpp
@@ -57,7 +57,7 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
switch(m_configRCMode)
{
case SettingsModel::VBRMode:
- args << "-q" << QString().sprintf("%.2f", qBound(0.0, static_cast(m_configBitrate * 5) / 100.0, 1.0));
+ args << "-q" << QString().sprintf("%.2f", qBound(0.0, static_cast(m_configBitrate) / 20.0, 1.0));
break;
case SettingsModel::ABRMode:
args << "-br" << QString::number(qMax(32, qMin(500, (m_configBitrate * 8))) * 1000);
diff --git a/src/Encoder_AAC_FHG.cpp b/src/Encoder_AAC_FHG.cpp
index 5f3d44c6..fd6c2cc8 100644
--- a/src/Encoder_AAC_FHG.cpp
+++ b/src/Encoder_AAC_FHG.cpp
@@ -76,7 +76,7 @@ bool FHGAACEncoder::encode(const QString &sourceFile, const AudioFileModel &meta
args << "--cbr" << QString::number(qMax(32, qMin(maxBitrate, (m_configBitrate * 8))));
break;
case SettingsModel::VBRMode:
- args << "--vbr" << QString::number(qRound(static_cast(m_configBitrate) / 5.0) + 1);
+ args << "--vbr" << QString::number(qBound(1, m_configBitrate, 6));
break;
default:
throw "Bad rate-control mode!";
diff --git a/src/Encoder_AAC_QAAC.cpp b/src/Encoder_AAC_QAAC.cpp
index ea81d0b4..cb7c934f 100644
--- a/src/Encoder_AAC_QAAC.cpp
+++ b/src/Encoder_AAC_QAAC.cpp
@@ -77,7 +77,7 @@ bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
args << "--abr" << QString::number(qBound(32, m_configBitrate * 8, 500));
break;
case SettingsModel::VBRMode:
- args << "--tvbr" << QString::number(qBound(0, qRound((static_cast(m_configBitrate * 5) / 100.0) * 127.0), 127));
+ args << "--tvbr" << QString::number(qBound(0, m_configBitrate * 4, 127));
break;
default:
throw "Bad rate-control mode!";