diff --git a/doc/Changelog.html b/doc/Changelog.html
index fb33e2d8..ca3cef72 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -33,6 +33,7 @@ a:visited { color: #0000EE; }
Updated language files (big thank-you to all contributors !!!)
Fixed handling of certain characters when passing meta tags on the command-line
Fixed Keccak library to not crash on systems without SSE/SSE2 support
+Fixed LAME algorithm quality selector better match the LAME documentation (link)
Changes between v4.05 and v4.06 [2012-11-04]:
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 55ef5789..fdf66d69 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -1740,7 +1740,7 @@
-
+
Access Denied
@@ -1928,7 +1928,7 @@
-
+
Discard
@@ -2494,7 +2494,7 @@
- Best Quality (Very Slow)
+ Best Quality (Slow)
@@ -2504,103 +2504,98 @@
- Average Quality (Default)
+ Acceptable Quality (Fast)
- 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_DE.ts b/etc/Translation/LameXP_DE.ts
index c7ffd38e..51c8d3b6 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -285,7 +285,7 @@
Valdec from AC3Filter Tools - AC3/DTS Decoder
-
+ Valdec aus den AC3Filter Tools - AC3/DTS Decoder
@@ -1207,21 +1207,9 @@
Better quality
Bessere Qualität
-
- Best Quality (Very Slow)
- Beste Qualität (sehr langsam)
-
High Quality (Recommended)
- Höhere Qualität (empfohlen)
-
-
- Average Quality (Default)
- Mittlere Qualität (Standard)
-
-
- Low Quality (Fast)
- Niedrige Qualität (schnell)
+ Hohe Qualität (empfohlen)
Poor Quality (Very Fast)
@@ -2018,6 +2006,14 @@
%n Instanzen
+
+ Best Quality (Slow)
+ Beste Qualität (langsam)
+
+
+ Acceptable Quality (Fast)
+ Akzeptable Qualität (schnell)
+
MetaInfo
diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts
index fea7af81..6a8fa9f7 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_ES.ts b/etc/Translation/LameXP_ES.ts
index b113c0ec..01e607d1 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1206,22 +1206,10 @@
Better quality
Mayor calidad
-
- Best Quality (Very Slow)
- Calidad muy alta (muy lento)
-
High Quality (Recommended)
Calidad alta (recomendado)
-
- Average Quality (Default)
- Calidad media (predeterminado)
-
-
- Low Quality (Fast)
- Calidad baja (rápido)
-
Poor Quality (Very Fast)
Calidad muy baja (muy rápido)
@@ -2017,6 +2005,14 @@
%n instancias
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 78444571..8a97f971 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1212,23 +1212,10 @@ Votre dossier TEMP est situé ici:
Better quality
Meilleure qualité
-
- Best Quality (Very Slow)
- Meilleure qualité (très lent)
-
High Quality (Recommended)
Haute qualité (recommandé)
-
- Average Quality (Default)
- Qualité moyenne (par défaut)
-
-
- Low Quality (Fast)
-
-Faible qualité (rapide)
-
Poor Quality (Very Fast)
Mauvaise qualité (très rapide)
@@ -2027,6 +2014,14 @@ Ouvrir le dossier récursivement...
%n Instances
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 77041538..ba6cca86 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1207,22 +1207,10 @@
Better quality
-
- Best Quality (Very Slow)
-
-
High Quality (Recommended)
-
- Average Quality (Default)
-
-
-
- Low Quality (Fast)
-
-
Poor Quality (Very Fast)
@@ -2018,6 +2006,14 @@
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts
index d4347e31..cf5d33ad 100644
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -1376,22 +1376,10 @@
Uncompressed
비압축
-
- Best Quality (Very Slow)
- 최고 품질 (매우 느림)
-
High Quality (Recommended)
높은 품질 (권장)
-
- Average Quality (Default)
- 평균 품질 (기본)
-
-
- Low Quality (Fast)
- 낮은 품질 (빠름)
-
Poor Quality (Very Fast)
최저 품질 (매우 빠름)
@@ -2010,6 +1998,14 @@
%n 인스턴스
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index ce57827c..c5eb6191 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
@@ -2509,76 +2509,71 @@
- Best Quality (Very Slow)
- Najlepsza jakość (Bardzo wolno)
+ Best Quality (Slow)
+
+
+
+
+ Acceptable Quality (Fast)
+
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
@@ -2587,37 +2582,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_RU.ts b/etc/Translation/LameXP_RU.ts
index d8795a06..2ed621d7 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -1318,22 +1318,10 @@
Uncompressed
Несжатый
-
- Best Quality (Very Slow)
- Наилучшее качество (очень медленно)
-
High Quality (Recommended)
Высокое качество (рекомендуется)
-
- Average Quality (Default)
- Среднее качество (по умолчанию)
-
-
- Low Quality (Fast)
- Низкое качество (быстро)
-
Poor Quality (Very Fast)
Плохое качество (Очень быстро)
@@ -2031,6 +2019,14 @@
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index 54dbf297..641a6d5f 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
@@ -2502,76 +2502,71 @@
- Best Quality (Very Slow)
- Bäst kvallitet (långsam)
+ Best Quality (Slow)
+
+
+
+
+ Acceptable Quality (Fast)
+
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
@@ -2579,37 +2574,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/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts
index dacf9968..49f74c37 100644
--- a/etc/Translation/LameXP_TW.ts
+++ b/etc/Translation/LameXP_TW.ts
@@ -1203,22 +1203,10 @@
Better quality
更好的質量
-
- Best Quality (Very Slow)
- 最好的質量(很慢)
-
High Quality (Recommended)
高質量(推薦)
-
- Average Quality (Default)
- 平均質量 (默認值)
-
-
- Low Quality (Fast)
- 低質量 (快速)
-
Poor Quality (Very Fast)
質量差(非常快)
@@ -2009,6 +1997,14 @@
%n 個實例
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 4bd1ff2e..f906a001 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -1290,22 +1290,10 @@
Uncompressed
Нестиснутий
-
- Best Quality (Very Slow)
- Найкраща якість (Дуже повільно)
-
High Quality (Recommended)
Висока якість (Рекомендовано)
-
- Average Quality (Default)
- Середня якість (Типово)
-
-
- Low Quality (Fast)
- Низька якість (Швидко)
-
Poor Quality (Very Fast)
Дуже низька якість (Дуже швидко)
@@ -2026,6 +2014,14 @@
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts
index cbead663..c241d610 100644
--- a/etc/Translation/LameXP_ZH.ts
+++ b/etc/Translation/LameXP_ZH.ts
@@ -1203,22 +1203,10 @@
Better quality
更好的质量
-
- Best Quality (Very Slow)
- 最好的质量(很慢)
-
High Quality (Recommended)
高质量(推荐)
-
- Average Quality (Default)
- 平均质量 (默认值)
-
-
- Low Quality (Fast)
- 低质量 (快速)
-
Poor Quality (Very Fast)
质量差(非常快)
@@ -2009,6 +1997,14 @@
%n 个实例
+
+ Best Quality (Slow)
+
+
+
+ Acceptable Quality (Fast)
+
+
MetaInfo
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 23613cb4..afeb23b5 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -1669,13 +1669,13 @@
-
- 4
+ 3
1
- 3
+ 2
Qt::Horizontal
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index df05ba4a..e22deac5 100644
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ
diff --git a/res/localization/LameXP_ES.qm b/res/localization/LameXP_ES.qm
index d3512c76..bc2028df 100644
Binary files a/res/localization/LameXP_ES.qm and b/res/localization/LameXP_ES.qm differ
diff --git a/res/localization/LameXP_FR.qm b/res/localization/LameXP_FR.qm
index 24cb2c6f..87fc5497 100644
Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ
diff --git a/res/localization/LameXP_KR.qm b/res/localization/LameXP_KR.qm
index 055d6e4f..5f0b66d9 100644
Binary files a/res/localization/LameXP_KR.qm and b/res/localization/LameXP_KR.qm differ
diff --git a/res/localization/LameXP_PL.qm b/res/localization/LameXP_PL.qm
index 940e2ab8..cad8336a 100644
Binary files a/res/localization/LameXP_PL.qm and b/res/localization/LameXP_PL.qm differ
diff --git a/res/localization/LameXP_RU.qm b/res/localization/LameXP_RU.qm
index dc1b3057..5fbf9f37 100644
Binary files a/res/localization/LameXP_RU.qm and b/res/localization/LameXP_RU.qm differ
diff --git a/res/localization/LameXP_SV.qm b/res/localization/LameXP_SV.qm
index 75472600..8fbb31e9 100644
Binary files a/res/localization/LameXP_SV.qm and b/res/localization/LameXP_SV.qm differ
diff --git a/res/localization/LameXP_TW.qm b/res/localization/LameXP_TW.qm
index 7d168162..9f08ca57 100644
Binary files a/res/localization/LameXP_TW.qm and b/res/localization/LameXP_TW.qm differ
diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm
index 51334811..0e0e078e 100644
Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ
diff --git a/res/localization/LameXP_ZH.qm b/res/localization/LameXP_ZH.qm
index 836833b6..36e4136e 100644
Binary files a/res/localization/LameXP_ZH.qm and b/res/localization/LameXP_ZH.qm differ
diff --git a/src/Config.h b/src/Config.h
index 48d1358e..76978339 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 9
-#define VER_LAMEXP_BUILD 1255
+#define VER_LAMEXP_BUILD 1256
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index c77422f4..cd203beb 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -3536,17 +3536,14 @@ void MainWindow::updateLameAlgoQuality(int value)
switch(value)
{
- case 4:
- text = tr("Best Quality (Very Slow)");
- break;
case 3:
- text = tr("High Quality (Recommended)");
+ text = tr("Best Quality (Slow)");
break;
case 2:
- text = tr("Average Quality (Default)");
+ text = tr("High Quality (Recommended)");
break;
case 1:
- text = tr("Low Quality (Fast)");
+ text = tr("Acceptable Quality (Fast)");
break;
case 0:
text = tr("Poor Quality (Very Fast)");
@@ -3559,7 +3556,7 @@ void MainWindow::updateLameAlgoQuality(int value)
ui->labelLameAlgoQuality->setText(text);
}
- bool warning = (value == 0), notice = (value == 4);
+ bool warning = (value == 0), notice = (value == 3);
ui->labelLameAlgoQualityWarning->setVisible(warning);
ui->labelLameAlgoQualityWarningIcon->setVisible(warning);
ui->labelLameAlgoQualityNotice->setVisible(notice);
diff --git a/src/Encoder_MP3.cpp b/src/Encoder_MP3.cpp
index e4c0c968..c702e1ba 100644
--- a/src/Encoder_MP3.cpp
+++ b/src/Encoder_MP3.cpp
@@ -28,7 +28,7 @@
#include
#include
-static const int g_lameAgorithmQualityLUT[] = {9, 7, 5, 2, 0, INT_MAX};
+static const int g_lameAgorithmQualityLUT[] = {9, 7, 3, 0, INT_MAX};
MP3Encoder::MP3Encoder(void)
:
@@ -61,14 +61,14 @@ bool MP3Encoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
switch(m_configRCMode)
{
case SettingsModel::VBRMode:
- args << "-V" << QString::number(9 - qMin(9, m_configBitrate));
+ args << "-V" << QString::number(9 - qBound(0, m_configBitrate, 9));
break;
case SettingsModel::ABRMode:
- args << "--abr" << QString::number(SettingsModel::mp3Bitrates[qMax(0, qMin(13, m_configBitrate))]);
+ args << "--abr" << QString::number(SettingsModel::mp3Bitrates[qBound(0, m_configBitrate, 13)]);
break;
case SettingsModel::CBRMode:
args << "--cbr";
- args << "-b" << QString::number(SettingsModel::mp3Bitrates[qMax(0, qMin(13, m_configBitrate))]);
+ args << "-b" << QString::number(SettingsModel::mp3Bitrates[qBound(0, m_configBitrate, 13)]);
break;
default:
throw "Bad rate-control mode!";
diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index c1735ce6..21de4438 100644
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -404,7 +404,7 @@ LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled, true)
LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled, !lamexp_portable_mode())
LAMEXP_MAKE_OPTION_S(currentLanguage, defaultLanguage())
LAMEXP_MAKE_OPTION_S(currentLanguageFile, QString())
-LAMEXP_MAKE_OPTION_I(lameAlgoQuality, 3)
+LAMEXP_MAKE_OPTION_I(lameAlgoQuality, 2)
LAMEXP_MAKE_OPTION_I(lameChannelMode, 0)
LAMEXP_MAKE_OPTION_B(forceStereoDownmix, false)
LAMEXP_MAKE_OPTION_B(bitrateManagementEnabled, false)