diff --git a/doc/Changelog.html b/doc/Changelog.html
index b6896c33..00db31d2 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -19,11 +19,13 @@ a:visited { color: #0000EE; }
Changes between v4.07 and v4.08 [unreleased]:
Upgraded build environment to Microsoft Visual Studio 2012 with Update-3
+
Encoder settings (RC mode + bitrate/quality) are now stored separately for each encoder
Updated Qt runtime libraries to v4.8.5 RC-1 (2013-05-31), compiled with MSVC 11.0
Updated FLAC encoder/decoder to v1.3.0 (2013-05-27), compiled with ICL 13.0
Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.6 (2013-06-17)
Fixed a potential deadlock during startup when %TMP% points to an invalid folder
Fixed a superfluous "beep" sound that appeared on application startup
+
Fixed Ogg Vorbis quality modes "-1" and "-2" (they were clipped to "0" before)
Changes between v4.06 and v4.07 [2013-04-28]:
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index ea9732f9..7b79f1fc 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -872,7 +872,7 @@
-
+ Show Details
@@ -1614,9 +1614,9 @@
-
-
-
+
+
+ Check for Updates
@@ -1657,13 +1657,13 @@
-
+ Disable Update Reminder
-
+ Disable Sound Effects
@@ -1748,868 +1748,864 @@
-
+ Adding file(s), please wait...
-
-
+
+ Access Denied
-
+ %n file(s) have been rejected, because read access was not granted!
-
+ This usually means the file is locked by another process.
-
+ CDDA Files
-
+ %n file(s) have been rejected, because they are dummy CDDA files!
-
+ Sorry, LameXP cannot extract audio tracks from an Audio-CD at present.
-
+ We recommend using %1 for that purpose.
-
+ Cue Sheet
-
+ %n file(s) have been rejected, because they appear to be Cue Sheet images!
-
+ Please use LameXP's Cue Sheet wizard for importing Cue Sheet files.
-
+ Files Rejected
-
+ %n file(s) have been rejected, because the file format could not be recognized!
-
+ This usually means the file is damaged or the file format is not supported.
-
+ Scanning folder(s) for files, please wait...
-
+ DEMO VERSION
-
+ You can drop in audio files here!
-
+ Initializing directory outline, please be patient...
-
+ Open File in External Application
-
+ Browse File Location
-
+ Browse Selected Folder
-
+ Refresh Directory Outline
-
+ Go To Parent Directory
-
+ Bookmark Current Output Folder
-
+ Export Meta Tags to CSV File
-
+ Import Meta Tags from CSV File
-
+ License Declined
-
+ You have declined the license. Consequently the application will exit now!
-
+ Goodbye!
-
+ LameXP - Expired
-
+ This demo (pre-release) version of LameXP has expired at %1.
-
+ LameXP is free software and release versions won't expire.
-
-
+
+ Exit Program
-
+ It seems that a bogus anti-virus software is slowing down the startup of LameXP.
-
+ Please refer to the %1 document for details and solutions!
-
+ Slow Startup
-
-
-
-
-
+
+
+
+
+ Discard
-
-
+
+ Don't Show Again
-
+ Urgent Update
-
+ Your version of LameXP is more than a year old. Time for an update!
-
-
+
+ Ignore
-
+ Skipping update check this time, please be patient...
-
-
-
+
+
+ Update Reminder
-
+ Your last update check was more than 14 days ago. Check for updates now?
-
+ Your did not check for LameXP updates yet. Check for updates now?
-
+ Postpone
-
+ LameXP detected that your version of the Nero AAC encoder is outdated!
-
+ The current version available is %1 (or later), but you still have version %2 installed.
-
+ n/a
-
+ You can download the latest version of the Nero AAC encoder from the Nero website at:
-
+ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!)
-
+ AAC Encoder Outdated
-
+ The Nero AAC encoder could not be found. AAC encoding support will be disabled.
-
+ Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory!
-
+ Your LameXP directory is located here:
-
+ You can download the Nero AAC encoder for free from the official Nero website at:
-
+ AAC Support Disabled
-
-
-
+
+
+ LameXP
-
+ You must add at least one file to the list before proceeding!
-
+ Not Found
-
+ Your currently selected TEMP folder does not exist anymore:
-
+ Restore Default
-
+ Cancel
-
+ There are less than %1 GB of free diskspace available on your system's TEMP folder.
-
+ It is highly recommend to free up more diskspace before proceeding with the encode!
-
+ Your TEMP folder is located at:
-
+ Low Diskspace Warning
-
+ Abort Encoding Process
-
+ Clean Disk Now
-
+ Low Diskspace
-
+ You are proceeding with low diskspace. Problems might occur!
-
+ Sorry, an unsupported encoder has been chosen!
-
+ Cannot write to the selected output directory.
-
+ Please choose a different directory!
-
+ Load Translation
-
+ Translation Files
-
+ Do you really want to disable the update reminder?
-
-
-
-
-
-
-
+
+
+
+
+
+
+ Yes
-
-
-
-
-
-
-
+
+
+
+
+
+
+ No
-
+ The update reminder has been disabled.
-
+ Please remember to check for updates at regular intervals!
-
+ The update reminder has been re-enabled.
-
+ Do you really want to disable all sound effects?
-
-
+
+ Sound Effects
-
+ All sound effects have been disabled.
-
+ The sound effects have been re-enabled.
-
-
-
+
+
+ Nero AAC Notifications
-
+ Do you really want to disable all Nero AAC Encoder notifications?
-
+ All Nero AAC Encoder notifications have been disabled.
-
+ The Nero AAC Encoder notifications have been re-enabled.
-
-
-
+
+
+ Slow Startup Notifications
-
+ Do you really want to disable the slow startup notifications?
-
+ The slow startup notifications have been disabled.
-
+ The slow startup notifications have been re-enabled.
-
-
+
+ Open Cue Sheet
-
-
+
+ Cue Sheet File
-
-
-
+
+
+ Beta Updates
-
+ Do you really want LameXP to check for Beta (pre-release) updates?
-
+ LameXP will check for Beta (pre-release) updates from now on.
-
+ Check Now
-
+ LameXP will <i>not</i> check for Beta (pre-release) updates from now on.
-
-
-
+
+
+ Hibernate Computer
-
+ Do you really want the computer to be hibernated on shutdown?
-
+ LameXP will hibernate the computer on shutdown from now on.
-
+ LameXP will <i>not</i> hibernate the computer on shutdown from now on.
-
-
-
+
+
+ Shell Integration
-
+ Do you really want to disable the LameXP shell integration?
-
+ The LameXP shell integration has been disabled.
-
+ The LameXP shell integration has been re-enabled.
-
-
+
+ Add file(s)
-
-
+
+ Add Folder
-
-
+
+ Save CSV file
-
-
-
-
+
+
+
+ CSV File
-
-
-
-
+
+
+
+ CSV Export
-
+ Sorry, there are no meta tags that can be exported!
-
+ Sorry, failed to open CSV file for writing!
-
+ Sorry, failed to write to the CSV file!
-
+ The CSV files was created successfully!
-
-
+
+ Open CSV file
-
-
-
-
-
+
+
+
+
+ CSV Import
-
+ Sorry, failed to open CSV file for reading!
-
+ Sorry, failed to read from the CSV file!
-
+ Sorry, the CSV file does not contain any known fields!
-
+ CSV file is incomplete. Not all files were updated!
-
+ The CSV files was imported successfully!
-
-
+
+ New Folder
-
+ Enter the name of the new folder:
-
+ Failed to create folder
-
+ The new folder could not be created:
-
+ Drive is read-only or insufficient access rights!
-
+ QAAC (Apple)
-
+ FHG AAC (Winamp)
-
+ Nero AAC
-
+ Not available!
-
+ Current AAC Encoder: %1
-
-
-
-
-
-
+
+
+
+
+
+ Quality Level %1
-
-
-
+ Compression %1
-
-
-
+ Uncompressed
-
+ Best Quality (Slow)
-
+ High Quality (Recommended)
-
+ Acceptable 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!
@@ -3090,209 +3086,209 @@
-
+ Show details for selected job
-
+ Browse Output File Location
-
+ Filter Log Items
-
+ Show Running Only
-
+ Show Succeeded Only
-
+ Show Failed Only
-
+ Show Skipped Only
-
+ Show All Items
-
+ Encoding Files
-
+ Your files are being encoded, please be patient...
-
+ Encoding files, please wait...
-
+ Multi-threading enabled: Running %1 instances in parallel!
-
+ Aborted! Waiting for running jobs to terminate...
-
+ Encoding: %n file(s) of %1 completed so far, please wait...
-
+ Creating the playlist file, please wait...
-
+ Process was aborted by the user after %n file(s)!
-
+ Process was aborted prematurely by the user!
-
+ LameXP - Aborted
-
+ Process was aborted by the user.
-
+ Process finished after %1.
-
+ Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!
-
+ %n file(s) skipped
-
+ Error: %1 of %n file(s) failed. Double-click failed items for detailed information!
-
+ LameXP - Error
-
+ At least one file has failed!
-
+ All files completed successfully. Skipped %n file(s).
-
+ All files completed successfully.
-
+ LameXP - Done
-
+ None of the items matches the current filtering rules
-
+ Playlist creation failed
-
+ The playlist file could not be created:
-
+ Warning: Computer will shutdown in %1 seconds...
-
-
+
+ Cancel Shutdown
-
+ %n hour(s)
-
-
+
+ %n minute(s)
-
-
+
+ %n second(s)
-
+ %n millisecond(s)
@@ -3315,23 +3311,23 @@
QApplication
-
+ Executable '%1' doesn't support Windows compatibility mode.
-
+ Executable '%1' requires Qt v%2, but found Qt v%3.
-
+ Executable '%1' was built for Qt '%2', but found Qt '%3'.
-
-
+
+ Executable '%1' requires Windows 2000 or later.
diff --git a/etc/Translation/LameXP_EN.ts b/etc/Translation/LameXP_EN.ts
index 5b430c45..e24f0495 100644
--- a/etc/Translation/LameXP_EN.ts
+++ b/etc/Translation/LameXP_EN.ts
@@ -31,7 +31,7 @@
MainWindow
-
+ %n file(s) have been rejected, because read access was not granted!%n file have been rejected, because read access was not granted!
@@ -39,7 +39,7 @@
-
+ %n file(s) have been rejected, because they are dummy CDDA files!%n file have been rejected, because they are dummy CDDA files!
@@ -47,7 +47,7 @@
-
+ %n file(s) have been rejected, because they appear to be Cue Sheet images!%n file have been rejected, because they appear to be Cue Sheet images!
@@ -55,7 +55,7 @@
-
+ %n file(s) have been rejected, because the file format could not be recognized!%n file have been rejected, because the file format could not be recognized!
@@ -63,7 +63,7 @@
-
+ %n Instance(s)%n Instance
@@ -74,7 +74,7 @@
ProcessingDialog
-
+ Encoding: %n file(s) of %1 completed so far, please wait...Encoding: %n file of %1 completed so far, please wait...
@@ -82,7 +82,7 @@
-
+ Process was aborted by the user after %n file(s)!Process was aborted by the user after %n file!
@@ -90,7 +90,7 @@
-
+ Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!Error: %1 of %n file failed (%2). Double-click failed items for detailed information!
@@ -98,7 +98,7 @@
-
+ %n file(s) skipped%n file skipped
@@ -106,7 +106,7 @@
-
+ Error: %1 of %n file(s) failed. Double-click failed items for detailed information!Error: %1 of %n file failed. Double-click failed items for detailed information!
@@ -114,7 +114,7 @@
-
+ All files completed successfully. Skipped %n file(s).All files completed successfully. Skipped %n file.
@@ -122,7 +122,7 @@
-
+ %n hour(s)%n hour
@@ -130,8 +130,8 @@
-
-
+
+ %n minute(s)%n minute
@@ -139,8 +139,8 @@
-
-
+
+ %n second(s)%n second
@@ -148,7 +148,7 @@
-
+ %n millisecond(s)%n millisecond
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index f981e42a..0f6a6cce 100644
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -878,7 +878,7 @@
-
+ Show DetailsPokaż szczegóły
@@ -1621,9 +1621,9 @@
-
-
-
+
+
+ Check for UpdatesSprawdź aktualizacje
@@ -1664,13 +1664,13 @@
-
+ Disable Update ReminderWyłącz przypominanie o aktualizacji
-
+ Disable Sound EffectsWyłącz efekty dźwiękowe
@@ -1755,314 +1755,314 @@
Otwartoźródłowe projekty MuldeR'a
-
+ Adding file(s), please wait...Dodawanie plików, prosze czekać...
-
-
+
+ Access DeniedDostęp zablokowany
-
+ This usually means the file is locked by another process.To przeważnie oznacza, że plik jest zablokowany przez inny proces.
-
+ CDDA FilesPliki CDDA
-
+ Sorry, LameXP cannot extract audio tracks from an Audio-CD at present.LameXP nie może teraz wyekstrachować ścieżki z płyty Audio-CD.
-
+ We recommend using %1 for that purpose.Zaleca się użycie w tym celu %1.
-
+ Cue SheetCue Sheet
-
+ Please use LameXP's Cue Sheet wizard for importing Cue Sheet files.Prosze użyć przewodnika Cue Sheet w LameXP w celu importowania tych plików.
-
+ Files RejectedPliki odrzucone
-
+ This usually means the file is damaged or the file format is not supported.To przeważnie oznacza że plik jest uszkodzony lub format pliku nie jest wspierany.
-
+ Scanning folder(s) for files, please wait...Skanowanie folderu/ów, prosze czekać...
-
+ You can drop in audio files here!Tutaj możesz upuścić pliki dźwiękowe!
-
+ Open File in External ApplicationOtwórz plik w zewnętrznym programie
-
+ Browse File LocationOtwórz lokalizację pliku
-
+ Browse Selected FolderOtwórz wybrany folder
-
+ Bookmark Current Output FolderZapamiętaj wybrany folder
-
+ License DeclinedLicencja odrzucona
-
+ You have declined the license. Consequently the application will exit now!Odrzuciłeś licencję. W takim razie program zostanie teraz zamknięty!
-
+ Goodbye!Naraska!
-
+ LameXP - ExpiredLameXP - Termin wygasł
-
+ This demo (pre-release) version of LameXP has expired at %1.Ta wersja próbna LameXP wygasła %1.
-
+ LameXP is free software and release versions won't expire.LameXP jest darmowym oprogramowaniem i pełna wersja nie wygasa.
-
-
+
+ Exit ProgramWyjdź z programu
-
+ It seems that a bogus anti-virus software is slowing down the startup of LameXP.Najwyraźniej twoje oprogramowanie antywirusowe spowalnia uruchamianie się LameXP.
-
+ Please refer to the %1 document for details and solutions!Prosze sprawdzić dokument %1 w celu dalszych szcegółów i rozwiązań!
-
+ Slow StartupPowolny start
-
-
-
-
-
+
+
+
+
+ DiscardZamknij
-
-
+
+ Don't Show AgainNie pokazuj ponownie
-
+ Urgent UpdateWażna aktualizacja
-
+ Your version of LameXP is more than a year old. Time for an update!Twoja wersja LameXP jest starsza niż rok! Czas na aktualizację!
-
-
-
+
+
+ Update ReminderPowiadomienie aktualizacji
-
+ Your last update check was more than 14 days ago. Check for updates now?Ostatnie sprawdzenie aktualizacji było ponad 14 dni temu. Sprawdzić teraz aktualizacje?
-
+ Your did not check for LameXP updates yet. Check for updates now?Nie sprawdzałeś jeszcze aktualizacji LameXP. Sprawdzić teraz aktualizacje?
-
+ PostponePrzełóż
-
+ LameXP detected that your version of the Nero AAC encoder is outdated!LameXP wykrył że Twoja wersja kodera Nero AAC jest nieaktualna!
-
+ The current version available is %1 (or later), but you still have version %2 installed.Wersją dostępną obecnie jest %1, Twoja wersja to %2.
-
+ n/ab/d
-
+ You can download the latest version of the Nero AAC encoder from the Nero website at:Możesz pobrać najnowszą wersję kodera Nero AAC ze strony Nero:
-
+ AAC Encoder OutdatedKoder AAC jest nieaktualny
-
+ The Nero AAC encoder could not be found. AAC encoding support will be disabled.Nie można odnaleźć kodera Nero AAC. Kompresja formatu AAC zostanie wyłączona.
-
+ Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory!Prosze skopiować 'neroAacEnc.exe', 'neroAacDec.exe', oraz 'neroAacTag.exe' do folderu LameXP!
-
+ Your LameXP directory is located here:Folder aplikacji LameXP znajduje się tutaj:
-
+ You can download the Nero AAC encoder for free from the official Nero website at:Możesz pobrać koder Nero AAC za darmo z oficjalnej strony Nero:
-
+ AAC Support DisabledWsparcie dla AAC wyłączone
-
-
-
+
+
+ LameXPLameXP
-
+ You must add at least one file to the list before proceeding!Powinienieś dodać przynajmniej jeden plik do listy aby zacząć działać!
-
+ Not FoundNie znaleziono
-
+ Your currently selected TEMP folder does not exist anymore:Wybrany przez Ciebie folder tymczasowy TEMP już nie istnieje:
-
+ Restore DefaultPrzywróć domyślne
-
+ CancelAnuluj
-
+ Low Diskspace WarningOstrzeżenie o małej ilości miejsca na dysku
-
+ There are less than %1 GB of free diskspace available on your system's TEMP folder.Jest mniej niż %1 GB dostępnego miejsca w systemowym folderze TEMP.
-
+ DEMO VERSIONWERSJA PRÓBNA
-
+ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!)(Podpowiedź: Zignoruj nazwę pobranego pliku ZIP, w zamian sprawdż załączony w archiwum plik "changelog.txt"!)
-
+ It is highly recommend to free up more diskspace before proceeding with the encode!Jest wysoce zalecane zwolnić miejsce na dysku zanim zaczniesz kompresję!
-
+ Your TEMP folder is located at:Twój folder TEMP znajduję się:
-
+ Abort Encoding ProcessPrzerwij proces kompresji
-
+ Clean Disk NowWykonaj oczyszczanie dysku
-
-
+
+ IgnoreIgnoruj
-
+ %n file(s) have been rejected, because read access was not granted!%n plik został odrzucony, ponieważ nie dano praw odczytu!
@@ -2071,7 +2071,7 @@
-
+ %n file(s) have been rejected, because they are dummy CDDA files!%n plik został odrzucony, ponieważ jest to plik CDDA!
@@ -2080,7 +2080,7 @@
-
+ %n file(s) have been rejected, because they appear to be Cue Sheet images!%n plik został odrzucony, ponieważ jest to plik Cue!
@@ -2089,7 +2089,7 @@
-
+ %n file(s) have been rejected, because the file format could not be recognized!%n plik został odrzucony, ponieważ jego format nie został rozpoznany!
@@ -2098,496 +2098,492 @@
-
+ Initializing directory outline, please be patient...Ładowanie zestawu folderów, prosze czekać...
-
+ Refresh Directory OutlineOdśwież foldery
-
+ Go To Parent DirectoryIdź do głównego folderu
-
+ Export Meta Tags to CSV FileEksportuj Tagi do pliku CVS
-
+ Import Meta Tags from CSV FileImportuj Tagi do pliku CVS
-
+ Skipping update check this time, please be patient...Pomijanie sprawdzania aktualizacji, prosze czekać...
-
+ Low DiskspaceMało miejsca na dysku
-
+ You are proceeding with low diskspace. Problems might occur!Chcesz zacząć działać z małą ilością miejsca na dysku. Mogą wystąpić problemy!
-
+ Sorry, an unsupported encoder has been chosen!Został wybrany koder, który nie jest wspierany!
-
+ Cannot write to the selected output directory.Nie można zapisać do wybranej lokalizacji.
-
+ Please choose a different directory!Prosze wybrać inną lokalizację!
-
+ Load TranslationZaladuj plik językowy
-
+ Translation FilesPliki językowe
-
+ Do you really want to disable the update reminder?Czy na pewno chcesz wyłączyć przypominanie o aktualizacjach?
-
-
-
-
-
-
-
+
+
+
+
+
+
+ YesTak
-
-
-
-
-
-
-
+
+
+
+
+
+
+ NoNie
-
+ The update reminder has been disabled.Przypominanie o aktualizacjach wyłączone.
-
+ Please remember to check for updates at regular intervals!Prosze pamiętać o okresowym sprawdzaniu aktualizacji!
-
+ The update reminder has been re-enabled.Przypominanie o aktualizacjach ponownie włączone.
-
+ Do you really want to disable all sound effects?Czy na pewno chcesz wyłączyć wszystkie dźwiękowe?
-
-
+
+ Sound EffectsEfekty dźwiękowe
-
+ All sound effects have been disabled.Wszystkie efekty dźwiękowe zostały wyłączone.
-
+ The sound effects have been re-enabled.Efekty dźwiękowe zostały ponownie włączone.
-
-
-
+
+
+ Nero AAC NotificationsPowiadomienia Nero AAC
-
+ Do you really want to disable all Nero AAC Encoder notifications?Czy na pewno chcesz wyłączyć wszystkie powiadomienia Nero AAC?
-
+ All Nero AAC Encoder notifications have been disabled.Wszystkie powiadomienia kodera Nero AAC zostały wyłączone.
-
+ The Nero AAC Encoder notifications have been re-enabled.Powiadomienia Nero AAC zostały ponownie włączone.
-
-
-
+
+
+ Slow Startup NotificationsPowiadomienia o powolnym starcie
-
+ Do you really want to disable the slow startup notifications?Czy na pewno chcesz wyłączyć powiadomienia o powolnym starcie?
-
+ The slow startup notifications have been disabled.Powiadomienia o powolnym starcie zostały wyłączone.
-
+ The slow startup notifications have been re-enabled.Powiadomienia o powolnym starcie zostały ponownie włączone.
-
-
+
+ Open Cue SheetOtwórz plik Cue Sheet
-
-
+
+ Cue Sheet FilePlik Cue Sheet
-
-
-
+
+
+ Beta UpdatesAktualizacje Beta
-
+ Do you really want LameXP to check for Beta (pre-release) updates?Czy na pewno chcesz aby LameXP sprawdzał aktualizacje Beta?
-
+ LameXP will check for Beta (pre-release) updates from now on.Od teraz LameXP będzie sprawdzał aktualizacje Beta.
-
+ Check NowSprawdź teraz
-
+ LameXP will <i>not</i> check for Beta (pre-release) updates from now on.LameXP od teraz <i>nie będzie</i> sprawdzał aktualizacji Beta.
-
-
-
+
+
+ Hibernate ComputerHibernuj komputer
-
+ Do you really want the computer to be hibernated on shutdown?Czy na pewno chcesz aby komputer był hibernowany zamiast zamykany?
-
+ LameXP will hibernate the computer on shutdown from now on.Od teraz LameXP będzie hibernował komputer zamiast zamykać.
-
+ LameXP will <i>not</i> hibernate the computer on shutdown from now on.LameXP od teraz <i>nie</i> będzie hibernował komputera tylko zamykał.
-
-
-
+
+
+ Shell IntegrationIntegracja z systemem
-
+ Do you really want to disable the LameXP shell integration?Czy na pewno chcesz wyłączyć integrację LameXP z systemem?
-
+ The LameXP shell integration has been disabled.Integracja LameXP z systemem zostałą wyłączona.
-
+ The LameXP shell integration has been re-enabled.Integracja LameXP z systemem została ponownie włączona.
-
-
+
+ Add file(s)Dodaj plik(i)
-
-
+
+ Add FolderDodaj folder
-
-
+
+ Save CSV fileZapisz plik CSV
-
-
-
-
+
+
+
+ CSV FilePlik CSV
-
-
-
-
+
+
+
+ CSV ExportEksportowanie CSV
-
+ Sorry, there are no meta tags that can be exported!Nie ma żadnych tagów, które można eksportować!
-
+ Sorry, failed to open CSV file for writing!Nie można otworzyć pliku CSV aby go zapisać!
-
+ Sorry, failed to write to the CSV file!Nie można zapisać do pliku CSV!
-
+ The CSV files was created successfully!Pliki CSV utworzone pomyślnie!
-
-
+
+ Open CSV fileOtwórz plik CSV
-
+ Sorry, failed to open CSV file for reading!Nie można otworzyć pliku CSV aby go wczytać!
-
-
-
-
-
+
+
+
+
+ CSV ImportImportowanie CSV
-
+ Sorry, failed to read from the CSV file!Próba odczytania pliku CSV zakończona niepowodzeniem!
-
+ Sorry, the CSV file does not contain any known fields!Plik CSV nie zawiera żadnych znanych pól!
-
+ CSV file is incomplete. Not all files were updated!Plik CSV nie jest kompletny. Nie wszystkie pliki zostały zaktualizowane!
-
+ The CSV files was imported successfully!Pliki CSV zaimportowano pomyślnie!
-
-
+
+ New FolderNowy folder
-
+ Enter the name of the new folder:Wprowadź nazwę nowego folderu:
-
+ Failed to create folderUtworzenie folderu zakończone niepowodzeniem
-
+ The new folder could not be created:Nowy folder nie mógł zostać stworzony:
-
+ Drive is read-only or insufficient access rights!Dysk tylko do odczytu lub brak praw dostępu!
-
+ QAAC (Apple)QAAC (Apple)
-
+ FHG AAC (Winamp)FHG AAC (Winamp)
-
+ Nero AACNero AAC
-
+ Not available!Niedostępny!
-
+ Current AAC Encoder: %1Obecny koder AAC: %1
-
-
-
-
-
-
+
+
+
+
+
+ Quality Level %1Poziom jakości %1
-
-
-
+ Compression %1Kompresja %1
-
-
-
+ UncompressedNieskompresowany
-
+ Best Quality (Slow)
-
+ Acceptable Quality (Fast)
-
+ High Quality (Recommended)Wysoka jakość (Zalecane)
-
+ Poor Quality (Very Fast)Najniższa jakość (Bardzo szybko)
-
+ File name without extensionNazwa pliku bez rozszerzenia
-
+ Track number with leading zeroNumer ścieżki z zerem na początku
-
+ Track titleNazwa ścieżki
-
+ Artist nameNazwa Artysty
-
+ Album nameNazwa Albumu
-
+ Year with (at least) four digitsRok z (przynajmniej) czterema cyframi
-
+ CommentKomentarz
-
+ Characters forbidden in file names:Zabronione znaki w nazwach plików:
-
+ Rename MacrosZmień nazwy makr
-
+ %n Instance(s)%n wątek
@@ -2596,37 +2592,37 @@
-
+ Cannot write to the selected directory. Please choose another directory!Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację!
-
+ Overwrite ModeTryb 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!
-
+ ContinueKontynuuj
-
+ RevertCofnij
-
+ Already RunningJuż działa
-
+ LameXP is already running, please use the running instance!LameXP już działa, przejdź do działającego procesu!
@@ -3107,72 +3103,72 @@
Powrót
-
+ Show details for selected jobPokaż szczegóły wybranego zadania
-
+ Browse Output File LocationWybierz lokalizację dla plików wyjściowych
-
+ Filter Log ItemsFiltruj długie pozycje
-
+ Show Running OnlyPokaż tylko trwające
-
+ Show Succeeded OnlyPokaż tylko zakończone pomyślnie
-
+ Show Failed OnlyPokaż tylko zakończone niepowodzeniem
-
+ Show Skipped OnlyPokaż tylko pominięte
-
+ Show All ItemsPokaż wszystkie pozycje
-
+ Encoding FilesKompresowanie plików
-
+ Your files are being encoded, please be patient...Twoje pliki są właśnie kompresowane, prosze być cierpliwy...
-
+ Encoding files, please wait...Kompresowanie plików, prosze czekać...
-
+ Multi-threading enabled: Running %1 instances in parallel!Wielowątkowosć włączona: Równolegle wykonywanych jest %1 kodowań!
-
+ Aborted! Waiting for running jobs to terminate...Przerwano! Czekanie na wyłączenie procesu...
-
+ Encoding: %n file(s) of %1 completed so far, please wait...Kompresowanie: %n plik z %1 został do tej pory zakończony, prosze czekać...
@@ -3181,17 +3177,17 @@
-
+ Creating the playlist file, please wait...Tworzenie pliku playlisty, prosze czekać...
-
+ Process was aborted prematurely by the user!Proces został przedwcześnie zakończony przez użytkownika!
-
+ Process was aborted by the user after %n file(s)!Proces został zakończony przez użytkownika po zakończeniu %n pliku!
@@ -3200,22 +3196,22 @@
-
+ LameXP - AbortedLameXP - Przerwano
-
+ Process was aborted by the user.Proces został przerwany przez użytkownika.
-
+ Process finished after %1.Proces został zakończony po %1.
-
+ Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!Błąd: %1 z %n pliku zakończono niepowodzeniem (%2). Kliknij dwukrotnie aby uzyskać więcej informacji!
@@ -3224,7 +3220,7 @@
-
+ %n file(s) skippedpominięto %n plik
@@ -3233,7 +3229,7 @@
-
+ Error: %1 of %n file(s) failed. Double-click failed items for detailed information!Błąd: %1 z %n pliku zakończono niepowodzeniem. Kliknij dwukrotnie aby uzyskać więcej informacji!
@@ -3242,7 +3238,7 @@
-
+ All files completed successfully. Skipped %n file(s).Wszystkie zadania wykonano pomyślnie. Pominięto %n plik.
@@ -3251,54 +3247,54 @@
-
+ LameXP - ErrorLameXP - Błąd
-
+ At least one file has failed!Przynajmniej jeden plik nie został skompresowany!
-
+ All files completed successfully.Kompresja wszystkich plików zakończona powodzeniem.
-
+ LameXP - DoneLameXP - Zrobione
-
+ None of the items matches the current filtering rulesŻadna z pozycji nie spełnia reguł filtra
-
+ Playlist creation failedTworzenie playlisty zakończone niepowodzeniem
-
+ The playlist file could not be created:Playlista nie mogła zostać utworzona:
-
+ Warning: Computer will shutdown in %1 seconds...Ostrzeżenie: Komputer zostanie zamknięty za %1 sekund/y...
-
-
+
+ Cancel ShutdownAnuluj wyłączenie komputera
-
+ %n hour(s)%n godzina
@@ -3307,8 +3303,8 @@
-
-
+
+ %n minute(s)%n minuta
@@ -3317,8 +3313,8 @@
-
-
+
+ %n second(s)%n sekunda
@@ -3327,7 +3323,7 @@
-
+ %n millisecond(s)%n milisekunda
@@ -3352,23 +3348,23 @@
QApplication
-
+ Executable '%1' doesn't support Windows compatibility mode.Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows.
-
+ Executable '%1' requires Qt v%2, but found Qt v%3.Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3.
-
+ Executable '%1' was built for Qt '%2', but found Qt '%3'.Plik wykonywalny "%1" został skompilowany dla Qt "%2", znaleziono "%3".
-
-
+
+ Executable '%1' requires Windows 2000 or later.Plik wykonywalny '%1' wymaga do uruchomienia Windows 2000 lub nowszego.
diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index 28b10394..e4be2f4a 100644
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -876,7 +876,7 @@
-
+ Show DetailsVisa detaljer
@@ -1618,9 +1618,9 @@
-
-
-
+
+
+ Check for UpdatesSök efter uppdateringar
@@ -1661,13 +1661,13 @@
-
+ Disable Update ReminderInaktivera uppdateringsmeddelande
-
+ Disable Sound EffectsInaktivera ljudeffekter
@@ -1752,23 +1752,23 @@
MuldeRs Öppen källkodsprojekt
-
+ Adding file(s), please wait...Lägger till fil(er), vänta...
-
-
+
+ Access DeniedÅtkomst nekad
-
+ This usually means the file is locked by another process.Det innebär oftast att filen är låst av någon annan process.
-
+ %n file(s) have been rejected, because read access was not granted!%n fil har avvisats, eftersom läsbehörighet saknas!
@@ -1776,22 +1776,22 @@
-
+ CDDA FilesCDDA-filer
-
+ Sorry, LameXP cannot extract audio tracks from an Audio-CD at present.LameXP kan för närvarande inte extrahera ljudspår från en ljud-CD.
-
+ We recommend using %1 for that purpose.Vi rekommenderar att du använder %1 för det ändamålet.
-
+ %n file(s) have been rejected, because they are dummy CDDA files!%n fil har avvisats, eftersom det är en CDDA attrappfil (dummy)!
@@ -1799,17 +1799,17 @@
-
+ Cue SheetCue-fil
-
+ Please use LameXP's Cue Sheet wizard for importing Cue Sheet files.Använd LameXPs cue-guide för att importera cue-filer.
-
+ %n file(s) have been rejected, because they appear to be Cue Sheet images!%n fil har avvisats, eftersom det verkar vara en cue-avbildning!
@@ -1817,17 +1817,17 @@
-
+ Files RejectedUndantagna filer
-
+ This usually means the file is damaged or the file format is not supported.Det innebär oftast att filen är skadad eller att filformatet inte stöds.
-
+ %n file(s) have been rejected, because the file format could not be recognized!%n fil har avvisats, eftersom filformatet inte känns igen!
@@ -1835,752 +1835,748 @@
-
+ Scanning folder(s) for files, please wait...Genomsöker mapp(ar) efter fil(er), vänta...
-
+ DEMO VERSIONDEMOVERSION
-
+ You can drop in audio files here!Du kan dra och släppa filer här!
-
+ Initializing directory outline, please be patient...Initierar mappdisposition, vänta...
-
+ Open File in External ApplicationÖppna fil i externt program
-
+ Browse File LocationÖppna målmappen
-
+ Browse Selected FolderÖppna markerad mapp
-
+ Refresh Directory OutlineUppdatera mappdisposition
-
+ Go To Parent DirectoryGå till överordnad mapp
-
+ Bookmark Current Output FolderLägg till aktuell utdatamapp i favoriter
-
+ Export Meta Tags to CSV FileExportera metadata till CSV-fil
-
+ Import Meta Tags from CSV FileImportera metadata från CSV-fil
-
+ License DeclinedLicensavtal avvisat
-
+ You have declined the license. Consequently the application will exit now!Du har nekat att godkänna licensavtalet. Programmet kommer nu att avslutas!
-
+ Goodbye!Hej då!
-
+ LameXP - ExpiredLameXP - Upphört
-
+ This demo (pre-release) version of LameXP has expired at %1.Denna demoversion av LameXP har upphört att gälla från %1.
-
+ LameXP is free software and release versions won't expire.LameXP är kostnadsfritt och release-versionerna upphör inte att gälla.
-
-
+
+ Exit ProgramAvsluta programmet
-
+ It seems that a bogus anti-virus software is slowing down the startup of LameXP.Det verkar som ett antivirusprogram orsakar långsammare uppstart av LameXP.
-
+ Please refer to the %1 document for details and solutions!Läs gärna %1 för detaljer och lösningar!
-
+ Slow StartupLångsam uppstart
-
-
-
-
-
+
+
+
+
+ DiscardStäng
-
-
+
+ Don't Show AgainVisa inte igen
-
+ Urgent UpdateViktig uppdatering
-
+ Your version of LameXP is more than a year old. Time for an update!Din version av LameXP är mer än ett år gammal. Dags att uppdatera!
-
-
+
+ IgnoreIgnorera
-
+ Skipping update check this time, please be patient...Hoppar över uppdateringskontrollen den här gången, vänta...
-
-
-
+
+
+ Update ReminderUppdateringspåminnelse
-
+ Your last update check was more than 14 days ago. Check for updates now?Din senaste uppdateringskontroll var för mer än 14 dagar sedan. Vill du söka efter uppdateringar nu?
-
+ Your did not check for LameXP updates yet. Check for updates now?Du har inte genomfört uppdateringskontroll ännu. Vill du söka efter uppdateringar nu?
-
+ PostponeSkjut upp
-
+ LameXP detected that your version of the Nero AAC encoder is outdated!LameXP har uptäckt att din version av Nero AAC-kodare är utdaterad!
-
+ The current version available is %1 (or later), but you still have version %2 installed.Aktuell version är %1 (eller senare), men du har fortfarande version %2.
-
+ n/an/a
-
+ You can download the latest version of the Nero AAC encoder from the Nero website at:Du kan ladda ner senaste versionen av Nero AAC-kodare från Neros webbsida:
-
+ (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!)(Tips: Bortse från den nedladde zipfilens namn, och kontrollera istället den inkluderade textfilen 'changelog.txt'!)
-
+ AAC Encoder OutdatedAAC-kodare utdaterad
-
+ The Nero AAC encoder could not be found. AAC encoding support will be disabled.Neros AAC-kodare kan inte hittas. Stödet för AAC-kodning kommer att inaktiveras.
-
+ Please put 'neroAacEnc.exe', 'neroAacDec.exe' and 'neroAacTag.exe' into the LameXP directory!Placera 'neroAacEnc.exe', 'neroAacDec.exe' och 'neroAacTag.exe' i LameXPs programmmapp!
-
+ Your LameXP directory is located here:Din LameXP programmapp finns här:
-
+ You can download the Nero AAC encoder for free from the official Nero website at:Du kan ladda ner Nero AAC-kodare gratis från den officiella webbsidan:
-
+ AAC Support DisabledAAC-stödet är inaktiverat
-
-
-
+
+
+ LameXPLameXP
-
+ You must add at least one file to the list before proceeding!Du måste lägga till minst en fil till listan innan du fortsätter!
-
+ Not FoundKan inte hittas
-
+ Your currently selected TEMP folder does not exist anymore:Din aktuella TEMP-mapp finns inte längre:
-
+ Restore DefaultÅterställ standard
-
+ CancelAvbryt
-
+ There are less than %1 GB of free diskspace available on your system's TEMP folder.Det finns mindre än %1 GB ledigt diskutrymme i systemets temp-mapp.
-
+ It is highly recommend to free up more diskspace before proceeding with the encode!Du behöver frigöra mer diskutrymme innan du fortsätter med omkodningen!
-
+ Your TEMP folder is located at:Temp-mappens placering:
-
+ Low Diskspace WarningVarning för dåligt diskutrymme
-
+ Abort Encoding ProcessAvbryt omkodningsprocessen
-
+ Clean Disk NowRensa disken nu
-
+ Low DiskspaceDåligt diskutrymme
-
+ You are proceeding with low diskspace. Problems might occur!Du fortsätter med dåligt diskutrymme. Problem kan uppstå!
-
+ Sorry, an unsupported encoder has been chosen!En kodare som saknar stöd har valts!
-
+ Cannot write to the selected output directory.Kan inte skriva till den valda utdatamappen.
-
+ Please choose a different directory!Välj en annan målmapp!
-
+ Load TranslationLäs in översättning
-
+ Translation FilesÖversättningsfiler
-
+ Do you really want to disable the update reminder?Vill du verkligen inaktivera uppdateringspåminnelsen?
-
-
-
-
-
-
-
+
+
+
+
+
+
+ YesJa
-
-
-
-
-
-
-
+
+
+
+
+
+
+ NoNej
-
+ The update reminder has been disabled.Uppdateringspåminnelsen har inaktiverats.
-
+ Please remember to check for updates at regular intervals!Glöm inte att söka efter uppdateringar med jämna mellanrum!
-
+ The update reminder has been re-enabled.Uppdateringspåminnelsen har återaktiverats.
-
+ Do you really want to disable all sound effects?Vill du verkligen inaktivera alla ljudeffekter?
-
-
+
+ Sound EffectsLjudeffekter
-
+ All sound effects have been disabled.Alla ljudeffekter har inaktiverats.
-
+ The sound effects have been re-enabled.Ljudeffekterna har återaktiverats.
-
-
-
+
+
+ Nero AAC NotificationsNero AAC-meddelanden
-
+ Do you really want to disable all Nero AAC Encoder notifications?Vill du verkligen inaktivera alla Nero AAC-meddelanden?
-
+ All Nero AAC Encoder notifications have been disabled.Alla Nero AAC-meddelanden har inaktiverats.
-
+ The Nero AAC Encoder notifications have been re-enabled.Nero AAC-meddelanden har återaktiverats.
-
-
-
+
+
+ Slow Startup NotificationsMeddelande om långsam uppstart
-
+ Do you really want to disable the slow startup notifications?Vill du verkligen inaktivera meddelanden om långsam uppstart?
-
+ The slow startup notifications have been disabled.Meddelanden om långsam uppstart har inaktiverats.
-
+ The slow startup notifications have been re-enabled.Meddelanden om långsam uppstart har återaktiverats.
-
-
+
+ Open Cue SheetÖppna cue-fil
-
-
+
+ Cue Sheet FileCue-fil
-
-
-
+
+
+ Beta UpdatesBeta-uppdateringar
-
+ Do you really want LameXP to check for Beta (pre-release) updates?Vill du verkligen att LameXP skall söka efter beta-uppdateringar?
-
+ LameXP will check for Beta (pre-release) updates from now on.LameXP kommer i fortsättningen att söka efter beta-uppdatyeringar.
-
+ Check NowSök nu
-
+ LameXP will <i>not</i> check for Beta (pre-release) updates from now on.LameXP kommer i fortsättningen <i>inte</i> att söka efter beta-uppdateringar.
-
-
-
+
+
+ Hibernate ComputerViloläge
-
+ Do you really want the computer to be hibernated on shutdown?Vill du verkligen att datorn skall försättas i viloläge vid avslut?
-
+ LameXP will hibernate the computer on shutdown from now on.LameXP kommer i fortsättningen att försätta datorn i viloläge vid avslut.
-
+ LameXP will <i>not</i> hibernate the computer on shutdown from now on.LameXP kommer i fortsättningen <i>inte</i> att försätta datorn i viloläge vid avslut.
-
-
-
+
+
+ Shell IntegrationUtforskarintegrering
-
+ Do you really want to disable the LameXP shell integration?Vill du verkligen inaktivera LameXPs utforskarintegration?
-
+ The LameXP shell integration has been disabled.LameXPs utforskarintegration har inaktiverats.
-
+ The LameXP shell integration has been re-enabled.LameXPs utforskarintegration har återaktiverats.
-
-
+
+ Add file(s)Lägg till fil(er)
-
-
+
+ Add FolderLägg till mapp
-
-
+
+ Save CSV fileSpara CSV-fil
-
-
-
-
+
+
+
+ CSV FileCSV-fil
-
-
-
-
+
+
+
+ CSV ExportCSV-export
-
+ Sorry, there are no meta tags that can be exported!Det finns ingen meta-data som kan exporteras!
-
+ Sorry, failed to open CSV file for writing!Kunde inte öppna CSV-filen för skrivning!
-
+ Sorry, failed to write to the CSV file!Kunde inte skriva till CSV-filen!
-
+ The CSV files was created successfully!CSV-filen skapades korrekt!
-
-
+
+ Open CSV fileÖppna CSV-fil
-
-
-
-
-
+
+
+
+
+ CSV ImportCSV-import
-
+ Sorry, failed to open CSV file for reading!Kunde inte öppna CSV-filen för läsning!
-
+ Sorry, failed to read from the CSV file!Kunde inte läsa från CSV-filen!
-
+ Sorry, the CSV file does not contain any known fields!CSV-filen innehåller inga kända fält!
-
+ CSV file is incomplete. Not all files were updated!CSV-filen är inte komplett. Alla filer uppdaterades inte!
-
+ The CSV files was imported successfully!CSV-filen importerades korrekt!
-
-
+
+ New FolderNy mapp
-
+ Enter the name of the new folder:Namn på den nya mappen:
-
+ Failed to create folderKunde inte skapa någon mapp
-
+ The new folder could not be created:Den nya mappen kunde inte skapas:
-
+ Drive is read-only or insufficient access rights!Diskenheten är skrivskyddad eller åtkomsträttigheter saknas!
-
+ QAAC (Apple)QAAC (Apple)
-
+ FHG AAC (Winamp)FHG AAC (Winamp)
-
+ Nero AACNero AAC
-
+ Not available!Ej tillgänglig!
-
+ Current AAC Encoder: %1Aktuell AAC-kodare: %1
-
-
-
-
-
-
+
+
+
+
+
+ Quality Level %1Kvallitetsnivå %1
-
-
-
+ Compression %1Kompression %1
-
-
-
+ UncompressedOkomprimerad
-
+ Best Quality (Slow)Bäst kvalitet (Långsam)
-
+ Acceptable Quality (Fast)Acceptabel kvalitet (Snabb)
-
+ High Quality (Recommended)Hög kvallitet (rekommenderas)
-
+ Poor Quality (Very Fast)Dålig kvallitet (mycket snabb)
-
+ File name without extensionFilnamn utan filtillägg
-
+ Track number with leading zeroSpårnummer med inledande nolla
-
+ Track titleSpårtitel
-
+ Artist nameArtistnamn
-
+ Album nameAlbumnamn
-
+ Year with (at least) four digitsÅrtal med (minst) fyra siffror
-
+ CommentKommentar
-
+ Characters forbidden in file names:Förbjudna tecken i filnamn:
-
+ Rename MacrosNamnändra macron
-
+ %n Instance(s)%n instans
@@ -2588,37 +2584,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!
-
+ ContinueFortsätt
-
+ RevertÅterställ
-
+ Already RunningKörs redan
-
+ LameXP is already running, please use the running instance!LameXP körs redan, använd den redan startade instansen!
@@ -3100,72 +3096,72 @@
Stäng
-
+ Show details for selected jobVisa detaljerad info för markerad åtgärd
-
+ Browse Output File LocationÖppna utdatamnappen
-
+ Filter Log ItemsFiltrera loggobjekt
-
+ Show Running OnlyVisa endast aktiva
-
+ Show Succeeded OnlyVisa endast klara
-
+ Show Failed OnlyVisa endast misslyckade
-
+ Show Skipped OnlyVisa endast överhoppade
-
+ Show All ItemsVisa alla
-
+ Encoding FilesKodar om filer
-
+ Your files are being encoded, please be patient...Dina filer kodas om, vänta...
-
+ Encoding files, please wait...Kodar om filer, vänta...
-
+ Multi-threading enabled: Running %1 instances in parallel!Flertrådskörning aktiverad: Kör %1 parallella instanser!
-
+ Aborted! Waiting for running jobs to terminate...Avbrutet! Väntar på att aktiva processer skall avslutas...
-
+ Encoding: %n file(s) of %1 completed so far, please wait...Kodar! %n fil av%1 slutförd. vänta...
@@ -3173,17 +3169,17 @@
-
+ Creating the playlist file, please wait...Skapar spelningslista, vänta...
-
+ Process was aborted prematurely by the user!Åtgärden avbröts i förtid av användaren!
-
+ Process was aborted by the user after %n file(s)!Åtgärden avbröts av användaren efter %n fil!
@@ -3191,22 +3187,22 @@
-
+ LameXP - AbortedLameXP - Avbrutet
-
+ Process was aborted by the user.Åtgärden avbröts av användaren.
-
+ Process finished after %1.Åtgärden slutförd efter %1.
-
+ Error: %1 of %n file(s) failed (%2). Double-click failed items for detailed information!Fel! %1 av %n filer misslyckades (%2). Dubbelklicka på misslyckat objekt för info!
@@ -3214,7 +3210,7 @@
-
+ %n file(s) skipped%n fil hoppades över
@@ -3222,7 +3218,7 @@
-
+ Error: %1 of %n file(s) failed. Double-click failed items for detailed information!Fel! %1 av %n filer misslyckades. Dubbelklicka på misslyckat objekt för info!
@@ -3230,7 +3226,7 @@
-
+ All files completed successfully. Skipped %n file(s).Alla filer korrekt slutförda. %n fil hoppades över.
@@ -3238,54 +3234,54 @@
-
+ LameXP - ErrorLameXP - Fel
-
+ At least one file has failed!Minst en fil har misslyckats!
-
+ All files completed successfully.Alla filer korrekt omkodade.
-
+ LameXP - DoneLameXP - Klar
-
+ None of the items matches the current filtering rulesInga objekt matchar aktuell filtrering
-
+ Playlist creation failedKunde inte skapa spelningslista
-
+ The playlist file could not be created:Spelningslistan kunde inte skapas:
-
+ Warning: Computer will shutdown in %1 seconds...Varning! Datorn kommer att stängas av om %1 sekunder...
-
-
+
+ Cancel ShutdownAvbryt avstängning
-
+ %n hour(s)%n timma
@@ -3293,8 +3289,8 @@
-
-
+
+ %n minute(s)%n minut
@@ -3302,8 +3298,8 @@
-
-
+
+ %n second(s)%n sekund
@@ -3311,7 +3307,7 @@
-
+ %n millisecond(s)%n millisekund
@@ -3335,23 +3331,23 @@
QApplication
-
+ Executable '%1' doesn't support Windows compatibility mode.EXE-filen '%1' stöder inte Windows kompatibilitetsläge.
-
+ Executable '%1' requires Qt v%2, but found Qt v%3.EXE-filen '%1' kräver Qt v%2, du har Qt v%3.
-
+ Executable '%1' was built for Qt '%2', but found Qt '%3'.EXE-filen '%1' är byggd för Qt '%2', du har Qt '%3'.
-
-
+
+ Executable '%1' requires Windows 2000 or later.EXE-filen '%1' kräver Windows 2000 eller senare.
diff --git a/src/Config.h b/src/Config.h
index 44d02aef..63dc37c2 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -33,8 +33,8 @@
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 8
#define VER_LAMEXP_TYPE Alpha
-#define VER_LAMEXP_PATCH 3
-#define VER_LAMEXP_BUILD 1303
+#define VER_LAMEXP_PATCH 5
+#define VER_LAMEXP_BUILD 1310
#define VER_LAMEXP_CONFG 1288
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 0e8da9b1..db9e4c49 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -150,6 +150,14 @@ while(0)
} \
while(0)
+#define WITH_BLOCKED_SIGNALS(WIDGET, CMD, ...) do \
+{ \
+ (WIDGET)->blockSignals(true); \
+ (WIDGET)->CMD(__VA_ARGS__); \
+ (WIDGET)->blockSignals(false); \
+} \
+while(0)
+
#define LINK(URL) QString("%2").arg(URL).arg(QString(URL).replace("-", "−"))
#define FSLINK(PATH) QString("%2").arg(PATH).arg(QString(PATH).replace("-", "−"))
//#define USE_NATIVE_FILE_DIALOG (lamexp_themes_enabled() || ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) < QSysInfo::WV_XP))
@@ -356,10 +364,11 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
ui->radioButtonEncoderOpus->setChecked(m_settings->compressionEncoder() == SettingsModel::OpusEncoder);
ui->radioButtonEncoderDCA->setChecked(m_settings->compressionEncoder() == SettingsModel::DCAEncoder);
ui->radioButtonEncoderPCM->setChecked(m_settings->compressionEncoder() == SettingsModel::PCMEncoder);
- ui->radioButtonModeQuality->setChecked(m_settings->compressionRCMode() == SettingsModel::VBRMode);
- ui->radioButtonModeAverageBitrate->setChecked(m_settings->compressionRCMode() == SettingsModel::ABRMode);
- ui->radioButtonConstBitrate->setChecked(m_settings->compressionRCMode() == SettingsModel::CBRMode);
- ui->sliderBitrate->setValue(m_settings->compressionBitrate());
+
+ //ui->radioButtonModeQuality->setChecked(m_settings->compressionRCMode() == SettingsModel::VBRMode);
+ //ui->radioButtonModeAverageBitrate->setChecked(m_settings->compressionRCMode() == SettingsModel::ABRMode);
+ //ui->radioButtonConstBitrate->setChecked(m_settings->compressionRCMode() == SettingsModel::CBRMode);
+ //ui->sliderBitrate->setValue(m_settings->compressionBitrate());
m_evenFilterCompressionTab = new CustomEventFilter();
ui->labelCompressionHelp->installEventFilter(m_evenFilterCompressionTab);
@@ -908,6 +917,129 @@ void MainWindow::initializeTranslation(void)
}
}
+/*
+ * Get the current RC-Mode (for selected encoder)
+ */
+int MainWindow::getCurrentRCMode(int encoder)
+{
+ int mode = -1;
+
+ switch(encoder)
+ {
+ case SettingsModel::MP3Encoder:
+ mode = m_settings->compressionRCModeLAME();
+ break;
+ case SettingsModel::VorbisEncoder:
+ mode = m_settings->compressionRCModeOggEnc();
+ break;
+ case SettingsModel::AACEncoder:
+ mode = m_settings->compressionRCModeAacEnc();
+ break;
+ case SettingsModel::AC3Encoder:
+ mode = m_settings->compressionRCModeAften();
+ break;
+ case SettingsModel::FLACEncoder:
+ mode = SettingsModel::VBRMode; /*FLAC has no RC modes*/
+ break;
+ case SettingsModel::OpusEncoder:
+ mode = m_settings->compressionRCModeOpusEnc();
+ break;
+ case SettingsModel::DCAEncoder:
+ mode = SettingsModel::CBRMode; /*DcaEnc has no RC modes*/
+ break;
+ case SettingsModel::PCMEncoder:
+ mode = SettingsModel::CBRMode; /*PCM has no RC modes*/
+ break;
+ default:
+ throw "getCurrentRCMode(): Unknown encoder specified!";
+ break;
+ }
+
+ return mode;
+}
+
+/*
+ * Get the current VBR-Level (for selected encoder)
+ */
+int MainWindow::getCurrentQuality(int encoder)
+{
+ int quality = -1;
+
+ switch(encoder)
+ {
+ case SettingsModel::MP3Encoder:
+ quality = m_settings->compressionVbrLevelLAME();
+ break;
+ case SettingsModel::VorbisEncoder:
+ quality = m_settings->compressionVbrLevelOggEnc();
+ break;
+ case SettingsModel::AACEncoder:
+ quality = m_settings->compressionVbrLevelAacEnc();
+ break;
+ case SettingsModel::AC3Encoder:
+ quality = m_settings->compressionVbrLevelAften();
+ break;
+ case SettingsModel::FLACEncoder:
+ quality = m_settings->compressionVbrLevelFLAC();
+ break;
+ case SettingsModel::OpusEncoder:
+ quality = m_settings->compressionBitrateOpusEnc();
+ break;
+ case SettingsModel::DCAEncoder:
+ quality = 0; /*DcaEnc has no quality level*/
+ break;
+ case SettingsModel::PCMEncoder:
+ quality = 1; /*PCM has no quality level*/
+ break;
+ default:
+ throw "getCurrentVbrLevel(): Unknown encoder specified!";
+ break;
+ }
+
+ return quality;
+}
+
+/*
+ * Get the current Bitrate (for selected encoder)
+ */
+int MainWindow::getCurrentBitrate(int encoder)
+{
+ int bitrate = -1;
+
+ switch(encoder)
+ {
+ case SettingsModel::MP3Encoder:
+ bitrate = m_settings->compressionBitrateLAME();
+ break;
+ case SettingsModel::VorbisEncoder:
+ bitrate = m_settings->compressionBitrateOggEnc();
+ break;
+ case SettingsModel::AACEncoder:
+ bitrate = m_settings->compressionBitrateAacEnc();
+ break;
+ case SettingsModel::AC3Encoder:
+ bitrate = m_settings->compressionBitrateAften();
+ break;
+ case SettingsModel::FLACEncoder:
+ bitrate = 0; /*FLAC has no bitrate*/
+ break;
+ case SettingsModel::OpusEncoder:
+ bitrate = m_settings->compressionBitrateOpusEnc();
+ break;
+ case SettingsModel::DCAEncoder:
+ bitrate = m_settings->compressionBitrateDcaEnc();
+ break;
+ case SettingsModel::PCMEncoder:
+ bitrate = 1; /*PCM has no bitrate*/
+ break;
+ default:
+ throw "getCurrentBitrate(): Unknown encoder specified!";
+ break;
+ }
+
+ return bitrate;
+}
+
////////////////////////////////////////////////////////////
// EVENTS
////////////////////////////////////////////////////////////
@@ -3035,6 +3167,7 @@ void MainWindow::initOutputFolderModel(void)
ui->outputFolderView->header()->hideSection(3);
m_fileSystemModel->setRootPath("");
+ qWarning("Initializing QFileSystemModel to:\n%s\n", m_settings->outputDir().toUtf8().constData());
QModelIndex index = m_fileSystemModel->index(m_settings->outputDir());
if(index.isValid()) ui->outputFolderView->setCurrentIndex(index);
outputFolderViewClicked(ui->outputFolderView->currentIndex());
@@ -3283,58 +3416,46 @@ void MainWindow::updateEncoder(int id)
{
m_settings->compressionEncoder(id);
+ bool bSupportsVBR = false;
+ bool bSupportsABR = false;;
+ bool bSupportsCBR = false;
+ bool bSliderEnabled = false;
+
+ //Set encoder-specific features
switch(m_settings->compressionEncoder())
{
+ case SettingsModel::MP3Encoder:
+ case SettingsModel::AACEncoder:
+ case SettingsModel::OpusEncoder:
+ bSupportsVBR = bSupportsABR = bSupportsCBR = bSliderEnabled = true;
+ break;
case SettingsModel::VorbisEncoder:
- ui->radioButtonModeQuality->setEnabled(true);
- ui->radioButtonModeAverageBitrate->setEnabled(true);
- ui->radioButtonConstBitrate->setEnabled(false);
- if(ui->radioButtonConstBitrate->isChecked()) ui->radioButtonModeQuality->setChecked(true);
- ui->sliderBitrate->setEnabled(true);
+ bSupportsVBR = bSupportsABR = bSliderEnabled = true;
break;
case SettingsModel::AC3Encoder:
- ui->radioButtonModeQuality->setEnabled(true);
- ui->radioButtonModeQuality->setChecked(true);
- ui->radioButtonModeAverageBitrate->setEnabled(false);
- ui->radioButtonConstBitrate->setEnabled(true);
- ui->sliderBitrate->setEnabled(true);
+ bSupportsVBR = bSupportsCBR = bSliderEnabled = true;
break;
case SettingsModel::FLACEncoder:
- ui->radioButtonModeQuality->setEnabled(false);
- ui->radioButtonModeQuality->setChecked(true);
- ui->radioButtonModeAverageBitrate->setEnabled(false);
- ui->radioButtonConstBitrate->setEnabled(false);
- ui->sliderBitrate->setEnabled(true);
- break;
- case SettingsModel::PCMEncoder:
- ui->radioButtonModeQuality->setEnabled(false);
- ui->radioButtonModeQuality->setChecked(true);
- ui->radioButtonModeAverageBitrate->setEnabled(false);
- ui->radioButtonConstBitrate->setEnabled(false);
- ui->sliderBitrate->setEnabled(false);
- break;
- case SettingsModel::AACEncoder:
- ui->radioButtonModeQuality->setEnabled(true);
- ui->radioButtonModeAverageBitrate->setEnabled(!m_fhgEncoderAvailable);
- if(m_fhgEncoderAvailable && ui->radioButtonModeAverageBitrate->isChecked()) ui->radioButtonConstBitrate->setChecked(true);
- ui->radioButtonConstBitrate->setEnabled(true);
- ui->sliderBitrate->setEnabled(true);
+ bSupportsVBR = bSliderEnabled = true;
break;
case SettingsModel::DCAEncoder:
- ui->radioButtonModeQuality->setEnabled(false);
- ui->radioButtonModeAverageBitrate->setEnabled(false);
- ui->radioButtonConstBitrate->setEnabled(true);
- ui->radioButtonConstBitrate->setChecked(true);
- ui->sliderBitrate->setEnabled(true);
+ bSupportsCBR = bSliderEnabled = true;
+ break;
+ case SettingsModel::PCMEncoder:
+ bSupportsCBR = true;
break;
default:
- ui->radioButtonModeQuality->setEnabled(true);
- ui->radioButtonModeAverageBitrate->setEnabled(true);
- ui->radioButtonConstBitrate->setEnabled(true);
- ui->sliderBitrate->setEnabled(true);
+ throw "updateEncoder(): Unknown encoder encountered!";
break;
}
+ //Update UI controls
+ ui->radioButtonModeQuality->setEnabled(bSupportsVBR);
+ ui->radioButtonModeAverageBitrate->setEnabled(bSupportsABR);
+ ui->radioButtonConstBitrate->setEnabled(bSupportsCBR);
+ ui->sliderBitrate->setEnabled(bSliderEnabled);
+
+ //Add AAC info
if(m_settings->compressionEncoder() == SettingsModel::AACEncoder)
{
const QString encoderName = m_qaacEncoderAvailable ? tr("QAAC (Apple)") : (m_fhgEncoderAvailable ? tr("FHG AAC (Winamp)") : (m_neroEncoderAvailable ? tr("Nero AAC") : tr("Not available!")));
@@ -3346,7 +3467,25 @@ void MainWindow::updateEncoder(int id)
ui->labelEncoderInfo->setVisible(false);
}
- updateRCMode(m_modeButtonGroup->checkedId());
+ //Set current RC mode
+ const int currentRCMode = getCurrentRCMode(id);
+ switch(currentRCMode)
+ {
+ case SettingsModel::VBRMode:
+ ui->radioButtonModeQuality->setChecked(true);
+ break;
+ case SettingsModel::ABRMode:
+ ui->radioButtonModeAverageBitrate->setChecked(true);
+ break;
+ case SettingsModel::CBRMode:
+ ui->radioButtonConstBitrate->setChecked(true);
+ break;
+ default:
+ throw "updateEncoder(): Unknown rc-mode encountered!";
+ }
+
+ //Update RC mode!
+ updateRCMode(currentRCMode);
}
/*
@@ -3354,99 +3493,192 @@ void MainWindow::updateEncoder(int id)
*/
void MainWindow::updateRCMode(int id)
{
- m_settings->compressionRCMode(id);
+ int sliderMin = INT_MIN;
+ int sliderMax = INT_MAX;
- switch(m_settings->compressionEncoder())
+ //Update encoder-specific settings
+ const int currentEncoder = m_settings->compressionEncoder();
+ switch(currentEncoder)
{
+ /* -------- MP3Encoder -------- */
case SettingsModel::MP3Encoder:
- switch(m_settings->compressionRCMode())
+ switch(id)
{
case SettingsModel::VBRMode:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(9);
+ sliderMin = 0;
+ sliderMax = 9;
+ break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 0;
+ sliderMax = 13;
break;
default:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(13);
+ throw "updateRCMode(): Unknown rc-mode specified!";
break;
}
+ m_settings->compressionRCModeLAME(id);
break;
+ /* -------- VorbisEncoder -------- */
case SettingsModel::VorbisEncoder:
- switch(m_settings->compressionRCMode())
+ switch(id)
{
case SettingsModel::VBRMode:
- ui->sliderBitrate->setMinimum(-2);
- ui->sliderBitrate->setMaximum(10);
+ sliderMin = -2;
+ sliderMax = 10;
+ break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 4;
+ sliderMax = 63;
break;
default:
- ui->sliderBitrate->setMinimum(4);
- ui->sliderBitrate->setMaximum(63);
- break;
- }
- break;
- case SettingsModel::AC3Encoder:
- switch(m_settings->compressionRCMode())
- {
- case SettingsModel::VBRMode:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(16);
- break;
- default:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(18);
+ throw "updateRCMode(): Unknown rc-mode specified!";
break;
}
+ m_settings->compressionRCModeOggEnc(id);
break;
+ /* -------- AACEncoder -------- */
case SettingsModel::AACEncoder:
- switch(m_settings->compressionRCMode())
+ switch(id)
{
case SettingsModel::VBRMode:
if(m_qaacEncoderAvailable)
{
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(32);
+ sliderMin = 0;
+ sliderMax = 32;
}
else if(m_fhgEncoderAvailable)
{
- ui->sliderBitrate->setMinimum(1);
- ui->sliderBitrate->setMaximum(6);
+ sliderMin = 1;
+ sliderMax = 6;
}
else
{
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(20);
+ sliderMin = 0;
+ sliderMax = 20;
}
break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 4;
+ sliderMax = 63;
+ break;
default:
- ui->sliderBitrate->setMinimum(4);
- ui->sliderBitrate->setMaximum(63);
+ throw "updateRCMode(): Unknown rc-mode specified!";
+ break;
+ }
+ m_settings->compressionRCModeAacEnc(id);
+ break;
+ /* -------- AC3Encoder -------- */
+ case SettingsModel::AC3Encoder:
+ switch(id)
+ {
+ case SettingsModel::VBRMode:
+ sliderMin = 0;
+ sliderMax = 16;
+ break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 0;
+ sliderMax = 18;
+ break;
+ default:
+ throw "updateRCMode(): Unknown rc-mode specified!";
+ break;
+ }
+ m_settings->compressionRCModeAften(id);
+ break;
+ /* -------- FLACEncoder -------- */
+ case SettingsModel::FLACEncoder:
+ switch(id)
+ {
+ case SettingsModel::VBRMode:
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 0;
+ sliderMax = 8;
+ break;
+ default:
+ throw "updateRCMode(): Unknown rc-mode specified!";
break;
}
break;
- case SettingsModel::FLACEncoder:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(8);
- break;
+ /* -------- OpusEncoder -------- */
case SettingsModel::OpusEncoder:
- ui->sliderBitrate->setMinimum(1);
- ui->sliderBitrate->setMaximum(32);
+ switch(id)
+ {
+ case SettingsModel::VBRMode:
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 1;
+ sliderMax = 32;
+ break;
+ default:
+ throw "updateRCMode(): Unknown rc-mode specified!";
+ break;
+ }
+ m_settings->compressionRCModeOpusEnc(id);
break;
+ /* -------- DCAEncoder -------- */
case SettingsModel::DCAEncoder:
- ui->sliderBitrate->setMinimum(1);
- ui->sliderBitrate->setMaximum(128);
+ switch(id)
+ {
+ case SettingsModel::VBRMode:
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 1;
+ sliderMax = 128;
+ break;
+ default:
+ throw "updateRCMode(): Unknown rc-mode specified!";
+ break;
+ }
break;
+ /* -------- PCMEncoder -------- */
case SettingsModel::PCMEncoder:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(2);
- ui->sliderBitrate->setValue(1);
+ switch(id)
+ {
+ case SettingsModel::VBRMode:
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderMin = 0;
+ sliderMax = 2;
+ break;
+ default:
+ throw "updateRCMode(): Unknown rc-mode specified!";
+ break;
+ }
break;
+ /* -------- default -------- */
default:
- ui->sliderBitrate->setMinimum(0);
- ui->sliderBitrate->setMaximum(0);
+ throw "updateRCMode(): Unknown encoder specified!";
break;
}
- updateBitrate(ui->sliderBitrate->value());
+ //Update slider min/max values
+ WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setMinimum, sliderMin);
+ WITH_BLOCKED_SIGNALS(ui->sliderBitrate, setMaximum, sliderMax);
+
+ //Update slider position
+ int currentPosition = INT_MAX;
+ switch(id)
+ {
+ case SettingsModel::VBRMode:
+ currentPosition = getCurrentQuality(currentEncoder);
+ break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ currentPosition = getCurrentBitrate(currentEncoder);
+ break;
+ default:
+ throw "updateRCMode(): Unknown rc-mode specified!";
+ break;
+ }
+
+ //Update bitrate/quality value!
+ ui->sliderBitrate->setValue(currentPosition);
+ updateBitrate(currentPosition);
}
/*
@@ -3454,94 +3686,186 @@ void MainWindow::updateRCMode(int id)
*/
void MainWindow::updateBitrate(int value)
{
- m_settings->compressionBitrate(value);
-
- switch(m_settings->compressionRCMode())
+ //Update encoder-specific settings
+ const int currentEncoder = m_settings->compressionEncoder();
+ const int currentRCMode = getCurrentRCMode(currentEncoder);
+
+ QString sliderText;
+
+ switch(currentEncoder)
{
- case SettingsModel::VBRMode:
- switch(m_settings->compressionEncoder())
+ /* -------- MP3Encoder -------- */
+ case SettingsModel::MP3Encoder:
+ switch(currentRCMode)
{
- case SettingsModel::MP3Encoder:
- ui->labelBitrate->setText(tr("Quality Level %1").arg(9 - value));
+ case SettingsModel::VBRMode:
+ sliderText = tr("Quality Level %1").arg(9 - value);
+ m_settings->compressionVbrLevelLAME(value);
break;
- case SettingsModel::VorbisEncoder:
- ui->labelBitrate->setText(tr("Quality Level %1").arg(value));
+ case SettingsModel::ABRMode:
+ sliderText = QString("≈ %1 kbps").arg(SettingsModel::mp3Bitrates[value]);
+ m_settings->compressionBitrateLAME(value);
break;
- case SettingsModel::AACEncoder:
+ case SettingsModel::CBRMode:
+ sliderText = QString("%1 kbps").arg(SettingsModel::mp3Bitrates[value]);
+ m_settings->compressionBitrateLAME(value);
+ break;
+ default:
+ throw "updateBitrate(): Unknown rc-mode specified!";
+ break;
+ }
+ break;
+ /* -------- VorbisEncoder -------- */
+ case SettingsModel::VorbisEncoder:
+ switch(currentRCMode)
+ {
+ case SettingsModel::VBRMode:
+ sliderText = tr("Quality Level %1").arg(value);
+ m_settings->compressionVbrLevelOggEnc(value);
+ break;
+ case SettingsModel::ABRMode:
+ sliderText = QString("≈ %1 kbps").arg(qMin(500, value * 8));
+ m_settings->compressionBitrateOggEnc(value);
+ break;
+ case SettingsModel::CBRMode:
+ sliderText = QString("%1 kbps").arg(qMin(500, value * 8));
+ m_settings->compressionBitrateOggEnc(value);
+ break;
+ default:
+ throw "updateBitrate(): Unknown rc-mode specified!";
+ break;
+ }
+ break;
+ /* -------- AACEncoder -------- */
+ case SettingsModel::AACEncoder:
+ switch(currentRCMode)
+ {
+ case SettingsModel::VBRMode:
if(m_qaacEncoderAvailable)
{
- ui->labelBitrate->setText(tr("Quality Level %1").arg(QString::number(qBound(0, value * 4 , 127))));
+ sliderText = 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)));
+ sliderText = 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)));
+ sliderText = tr("Quality Level %1").arg(QString().sprintf("%.2f", static_cast(value) / 20.0));
}
+ m_settings->compressionVbrLevelAacEnc(value);
break;
- case SettingsModel::FLACEncoder:
- ui->labelBitrate->setText(tr("Compression %1").arg(value));
+ case SettingsModel::ABRMode:
+ sliderText = QString("≈ %1 kbps").arg(qMin(500, value * 8));
+ m_settings->compressionBitrateAacEnc(value);
break;
- case SettingsModel::OpusEncoder:
- ui->labelBitrate->setText(QString("≈ %1 kbps").arg(qMin(500, value * 8)));
- break;
- case SettingsModel::AC3Encoder:
- ui->labelBitrate->setText(tr("Quality Level %1").arg(qMin(1024, qMax(0, value * 64))));
- break;
- case SettingsModel::PCMEncoder:
- ui->labelBitrate->setText(tr("Uncompressed"));
+ case SettingsModel::CBRMode:
+ sliderText = QString("%1 kbps").arg(qMin(500, value * 8));
+ m_settings->compressionBitrateAacEnc(value);
break;
default:
- ui->labelBitrate->setText(QString::number(value));
+ throw "updateBitrate(): Unknown rc-mode specified!";
break;
}
break;
- case SettingsModel::ABRMode:
- switch(m_settings->compressionEncoder())
+ /* -------- AC3Encoder -------- */
+ case SettingsModel::AC3Encoder:
+ switch(currentRCMode)
{
- case SettingsModel::MP3Encoder:
- ui->labelBitrate->setText(QString("≈ %1 kbps").arg(SettingsModel::mp3Bitrates[value]));
+ case SettingsModel::VBRMode:
+ sliderText = tr("Quality Level %1").arg(qMin(1024, qMax(0, value * 64)));
+ m_settings->compressionVbrLevelAften(value);
break;
- case SettingsModel::FLACEncoder:
- ui->labelBitrate->setText(tr("Compression %1").arg(value));
+ case SettingsModel::ABRMode:
+ sliderText = QString("≈ %1 kbps").arg(SettingsModel::ac3Bitrates[value]);
+ m_settings->compressionBitrateAften(value);
break;
- case SettingsModel::AC3Encoder:
- ui->labelBitrate->setText(QString("≈ %1 kbps").arg(SettingsModel::ac3Bitrates[value]));
- break;
- case SettingsModel::PCMEncoder:
- ui->labelBitrate->setText(tr("Uncompressed"));
+ case SettingsModel::CBRMode:
+ sliderText = QString("%1 kbps").arg(SettingsModel::ac3Bitrates[value]);
+ m_settings->compressionBitrateAften(value);
break;
default:
- ui->labelBitrate->setText(QString("≈ %1 kbps").arg(qMin(500, value * 8)));
+ throw "updateBitrate(): Unknown rc-mode specified!";
break;
}
break;
+ /* -------- FLACEncoder -------- */
+ case SettingsModel::FLACEncoder:
+ switch(currentRCMode)
+ {
+ case SettingsModel::VBRMode:
+ sliderText = tr("Compression %1").arg(value);
+ m_settings->compressionVbrLevelFLAC(value);
+ break;
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ qWarning("FLAC does *not* support ABR or CBR mode!");
+ break;
+ default:
+ throw "updateBitrate(): Unknown rc-mode specified!";
+ break;
+ }
+ break;
+ /* -------- OpusEncoder -------- */
+ case SettingsModel::OpusEncoder:
+ switch(currentRCMode)
+ {
+ case SettingsModel::VBRMode:
+ sliderText = QString("≈ %1 kbps").arg(qMin(500, value * 8));
+ m_settings->compressionBitrateOpusEnc(value);
+ break;
+ case SettingsModel::ABRMode:
+ sliderText = QString("≈ %1 kbps").arg(qMin(500, value * 8));
+ m_settings->compressionBitrateOpusEnc(value);
+ break;
+ case SettingsModel::CBRMode:
+ sliderText = QString("%1 kbps").arg(qMin(500, value * 8));
+ m_settings->compressionBitrateOpusEnc(value);
+ break;
+ default:
+ throw "updateBitrate(): Unknown rc-mode specified!";
+ break;
+ }
+ break;
+ /* -------- DCAEncoder -------- */
+ case SettingsModel::DCAEncoder:
+ switch(currentRCMode)
+ {
+ case SettingsModel::VBRMode:
+ case SettingsModel::ABRMode:
+ qWarning("DcaEnc does *not* support VBR or ABR mode!");
+ break;
+ case SettingsModel::CBRMode:
+ sliderText = QString("%1 kbps").arg(value * 32);
+ m_settings->compressionBitrateDcaEnc(value);
+ break;
+ default:
+ throw "updateBitrate(): Unknown rc-mode specified!";
+ break;
+ }
+ break;
+ /* -------- PCMEncoder -------- */
+ case SettingsModel::PCMEncoder:
+ switch(currentRCMode)
+ {
+ case SettingsModel::VBRMode:
+ case SettingsModel::ABRMode:
+ case SettingsModel::CBRMode:
+ sliderText = tr("Uncompressed");
+ break;
+ default:
+ throw "updateBitrate(): Unknown rc-mode specified!";
+ break;
+ }
+ break;
+ /* -------- default -------- */
default:
- switch(m_settings->compressionEncoder())
- {
- case SettingsModel::MP3Encoder:
- ui->labelBitrate->setText(QString("%1 kbps").arg(SettingsModel::mp3Bitrates[value]));
- break;
- case SettingsModel::FLACEncoder:
- ui->labelBitrate->setText(tr("Compression %1").arg(value));
- break;
- case SettingsModel::AC3Encoder:
- ui->labelBitrate->setText(QString("%1 kbps").arg(SettingsModel::ac3Bitrates[value]));
- break;
- case SettingsModel::DCAEncoder:
- ui->labelBitrate->setText(QString("%1 kbps").arg(value * 32));
- break;
- case SettingsModel::PCMEncoder:
- ui->labelBitrate->setText(tr("Uncompressed"));
- break;
- default:
- ui->labelBitrate->setText(QString("%1 kbps").arg(qMin(500, value * 8)));
- break;
- }
+ throw "updateBitrate(): Unknown encoder specified!";
break;
}
+
+ //Update slider text
+ ui->labelBitrate->setText(sliderText);
}
/*
diff --git a/src/Dialog_MainWindow.h b/src/Dialog_MainWindow.h
index fa1a386a..1be1bc91 100644
--- a/src/Dialog_MainWindow.h
+++ b/src/Dialog_MainWindow.h
@@ -186,6 +186,9 @@ private:
bool checkForUpdates(void);
void initializeTranslation(void);
void refreshFavorites(void);
+ int getCurrentRCMode(int encoder);
+ int getCurrentQuality(int encoder);
+ int getCurrentBitrate(int encoder);
bool m_accepted;
bool m_firstTimeShown;
diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index f7c630bb..e2c66f60 100644
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -121,6 +121,8 @@ while(0)
} \
while(0)
+#define IS_VBR(RC_MODE) ((RC_MODE) == SettingsModel::VBRMode)
+
////////////////////////////////////////////////////////////
//Dummy class for UserData
@@ -945,16 +947,18 @@ void ProcessingDialog::startNextJob(void)
AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
{
+ int rcMode = -1;
AbstractEncoder *encoder = NULL;
*nativeResampling = false;
-
+
switch(m_settings->compressionEncoder())
{
+ /*-------- MP3Encoder /*--------*/
case SettingsModel::MP3Encoder:
{
MP3Encoder *mp3Encoder = new MP3Encoder();
- mp3Encoder->setBitrate(m_settings->compressionBitrate());
- mp3Encoder->setRCMode(m_settings->compressionRCMode());
+ mp3Encoder->setRCMode(rcMode = m_settings->compressionRCModeLAME());
+ mp3Encoder->setBitrate(IS_VBR(rcMode) ? m_settings->compressionVbrLevelLAME() : m_settings->compressionBitrateLAME());
mp3Encoder->setAlgoQuality(m_settings->lameAlgoQuality());
if(m_settings->bitrateManagementEnabled())
{
@@ -970,11 +974,12 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
encoder = mp3Encoder;
}
break;
+ /*-------- VorbisEncoder /*--------*/
case SettingsModel::VorbisEncoder:
{
VorbisEncoder *vorbisEncoder = new VorbisEncoder();
- vorbisEncoder->setBitrate(m_settings->compressionBitrate());
- vorbisEncoder->setRCMode(m_settings->compressionRCMode());
+ vorbisEncoder->setRCMode(rcMode = m_settings->compressionRCModeOggEnc());
+ vorbisEncoder->setBitrate(IS_VBR(rcMode) ? m_settings->compressionVbrLevelOggEnc() : m_settings->compressionBitrateOggEnc());
if(m_settings->bitrateManagementEnabled())
{
vorbisEncoder->setBitrateLimits(m_settings->bitrateManagementMinRate(), m_settings->bitrateManagementMaxRate());
@@ -988,13 +993,14 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
encoder = vorbisEncoder;
}
break;
+ /*-------- AACEncoder /*--------*/
case SettingsModel::AACEncoder:
{
if(lamexp_check_tool("qaac.exe") && lamexp_check_tool("libsoxrate.dll"))
{
QAACEncoder *aacEncoder = new QAACEncoder();
- aacEncoder->setBitrate(m_settings->compressionBitrate());
- aacEncoder->setRCMode(m_settings->compressionRCMode());
+ aacEncoder->setRCMode(rcMode = m_settings->compressionRCModeAacEnc());
+ aacEncoder->setBitrate(IS_VBR(rcMode) ? m_settings->compressionVbrLevelAacEnc() : m_settings->compressionBitrateAacEnc());
aacEncoder->setProfile(m_settings->aacEncProfile());
aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
encoder = aacEncoder;
@@ -1002,8 +1008,8 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
else if(lamexp_check_tool("fhgaacenc.exe") && lamexp_check_tool("enc_fhgaac.dll"))
{
FHGAACEncoder *aacEncoder = new FHGAACEncoder();
- aacEncoder->setBitrate(m_settings->compressionBitrate());
- aacEncoder->setRCMode(m_settings->compressionRCMode());
+ aacEncoder->setRCMode(rcMode = m_settings->compressionRCModeAacEnc());
+ aacEncoder->setBitrate(IS_VBR(rcMode) ? m_settings->compressionVbrLevelAacEnc() : m_settings->compressionBitrateAacEnc());
aacEncoder->setProfile(m_settings->aacEncProfile());
aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
encoder = aacEncoder;
@@ -1011,8 +1017,8 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
else
{
AACEncoder *aacEncoder = new AACEncoder();
- aacEncoder->setBitrate(m_settings->compressionBitrate());
- aacEncoder->setRCMode(m_settings->compressionRCMode());
+ aacEncoder->setRCMode(rcMode = m_settings->compressionRCModeAacEnc());
+ aacEncoder->setBitrate(IS_VBR(rcMode) ? m_settings->compressionVbrLevelAacEnc() : m_settings->compressionBitrateAacEnc());
aacEncoder->setEnable2Pass(m_settings->neroAACEnable2Pass());
aacEncoder->setProfile(m_settings->aacEncProfile());
aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
@@ -1020,11 +1026,12 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
}
}
break;
+ /*-------- AC3Encoder /*--------*/
case SettingsModel::AC3Encoder:
{
AC3Encoder *ac3Encoder = new AC3Encoder();
- ac3Encoder->setBitrate(m_settings->compressionBitrate());
- ac3Encoder->setRCMode(m_settings->compressionRCMode());
+ ac3Encoder->setRCMode(rcMode = m_settings->compressionRCModeAften());
+ ac3Encoder->setBitrate(IS_VBR(rcMode) ? m_settings->compressionVbrLevelAften() : m_settings->compressionBitrateAften());
ac3Encoder->setCustomParams(m_settings->customParametersAften());
ac3Encoder->setAudioCodingMode(m_settings->aftenAudioCodingMode());
ac3Encoder->setDynamicRangeCompression(m_settings->aftenDynamicRangeCompression());
@@ -1033,46 +1040,58 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
encoder = ac3Encoder;
}
break;
+ /*-------- FLACEncoder /*--------*/
case SettingsModel::FLACEncoder:
{
FLACEncoder *flacEncoder = new FLACEncoder();
- flacEncoder->setBitrate(m_settings->compressionBitrate());
- flacEncoder->setRCMode(m_settings->compressionRCMode());
+ flacEncoder->setBitrate(m_settings->compressionVbrLevelFLAC());
+ flacEncoder->setRCMode(SettingsModel::VBRMode);
flacEncoder->setCustomParams(m_settings->customParametersFLAC());
encoder = flacEncoder;
}
break;
+ /*-------- OpusEncoder --------*/
case SettingsModel::OpusEncoder:
{
OpusEncoder *opusEncoder = new OpusEncoder();
- opusEncoder->setBitrate(m_settings->compressionBitrate());
- opusEncoder->setRCMode(m_settings->compressionRCMode());
+ opusEncoder->setRCMode(rcMode = m_settings->compressionRCModeOpusEnc());
+ opusEncoder->setBitrate(m_settings->compressionBitrateOpusEnc()); /*Opus always uses bitrate*/
opusEncoder->setOptimizeFor(m_settings->opusOptimizeFor());
opusEncoder->setEncodeComplexity(m_settings->opusComplexity());
opusEncoder->setFrameSize(m_settings->opusFramesize());
opusEncoder->setCustomParams(m_settings->customParametersOpus());
encoder = opusEncoder;
}
- break; case SettingsModel::DCAEncoder:
+ break;
+ /*-------- DCAEncoder --------*/
+ case SettingsModel::DCAEncoder:
{
DCAEncoder *dcaEncoder = new DCAEncoder();
- dcaEncoder->setBitrate(m_settings->compressionBitrate());
- dcaEncoder->setRCMode(m_settings->compressionRCMode());
+ dcaEncoder->setRCMode(SettingsModel::CBRMode);
+ dcaEncoder->setBitrate(IS_VBR(rcMode) ? 0 : m_settings->compressionBitrateDcaEnc());
encoder = dcaEncoder;
}
break;
+ /*-------- PCMEncoder --------*/
case SettingsModel::PCMEncoder:
{
WaveEncoder *waveEncoder = new WaveEncoder();
- waveEncoder->setBitrate(m_settings->compressionBitrate());
- waveEncoder->setRCMode(m_settings->compressionRCMode());
+ waveEncoder->setBitrate(0); /*does NOT apply to PCM output*/
+ waveEncoder->setRCMode(0); /*does NOT apply to PCM output*/
encoder = waveEncoder;
}
break;
+ /*-------- default --------*/
default:
throw "Unsupported encoder!";
}
+ //Sanity checking
+ if(!encoder)
+ {
+ throw "No encoder instance has been assigend!";
+ }
+
return encoder;
}
diff --git a/src/Encoder_Abstract.h b/src/Encoder_Abstract.h
index 6bb3690b..20ea0af7 100644
--- a/src/Encoder_Abstract.h
+++ b/src/Encoder_Abstract.h
@@ -46,14 +46,14 @@ public:
virtual const bool needsTimingInfo(void);
//Common setter methods
- void setBitrate(int bitrate);
- void setRCMode(int mode);
- void setCustomParams(const QString &customParams);
+ virtual void setBitrate(int bitrate);
+ virtual void setRCMode(int mode);
+ virtual void setCustomParams(const QString &customParams);
protected:
- int m_configBitrate;
- int m_configRCMode;
- QString m_configCustomParams;
+ int m_configBitrate; //Bitrate *or* VBR-quality-level
+ int m_configRCMode; //Rate-control mode
+ QString m_configCustomParams; //Custom parameters, if any
//Helper functions
bool isUnicode(const QString &text);
diff --git a/src/Encoder_Vorbis.cpp b/src/Encoder_Vorbis.cpp
index 42f21c5c..dcf669ff 100644
--- a/src/Encoder_Vorbis.cpp
+++ b/src/Encoder_Vorbis.cpp
@@ -158,6 +158,11 @@ bool VorbisEncoder::encode(const QString &sourceFile, const AudioFileModel &meta
return true;
}
+void VorbisEncoder::setBitrate(int bitrate)
+{
+ m_configBitrate = qMax(-2, bitrate);
+}
+
QString VorbisEncoder::extension(void)
{
return "ogg";
diff --git a/src/Encoder_Vorbis.h b/src/Encoder_Vorbis.h
index 102d5476..eb97e930 100644
--- a/src/Encoder_Vorbis.h
+++ b/src/Encoder_Vorbis.h
@@ -38,6 +38,7 @@ public:
virtual QString extension(void);
virtual void setBitrateLimits(int minimumBitrate, int maximumBitrate);
virtual void setSamplingRate(int value);
+ virtual void setBitrate(int bitrate);
private:
const QString m_binary;
diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index 4340784b..23d9244b 100644
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -68,66 +68,80 @@ unsigned int SettingsModel::OPT##Default(void) { return DEF; }
////////////////////////////////////////////////////////////
//Setting ID's
-LAMEXP_MAKE_ID(versionNumber, "VersionNumber");
-LAMEXP_MAKE_ID(licenseAccepted, "LicenseAccepted");
-LAMEXP_MAKE_ID(interfaceStyle, "InterfaceStyle");
-LAMEXP_MAKE_ID(compressionEncoder, "Compression/Encoder");
-LAMEXP_MAKE_ID(compressionRCMode, "Compression/RCMode");
-LAMEXP_MAKE_ID(compressionBitrate, "Compression/Bitrate");
-LAMEXP_MAKE_ID(outputDir, "OutputDirectory/SelectedPath");
-LAMEXP_MAKE_ID(outputToSourceDir, "OutputDirectory/OutputToSourceFolder");
-LAMEXP_MAKE_ID(prependRelativeSourcePath, "OutputDirectory/PrependRelativeSourcePath");
-LAMEXP_MAKE_ID(favoriteOutputFolders, "OutputDirectory/Favorites");
-LAMEXP_MAKE_ID(mostRecentInputPath, "InputDirectory/MostRecentPath");
-LAMEXP_MAKE_ID(writeMetaTags, "Flags/WriteMetaTags");
-LAMEXP_MAKE_ID(createPlaylist, "Flags/AutoCreatePlaylist");
-LAMEXP_MAKE_ID(autoUpdateLastCheck, "AutoUpdate/LastCheck");
-LAMEXP_MAKE_ID(autoUpdateEnabled, "AutoUpdate/Enabled");
-LAMEXP_MAKE_ID(autoUpdateCheckBeta, "AutoUpdate/CheckForBetaVersions");
-LAMEXP_MAKE_ID(soundsEnabled, "Flags/EnableSounds");
-LAMEXP_MAKE_ID(neroAacNotificationsEnabled, "Flags/EnableNeroAacNotifications");
-LAMEXP_MAKE_ID(antivirNotificationsEnabled, "Flags/EnableAntivirusNotifications");
-LAMEXP_MAKE_ID(dropBoxWidgetEnabled, "Flags/EnableDropBoxWidget");
-LAMEXP_MAKE_ID(shellIntegrationEnabled, "Flags/EnableShellIntegration");
-LAMEXP_MAKE_ID(currentLanguage, "Localization/Language");
-LAMEXP_MAKE_ID(currentLanguageFile, "Localization/UseQMFile");
-LAMEXP_MAKE_ID(lameAlgoQuality, "AdvancedOptions/LAME/AlgorithmQuality");
-LAMEXP_MAKE_ID(lameChannelMode, "AdvancedOptions/LAME/ChannelMode");
-LAMEXP_MAKE_ID(forceStereoDownmix, "AdvancedOptions/StereoDownmix/Force");
-LAMEXP_MAKE_ID(bitrateManagementEnabled, "AdvancedOptions/BitrateManagement/Enabled");
-LAMEXP_MAKE_ID(bitrateManagementMinRate, "AdvancedOptions/BitrateManagement/MinRate");
-LAMEXP_MAKE_ID(bitrateManagementMaxRate, "AdvancedOptions/BitrateManagement/MaxRate");
+LAMEXP_MAKE_ID(aacEncProfile, "AdvancedOptions/AACEnc/ForceProfile");
LAMEXP_MAKE_ID(aftenAudioCodingMode, "AdvancedOptions/Aften/AudioCodingMode");
LAMEXP_MAKE_ID(aftenDynamicRangeCompression, "AdvancedOptions/Aften/DynamicRangeCompression");
-LAMEXP_MAKE_ID(aftenFastBitAllocation, "AdvancedOptions/Aften/FastBitAllocation");
LAMEXP_MAKE_ID(aftenExponentSearchSize, "AdvancedOptions/Aften/ExponentSearchSize");
-LAMEXP_MAKE_ID(samplingRate, "AdvancedOptions/Common/Resampling");
-LAMEXP_MAKE_ID(neroAACEnable2Pass, "AdvancedOptions/AACEnc/Enable2Pass");
-LAMEXP_MAKE_ID(aacEncProfile, "AdvancedOptions/AACEnc/ForceProfile");
-LAMEXP_MAKE_ID(opusOptimizeFor, "AdvancedOptions/Opus/OptimizeForSignalType");
-LAMEXP_MAKE_ID(opusComplexity, "AdvancedOptions/Opus/EncodingComplexity");
-LAMEXP_MAKE_ID(opusFramesize, "AdvancedOptions/Opus/FrameSize");
-LAMEXP_MAKE_ID(opusDisableResample, "AdvancedOptions/Opus/DisableResample");
-LAMEXP_MAKE_ID(normalizationFilterEnabled, "AdvancedOptions/VolumeNormalization/Enabled");
-LAMEXP_MAKE_ID(normalizationFilterMaxVolume, "AdvancedOptions/VolumeNormalization/MaxVolume");
-LAMEXP_MAKE_ID(normalizationFilterEqualizationMode, "AdvancedOptions/VolumeNormalization/EqualizationMode");
-LAMEXP_MAKE_ID(toneAdjustBass, "AdvancedOptions/ToneAdjustment/Bass");
-LAMEXP_MAKE_ID(toneAdjustTreble, "AdvancedOptions/ToneAdjustment/Treble");
-LAMEXP_MAKE_ID(customParametersLAME, "AdvancedOptions/CustomParameters/LAME");
-LAMEXP_MAKE_ID(customParametersOggEnc, "AdvancedOptions/CustomParameters/OggEnc");
+LAMEXP_MAKE_ID(aftenFastBitAllocation, "AdvancedOptions/Aften/FastBitAllocation");
+LAMEXP_MAKE_ID(antivirNotificationsEnabled, "Flags/EnableAntivirusNotifications");
+LAMEXP_MAKE_ID(autoUpdateCheckBeta, "AutoUpdate/CheckForBetaVersions");
+LAMEXP_MAKE_ID(autoUpdateEnabled, "AutoUpdate/Enabled");
+LAMEXP_MAKE_ID(autoUpdateLastCheck, "AutoUpdate/LastCheck");
+LAMEXP_MAKE_ID(bitrateManagementEnabled, "AdvancedOptions/BitrateManagement/Enabled");
+LAMEXP_MAKE_ID(bitrateManagementMaxRate, "AdvancedOptions/BitrateManagement/MaxRate");
+LAMEXP_MAKE_ID(bitrateManagementMinRate, "AdvancedOptions/BitrateManagement/MinRate");
+LAMEXP_MAKE_ID(compressionBitrateAacEnc, "Compression/Bitrate/AacEnc");
+LAMEXP_MAKE_ID(compressionBitrateAften, "Compression/Bitrate/Aften");
+LAMEXP_MAKE_ID(compressionBitrateDcaEnc, "Compression/Bitrate/DcaEnc");
+LAMEXP_MAKE_ID(compressionBitrateLAME, "Compression/Bitrate/LAME");
+LAMEXP_MAKE_ID(compressionBitrateOggEnc, "Compression/Bitrate/OggEnc");
+LAMEXP_MAKE_ID(compressionBitrateOpusEnc, "Compression/Bitrate/OpusEnc");
+LAMEXP_MAKE_ID(compressionEncoder, "Compression/Encoder");
+LAMEXP_MAKE_ID(compressionRCModeAacEnc, "Compression/RCMode/AacEnc");
+LAMEXP_MAKE_ID(compressionRCModeAften, "Compression/RCMode/Aften");
+LAMEXP_MAKE_ID(compressionRCModeLAME, "Compression/RCMode/LAME");
+LAMEXP_MAKE_ID(compressionRCModeOggEnc, "Compression/RCMode/OggEnc");
+LAMEXP_MAKE_ID(compressionRCModeOpusEnc, "Compression/RCMode/OpusEnc");
+LAMEXP_MAKE_ID(compressionVbrLevelAacEnc, "Compression/VbrLevel/AacEnc");
+LAMEXP_MAKE_ID(compressionVbrLevelAften, "Compression/VbrLevel/Aften");
+LAMEXP_MAKE_ID(compressionVbrLevelFLAC, "Compression/VbrLevel/FLAC");
+LAMEXP_MAKE_ID(compressionVbrLevelLAME, "Compression/VbrLevel/LAME");
+LAMEXP_MAKE_ID(compressionVbrLevelOggEnc, "Compression/VbrLevel/OggEnc");
+LAMEXP_MAKE_ID(createPlaylist, "Flags/AutoCreatePlaylist");
+LAMEXP_MAKE_ID(currentLanguage, "Localization/Language");
+LAMEXP_MAKE_ID(currentLanguageFile, "Localization/UseQMFile");
LAMEXP_MAKE_ID(customParametersAacEnc, "AdvancedOptions/CustomParameters/AacEnc");
LAMEXP_MAKE_ID(customParametersAften, "AdvancedOptions/CustomParameters/Aften");
LAMEXP_MAKE_ID(customParametersFLAC, "AdvancedOptions/CustomParameters/FLAC");
+LAMEXP_MAKE_ID(customParametersLAME, "AdvancedOptions/CustomParameters/LAME");
+LAMEXP_MAKE_ID(customParametersOggEnc, "AdvancedOptions/CustomParameters/OggEnc");
LAMEXP_MAKE_ID(customParametersOpus, "AdvancedOptions/CustomParameters/OpusEnc");
-LAMEXP_MAKE_ID(renameOutputFilesEnabled, "AdvancedOptions/RenameOutputFiles/Enabled");
-LAMEXP_MAKE_ID(renameOutputFilesPattern, "AdvancedOptions/RenameOutputFiles/Pattern");
-LAMEXP_MAKE_ID(overwriteMode, "AdvancedOptions/OverwriteMode");
-LAMEXP_MAKE_ID(hibernateComputer, "AdvancedOptions/HibernateComputerOnShutdown");
-LAMEXP_MAKE_ID(metaInfoPosition, "MetaInformation/PlaylistPosition");
-LAMEXP_MAKE_ID(maximumInstances, "AdvancedOptions/Threading/MaximumInstances");
LAMEXP_MAKE_ID(customTempPath, "AdvancedOptions/TempDirectory/CustomPath");
LAMEXP_MAKE_ID(customTempPathEnabled, "AdvancedOptions/TempDirectory/UseCustomPath");
+LAMEXP_MAKE_ID(dropBoxWidgetEnabled, "Flags/EnableDropBoxWidget");
+LAMEXP_MAKE_ID(favoriteOutputFolders, "OutputDirectory/Favorites");
+LAMEXP_MAKE_ID(forceStereoDownmix, "AdvancedOptions/StereoDownmix/Force");
+LAMEXP_MAKE_ID(hibernateComputer, "AdvancedOptions/HibernateComputerOnShutdown");
+LAMEXP_MAKE_ID(interfaceStyle, "InterfaceStyle");
+LAMEXP_MAKE_ID(lameAlgoQuality, "AdvancedOptions/LAME/AlgorithmQuality");
+LAMEXP_MAKE_ID(lameChannelMode, "AdvancedOptions/LAME/ChannelMode");
+LAMEXP_MAKE_ID(licenseAccepted, "LicenseAccepted");
+LAMEXP_MAKE_ID(maximumInstances, "AdvancedOptions/Threading/MaximumInstances");
+LAMEXP_MAKE_ID(metaInfoPosition, "MetaInformation/PlaylistPosition");
+LAMEXP_MAKE_ID(mostRecentInputPath, "InputDirectory/MostRecentPath");
+LAMEXP_MAKE_ID(neroAACEnable2Pass, "AdvancedOptions/AACEnc/Enable2Pass");
+LAMEXP_MAKE_ID(neroAacNotificationsEnabled, "Flags/EnableNeroAacNotifications");
+LAMEXP_MAKE_ID(normalizationFilterEnabled, "AdvancedOptions/VolumeNormalization/Enabled");
+LAMEXP_MAKE_ID(normalizationFilterEqualizationMode, "AdvancedOptions/VolumeNormalization/EqualizationMode");
+LAMEXP_MAKE_ID(normalizationFilterMaxVolume, "AdvancedOptions/VolumeNormalization/MaxVolume");
+LAMEXP_MAKE_ID(opusComplexity, "AdvancedOptions/Opus/EncodingComplexity");
+LAMEXP_MAKE_ID(opusDisableResample, "AdvancedOptions/Opus/DisableResample");
+LAMEXP_MAKE_ID(opusFramesize, "AdvancedOptions/Opus/FrameSize");
+LAMEXP_MAKE_ID(opusOptimizeFor, "AdvancedOptions/Opus/OptimizeForSignalType");
+LAMEXP_MAKE_ID(outputDir, "OutputDirectory/SelectedPath");
+LAMEXP_MAKE_ID(outputToSourceDir, "OutputDirectory/OutputToSourceFolder");
+LAMEXP_MAKE_ID(overwriteMode, "AdvancedOptions/OverwriteMode");
+LAMEXP_MAKE_ID(prependRelativeSourcePath, "OutputDirectory/PrependRelativeSourcePath");
+LAMEXP_MAKE_ID(renameOutputFilesEnabled, "AdvancedOptions/RenameOutputFiles/Enabled");
+LAMEXP_MAKE_ID(renameOutputFilesPattern, "AdvancedOptions/RenameOutputFiles/Pattern");
+LAMEXP_MAKE_ID(samplingRate, "AdvancedOptions/Common/Resampling");
+LAMEXP_MAKE_ID(shellIntegrationEnabled, "Flags/EnableShellIntegration");
LAMEXP_MAKE_ID(slowStartup, "Flags/SlowStartupDetected");
+LAMEXP_MAKE_ID(soundsEnabled, "Flags/EnableSounds");
+LAMEXP_MAKE_ID(toneAdjustBass, "AdvancedOptions/ToneAdjustment/Bass");
+LAMEXP_MAKE_ID(toneAdjustTreble, "AdvancedOptions/ToneAdjustment/Treble");
+LAMEXP_MAKE_ID(versionNumber, "VersionNumber");
+LAMEXP_MAKE_ID(writeMetaTags, "Flags/WriteMetaTags");
//LUT
const int SettingsModel::mp3Bitrates[15] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1};
@@ -199,6 +213,14 @@ SettingsModel::SettingsModel(void)
m_settings->beginGroup(groupKey);
m_settings->setValue(g_settingsId_versionNumber, QApplication::applicationVersion());
m_settings->sync();
+
+ const bool isDefined = m_settings->contains(g_settingsId_outputDir);
+ qWarning("Value '%s' is currently: %s\n", g_settingsId_outputDir, (isDefined ? "defined" : "un-defined"));
+ if(isDefined)
+ {
+ qWarning("It's value is:\n%s\n", m_settings->value(g_settingsId_outputDir).toString().toUtf8().constData());
+ }
+ qWarning("Current output directory is:\n%s\n", outputDir().toUtf8().constData());
}
////////////////////////////////////////////////////////////
@@ -215,17 +237,27 @@ SettingsModel::~SettingsModel(void)
// Public Functions
////////////////////////////////////////////////////////////
+#define CHECK_RCMODE(NAME) do\
+{ \
+ if(this->compressionRCMode##NAME() < SettingsModel::VBRMode || this->compressionRCMode##NAME() >= SettingsModel::RCMODE_COUNT) \
+ { \
+ this->compressionRCMode##NAME(SettingsModel::VBRMode); \
+ } \
+} \
+while(0)
+
void SettingsModel::validate(void)
{
- if(this->compressionEncoder() < SettingsModel::MP3Encoder || this->compressionEncoder() > SettingsModel::PCMEncoder)
+ if(this->compressionEncoder() < SettingsModel::MP3Encoder || this->compressionEncoder() >= SettingsModel::ENCODER_COUNT)
{
this->compressionEncoder(SettingsModel::MP3Encoder);
}
- if(this->compressionRCMode() < SettingsModel::VBRMode || this->compressionRCMode() > SettingsModel::CBRMode)
- {
- this->compressionEncoder(SettingsModel::VBRMode);
- }
+ CHECK_RCMODE(LAME);
+ CHECK_RCMODE(OggEnc);
+ CHECK_RCMODE(AacEnc);
+ CHECK_RCMODE(Aften);
+ CHECK_RCMODE(OpusEnc);
if(!(lamexp_check_tool("neroAacEnc.exe") && lamexp_check_tool("neroAacDec.exe") && lamexp_check_tool("neroAacTag.exe")))
{
@@ -244,6 +276,7 @@ void SettingsModel::validate(void)
if(this->outputDir().isEmpty() || !QFileInfo(this->outputDir()).isDir())
{
+ qWarning("Output directory not set yet or does NOT exist anymore -> Resetting to QDesktopServices::MusicLocation");
QString musicLocation = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
this->outputDir(musicLocation.isEmpty() ? QDesktopServices::storageLocation(QDesktopServices::HomeLocation) : musicLocation);
}
@@ -383,62 +416,76 @@ QString SettingsModel::initDirectory(const QString &path)
// Getter and Setter
////////////////////////////////////////////////////////////
-LAMEXP_MAKE_OPTION_I(licenseAccepted, 0)
-LAMEXP_MAKE_OPTION_I(interfaceStyle, 0)
-LAMEXP_MAKE_OPTION_I(compressionEncoder, 0)
-LAMEXP_MAKE_OPTION_I(compressionRCMode, 0)
-LAMEXP_MAKE_OPTION_I(compressionBitrate, 7)
-LAMEXP_MAKE_OPTION_S(outputDir, QDesktopServices::storageLocation(QDesktopServices::MusicLocation))
-LAMEXP_MAKE_OPTION_B(outputToSourceDir, false)
-LAMEXP_MAKE_OPTION_B(prependRelativeSourcePath, false)
-LAMEXP_MAKE_OPTION_S(favoriteOutputFolders, QString());
-LAMEXP_MAKE_OPTION_B(writeMetaTags, true)
-LAMEXP_MAKE_OPTION_B(createPlaylist, true)
-LAMEXP_MAKE_OPTION_S(autoUpdateLastCheck, "Never")
-LAMEXP_MAKE_OPTION_B(autoUpdateEnabled, true)
-LAMEXP_MAKE_OPTION_B(autoUpdateCheckBeta, false)
-LAMEXP_MAKE_OPTION_B(soundsEnabled, true)
-LAMEXP_MAKE_OPTION_B(neroAacNotificationsEnabled, true)
+LAMEXP_MAKE_OPTION_I(aacEncProfile, 0)
+LAMEXP_MAKE_OPTION_I(aftenAudioCodingMode, 0)
+LAMEXP_MAKE_OPTION_I(aftenDynamicRangeCompression, 5)
+LAMEXP_MAKE_OPTION_I(aftenExponentSearchSize, 8)
+LAMEXP_MAKE_OPTION_B(aftenFastBitAllocation, false)
LAMEXP_MAKE_OPTION_B(antivirNotificationsEnabled, true)
-LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled, true)
-LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled, !lamexp_portable_mode())
+LAMEXP_MAKE_OPTION_B(autoUpdateCheckBeta, false)
+LAMEXP_MAKE_OPTION_B(autoUpdateEnabled, true)
+LAMEXP_MAKE_OPTION_S(autoUpdateLastCheck, "Never")
+LAMEXP_MAKE_OPTION_B(bitrateManagementEnabled, false)
+LAMEXP_MAKE_OPTION_I(bitrateManagementMaxRate, 500)
+LAMEXP_MAKE_OPTION_I(bitrateManagementMinRate, 32)
+LAMEXP_MAKE_OPTION_I(compressionBitrateAacEnc, 20)
+LAMEXP_MAKE_OPTION_I(compressionBitrateAften, 15)
+LAMEXP_MAKE_OPTION_I(compressionBitrateDcaEnc, 47)
+LAMEXP_MAKE_OPTION_I(compressionBitrateLAME, 10)
+LAMEXP_MAKE_OPTION_I(compressionBitrateOggEnc, 20)
+LAMEXP_MAKE_OPTION_I(compressionBitrateOpusEnc, 16)
+LAMEXP_MAKE_OPTION_I(compressionEncoder, 0)
+LAMEXP_MAKE_OPTION_I(compressionRCModeAacEnc, 0)
+LAMEXP_MAKE_OPTION_I(compressionRCModeAften, 0)
+LAMEXP_MAKE_OPTION_I(compressionRCModeLAME, 0)
+LAMEXP_MAKE_OPTION_I(compressionRCModeOggEnc, 0)
+LAMEXP_MAKE_OPTION_I(compressionRCModeOpusEnc, 0)
+LAMEXP_MAKE_OPTION_I(compressionVbrLevelAacEnc, 10)
+LAMEXP_MAKE_OPTION_I(compressionVbrLevelAften, 8)
+LAMEXP_MAKE_OPTION_I(compressionVbrLevelFLAC, 8)
+LAMEXP_MAKE_OPTION_I(compressionVbrLevelLAME, 7)
+LAMEXP_MAKE_OPTION_I(compressionVbrLevelOggEnc, 5)
+LAMEXP_MAKE_OPTION_B(createPlaylist, true)
LAMEXP_MAKE_OPTION_S(currentLanguage, defaultLanguage())
LAMEXP_MAKE_OPTION_S(currentLanguageFile, QString())
+LAMEXP_MAKE_OPTION_S(customParametersAacEnc, QString())
+LAMEXP_MAKE_OPTION_S(customParametersAften, QString())
+LAMEXP_MAKE_OPTION_S(customParametersFLAC, QString())
+LAMEXP_MAKE_OPTION_S(customParametersLAME, QString())
+LAMEXP_MAKE_OPTION_S(customParametersOggEnc, QString())
+LAMEXP_MAKE_OPTION_S(customParametersOpus, QString())
+LAMEXP_MAKE_OPTION_S(customTempPath, QDesktopServices::storageLocation(QDesktopServices::TempLocation))
+LAMEXP_MAKE_OPTION_B(customTempPathEnabled, false)
+LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled, true)
+LAMEXP_MAKE_OPTION_S(favoriteOutputFolders, QString())
+LAMEXP_MAKE_OPTION_B(forceStereoDownmix, false)
+LAMEXP_MAKE_OPTION_B(hibernateComputer, false)
+LAMEXP_MAKE_OPTION_I(interfaceStyle, 0)
LAMEXP_MAKE_OPTION_I(lameAlgoQuality, 2)
LAMEXP_MAKE_OPTION_I(lameChannelMode, 0)
-LAMEXP_MAKE_OPTION_B(forceStereoDownmix, false)
-LAMEXP_MAKE_OPTION_B(bitrateManagementEnabled, false)
-LAMEXP_MAKE_OPTION_I(bitrateManagementMinRate, 32)
-LAMEXP_MAKE_OPTION_I(bitrateManagementMaxRate, 500)
-LAMEXP_MAKE_OPTION_I(samplingRate, 0)
+LAMEXP_MAKE_OPTION_I(licenseAccepted, 0)
+LAMEXP_MAKE_OPTION_U(maximumInstances, 0)
+LAMEXP_MAKE_OPTION_U(metaInfoPosition, UINT_MAX)
+LAMEXP_MAKE_OPTION_S(mostRecentInputPath, QDesktopServices::storageLocation(QDesktopServices::MusicLocation))
LAMEXP_MAKE_OPTION_B(neroAACEnable2Pass, true)
-LAMEXP_MAKE_OPTION_I(aacEncProfile, 0)
-LAMEXP_MAKE_OPTION_I(aftenAudioCodingMode, 0);
-LAMEXP_MAKE_OPTION_I(aftenDynamicRangeCompression, 5);
-LAMEXP_MAKE_OPTION_B(aftenFastBitAllocation, false);
-LAMEXP_MAKE_OPTION_I(aftenExponentSearchSize, 8);
-LAMEXP_MAKE_OPTION_I(opusOptimizeFor, 0);
-LAMEXP_MAKE_OPTION_I(opusComplexity, 10);
-LAMEXP_MAKE_OPTION_I(opusFramesize, 3);
-LAMEXP_MAKE_OPTION_B(opusDisableResample, false);
+LAMEXP_MAKE_OPTION_B(neroAacNotificationsEnabled, true)
LAMEXP_MAKE_OPTION_B(normalizationFilterEnabled, false)
+LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode, 0)
LAMEXP_MAKE_OPTION_I(normalizationFilterMaxVolume, -50)
-LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode, 0);
+LAMEXP_MAKE_OPTION_I(opusComplexity, 10)
+LAMEXP_MAKE_OPTION_B(opusDisableResample, false)
+LAMEXP_MAKE_OPTION_I(opusFramesize, 3)
+LAMEXP_MAKE_OPTION_I(opusOptimizeFor, 0)
+LAMEXP_MAKE_OPTION_S(outputDir, QDesktopServices::storageLocation(QDesktopServices::MusicLocation))
+LAMEXP_MAKE_OPTION_B(outputToSourceDir, false)
+LAMEXP_MAKE_OPTION_I(overwriteMode, Overwrite_KeepBoth)
+LAMEXP_MAKE_OPTION_B(prependRelativeSourcePath, false)
+LAMEXP_MAKE_OPTION_B(renameOutputFilesEnabled, false)
+LAMEXP_MAKE_OPTION_S(renameOutputFilesPattern, "[] - ")
+LAMEXP_MAKE_OPTION_I(samplingRate, 0)
+LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled, !lamexp_portable_mode())
+LAMEXP_MAKE_OPTION_B(slowStartup, false)
+LAMEXP_MAKE_OPTION_B(soundsEnabled, true)
LAMEXP_MAKE_OPTION_I(toneAdjustBass, 0)
LAMEXP_MAKE_OPTION_I(toneAdjustTreble, 0)
-LAMEXP_MAKE_OPTION_S(customParametersLAME, QString());
-LAMEXP_MAKE_OPTION_S(customParametersOggEnc, QString());
-LAMEXP_MAKE_OPTION_S(customParametersAacEnc, QString());
-LAMEXP_MAKE_OPTION_S(customParametersAften, QString());
-LAMEXP_MAKE_OPTION_S(customParametersFLAC, QString());
-LAMEXP_MAKE_OPTION_S(customParametersOpus, QString());
-LAMEXP_MAKE_OPTION_B(renameOutputFilesEnabled, false);
-LAMEXP_MAKE_OPTION_S(renameOutputFilesPattern, "[<TrackNo>] <Artist> - <Title>");
-LAMEXP_MAKE_OPTION_I(overwriteMode, Overwrite_KeepBoth);
-LAMEXP_MAKE_OPTION_U(metaInfoPosition, UINT_MAX);
-LAMEXP_MAKE_OPTION_U(maximumInstances, 0);
-LAMEXP_MAKE_OPTION_S(customTempPath, QDesktopServices::storageLocation(QDesktopServices::TempLocation));
-LAMEXP_MAKE_OPTION_B(customTempPathEnabled, false);
-LAMEXP_MAKE_OPTION_B(slowStartup, false);
-LAMEXP_MAKE_OPTION_S(mostRecentInputPath, QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
-LAMEXP_MAKE_OPTION_B(hibernateComputer, false);
+LAMEXP_MAKE_OPTION_B(writeMetaTags, true)
diff --git a/src/Model_Settings.h b/src/Model_Settings.h
index 95ce3ddf..fc756d8d 100644
--- a/src/Model_Settings.h
+++ b/src/Model_Settings.h
@@ -64,14 +64,18 @@ public:
FLACEncoder = 4,
OpusEncoder = 5,
DCAEncoder = 6,
- PCMEncoder = 7
+ PCMEncoder = 7,
+ ENCODER_COUNT = 8
};
+
enum RCMode
{
VBRMode = 0,
ABRMode = 1,
- CBRMode = 2
+ CBRMode = 2,
+ RCMODE_COUNT = 3
};
+
enum Overwrite
{
Overwrite_KeepBoth = 0,
@@ -85,65 +89,79 @@ public:
static const int samplingRates[8];
//Getters & setters
- LAMEXP_MAKE_OPTION_I(licenseAccepted);
- LAMEXP_MAKE_OPTION_I(interfaceStyle);
- LAMEXP_MAKE_OPTION_I(compressionEncoder);
- LAMEXP_MAKE_OPTION_I(compressionRCMode);
- LAMEXP_MAKE_OPTION_I(compressionBitrate);
- LAMEXP_MAKE_OPTION_S(outputDir);
- LAMEXP_MAKE_OPTION_B(outputToSourceDir);
- LAMEXP_MAKE_OPTION_B(prependRelativeSourcePath);
- LAMEXP_MAKE_OPTION_S(favoriteOutputFolders);
- LAMEXP_MAKE_OPTION_B(writeMetaTags);
- LAMEXP_MAKE_OPTION_B(createPlaylist);
- LAMEXP_MAKE_OPTION_S(autoUpdateLastCheck);
- LAMEXP_MAKE_OPTION_B(autoUpdateEnabled);
- LAMEXP_MAKE_OPTION_B(autoUpdateCheckBeta);
- LAMEXP_MAKE_OPTION_B(soundsEnabled);
- LAMEXP_MAKE_OPTION_B(neroAacNotificationsEnabled);
- LAMEXP_MAKE_OPTION_B(antivirNotificationsEnabled);
- LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled);
- LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled);
- LAMEXP_MAKE_OPTION_S(currentLanguage);
- LAMEXP_MAKE_OPTION_S(currentLanguageFile);
- LAMEXP_MAKE_OPTION_I(lameAlgoQuality);
- LAMEXP_MAKE_OPTION_I(lameChannelMode);
- LAMEXP_MAKE_OPTION_B(forceStereoDownmix);
- LAMEXP_MAKE_OPTION_B(bitrateManagementEnabled);
- LAMEXP_MAKE_OPTION_I(bitrateManagementMinRate);
- LAMEXP_MAKE_OPTION_I(bitrateManagementMaxRate);
- LAMEXP_MAKE_OPTION_I(samplingRate);
- LAMEXP_MAKE_OPTION_B(neroAACEnable2Pass);
- LAMEXP_MAKE_OPTION_I(aacEncProfile);
- LAMEXP_MAKE_OPTION_I(aftenAudioCodingMode);
- LAMEXP_MAKE_OPTION_I(aftenDynamicRangeCompression);
- LAMEXP_MAKE_OPTION_B(aftenFastBitAllocation);
- LAMEXP_MAKE_OPTION_I(aftenExponentSearchSize);
- LAMEXP_MAKE_OPTION_I(opusOptimizeFor);
- LAMEXP_MAKE_OPTION_I(opusComplexity);
- LAMEXP_MAKE_OPTION_I(opusFramesize);
- LAMEXP_MAKE_OPTION_B(opusDisableResample);
- LAMEXP_MAKE_OPTION_B(normalizationFilterEnabled);
- LAMEXP_MAKE_OPTION_I(normalizationFilterMaxVolume);
- LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode);
- LAMEXP_MAKE_OPTION_I(toneAdjustBass);
- LAMEXP_MAKE_OPTION_I(toneAdjustTreble);
- LAMEXP_MAKE_OPTION_S(customParametersLAME);
- LAMEXP_MAKE_OPTION_S(customParametersOggEnc);
- LAMEXP_MAKE_OPTION_S(customParametersAacEnc);
- LAMEXP_MAKE_OPTION_S(customParametersAften);
- LAMEXP_MAKE_OPTION_S(customParametersFLAC);
- LAMEXP_MAKE_OPTION_S(customParametersOpus);
- LAMEXP_MAKE_OPTION_B(renameOutputFilesEnabled);
- LAMEXP_MAKE_OPTION_S(renameOutputFilesPattern);
- LAMEXP_MAKE_OPTION_I(overwriteMode);
- LAMEXP_MAKE_OPTION_U(metaInfoPosition);
- LAMEXP_MAKE_OPTION_U(maximumInstances);
- LAMEXP_MAKE_OPTION_S(customTempPath);
- LAMEXP_MAKE_OPTION_B(customTempPathEnabled);
- LAMEXP_MAKE_OPTION_B(slowStartup);
- LAMEXP_MAKE_OPTION_S(mostRecentInputPath);
- LAMEXP_MAKE_OPTION_B(hibernateComputer);
+ LAMEXP_MAKE_OPTION_I(aacEncProfile)
+ LAMEXP_MAKE_OPTION_I(aftenAudioCodingMode)
+ LAMEXP_MAKE_OPTION_I(aftenDynamicRangeCompression)
+ LAMEXP_MAKE_OPTION_I(aftenExponentSearchSize)
+ LAMEXP_MAKE_OPTION_B(aftenFastBitAllocation)
+ LAMEXP_MAKE_OPTION_B(antivirNotificationsEnabled)
+ LAMEXP_MAKE_OPTION_B(autoUpdateCheckBeta)
+ LAMEXP_MAKE_OPTION_B(autoUpdateEnabled)
+ LAMEXP_MAKE_OPTION_S(autoUpdateLastCheck)
+ LAMEXP_MAKE_OPTION_B(bitrateManagementEnabled)
+ LAMEXP_MAKE_OPTION_I(bitrateManagementMaxRate)
+ LAMEXP_MAKE_OPTION_I(bitrateManagementMinRate)
+ LAMEXP_MAKE_OPTION_I(compressionBitrateAacEnc)
+ LAMEXP_MAKE_OPTION_I(compressionBitrateAften)
+ LAMEXP_MAKE_OPTION_I(compressionBitrateDcaEnc)
+ LAMEXP_MAKE_OPTION_I(compressionBitrateLAME)
+ LAMEXP_MAKE_OPTION_I(compressionBitrateOggEnc)
+ LAMEXP_MAKE_OPTION_I(compressionBitrateOpusEnc)
+ LAMEXP_MAKE_OPTION_I(compressionEncoder)
+ LAMEXP_MAKE_OPTION_I(compressionRCModeAacEnc)
+ LAMEXP_MAKE_OPTION_I(compressionRCModeAften)
+ LAMEXP_MAKE_OPTION_I(compressionRCModeLAME)
+ LAMEXP_MAKE_OPTION_I(compressionRCModeOggEnc)
+ LAMEXP_MAKE_OPTION_I(compressionRCModeOpusEnc)
+ LAMEXP_MAKE_OPTION_I(compressionVbrLevelAacEnc)
+ LAMEXP_MAKE_OPTION_I(compressionVbrLevelAften)
+ LAMEXP_MAKE_OPTION_I(compressionVbrLevelFLAC)
+ LAMEXP_MAKE_OPTION_I(compressionVbrLevelLAME)
+ LAMEXP_MAKE_OPTION_I(compressionVbrLevelOggEnc)
+ LAMEXP_MAKE_OPTION_B(createPlaylist)
+ LAMEXP_MAKE_OPTION_S(currentLanguage)
+ LAMEXP_MAKE_OPTION_S(currentLanguageFile)
+ LAMEXP_MAKE_OPTION_S(customParametersAacEnc)
+ LAMEXP_MAKE_OPTION_S(customParametersAften)
+ LAMEXP_MAKE_OPTION_S(customParametersFLAC)
+ LAMEXP_MAKE_OPTION_S(customParametersLAME)
+ LAMEXP_MAKE_OPTION_S(customParametersOggEnc)
+ LAMEXP_MAKE_OPTION_S(customParametersOpus)
+ LAMEXP_MAKE_OPTION_S(customTempPath)
+ LAMEXP_MAKE_OPTION_B(customTempPathEnabled)
+ LAMEXP_MAKE_OPTION_B(dropBoxWidgetEnabled)
+ LAMEXP_MAKE_OPTION_S(favoriteOutputFolders)
+ LAMEXP_MAKE_OPTION_B(forceStereoDownmix)
+ LAMEXP_MAKE_OPTION_B(hibernateComputer)
+ LAMEXP_MAKE_OPTION_I(interfaceStyle)
+ LAMEXP_MAKE_OPTION_I(lameAlgoQuality)
+ LAMEXP_MAKE_OPTION_I(lameChannelMode)
+ LAMEXP_MAKE_OPTION_I(licenseAccepted)
+ LAMEXP_MAKE_OPTION_U(maximumInstances)
+ LAMEXP_MAKE_OPTION_U(metaInfoPosition)
+ LAMEXP_MAKE_OPTION_S(mostRecentInputPath)
+ LAMEXP_MAKE_OPTION_B(neroAACEnable2Pass)
+ LAMEXP_MAKE_OPTION_B(neroAacNotificationsEnabled)
+ LAMEXP_MAKE_OPTION_B(normalizationFilterEnabled)
+ LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode)
+ LAMEXP_MAKE_OPTION_I(normalizationFilterMaxVolume)
+ LAMEXP_MAKE_OPTION_I(opusComplexity)
+ LAMEXP_MAKE_OPTION_B(opusDisableResample)
+ LAMEXP_MAKE_OPTION_I(opusFramesize)
+ LAMEXP_MAKE_OPTION_I(opusOptimizeFor)
+ LAMEXP_MAKE_OPTION_S(outputDir)
+ LAMEXP_MAKE_OPTION_B(outputToSourceDir)
+ LAMEXP_MAKE_OPTION_I(overwriteMode)
+ LAMEXP_MAKE_OPTION_B(prependRelativeSourcePath)
+ LAMEXP_MAKE_OPTION_B(renameOutputFilesEnabled)
+ LAMEXP_MAKE_OPTION_S(renameOutputFilesPattern)
+ LAMEXP_MAKE_OPTION_I(samplingRate)
+ LAMEXP_MAKE_OPTION_B(shellIntegrationEnabled)
+ LAMEXP_MAKE_OPTION_B(slowStartup)
+ LAMEXP_MAKE_OPTION_B(soundsEnabled)
+ LAMEXP_MAKE_OPTION_I(toneAdjustBass)
+ LAMEXP_MAKE_OPTION_I(toneAdjustTreble)
+ LAMEXP_MAKE_OPTION_B(writeMetaTags)
//Misc
void validate(void);