Added support for Opus Audio Codec, based on Opus-Tools v0.1.3 (2012-07-10) by Xiph.org/Mozilla
+
Added support for Opus Audio Codec, based on Opus-Tools v0.1.3+ (2012-07-21) by Xiph.org/Mozilla
Added Swedish translation, thanks to Åke Engelbrektson <eson57@gmail.com>
Updated Qt runtime libraries to v4.8.2 (2012-05-22), compiled with MSVC 10.0
Updated mpg123 decoder to v1.14.3 (2012-07-01), compiled with GCC 4.6.1
diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat
index 3477d324..4eb9b4d6 100644
--- a/etc/Deployment/_deploy.bat
+++ b/etc/Deployment/_deploy.bat
@@ -72,10 +72,11 @@ if not "%LAMEXP_ERROR%"=="0" (
GOTO:EOF
)
REM ------------------------------------------
-set "OUT_FILE=%OUT_PATH%\..\%VER_LAMEXP_BASENAME%.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%"
+mkdir "%~dp0\..\..\out" 2> NUL
+set "OUT_FILE=%~dp0\..\..\out\%VER_LAMEXP_BASENAME%.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%"
for /L %%n in (1, 1, 99) do (
- if exist "!OUT_FILE!.exe" set "OUT_FILE=%OUT_PATH%\..\%VER_LAMEXP_BASENAME%.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n"
- if exist "!OUT_FILE!.zip" set "OUT_FILE=%OUT_PATH%\..\%VER_LAMEXP_BASENAME%.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n"
+ if exist "!OUT_FILE!.exe" set "OUT_FILE=%~dp0\..\..\out\%VER_LAMEXP_BASENAME%.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n"
+ if exist "!OUT_FILE!.zip" set "OUT_FILE=%~dp0\..\..\out\%VER_LAMEXP_BASENAME%.%ISO_DATE%.%LAMEXP_CONFIG:_=-%.Build-%VER_LAMEXP_BUILD%.Update-%%n"
)
REM ------------------------------------------
REM :: DELETE OLD OUTPUT FILE ::
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index a3268ac4..90009b5a 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -760,7 +760,7 @@
-
+ Source Files
@@ -781,13 +781,13 @@
-
+ Show Details
-
+ Output Directory
@@ -833,7 +833,7 @@
-
+ Meta Data
@@ -874,7 +874,7 @@
-
+ Compression
@@ -960,7 +960,7 @@
-
+ Advanced Options
@@ -1281,6 +1281,7 @@
+ Speech
@@ -1290,1133 +1291,1193 @@
-
+ Auto Select
-
+ 1+1 (Ch1,Ch2)
-
+ 1/0 (C)
-
+ 2/0 (L,R)
-
+ 3/0 (L,R,C)
-
+ 2/1 (L,R,S)
-
+ 3/1 (L,R,C,S)
-
+ 2/2 (L,R,SL,SR)
-
+ 3/2 (L,R,C,SL,SR)
-
+ Audio Coding Mode:
-
+ Dynamic Range Compression:
-
+ Fast Bit Allocation (Less Accurate)
-
+ Exponent Search Size:
-
+ Rename Output Files
-
+ Enter the pattern to rename the output files here!
-
+ Rename Output Files
-
+ <a href="reset">Reset</a> <a href="#">Show List of Macros</a>
-
+ Rename Pattern:
-
+ Example File Name:
-
+
+ Opus Encoder Options
+
+
+
+
+ Optimize for Signal Type:
+
+
+
+
+ Encoding Complexity:
+
+
+
+
+ Music
+
+
+
+
+ (Undefined)
+
+
+
+
+ Frame Size:
+
+
+
+
+ 2.5
+
+
+
+
+ 5
+
+
+
+
+ 10
+
+
+
+
+ 20
+
+
+
+
+ 40
+
+
+
+
+ 60
+
+
+
+ Reset Advanced Options
-
+ Encode Now!
-
-
+
+ About...
-
+ Exit Program
-
+ File
-
+ ?
-
+ View
-
+ Style
-
+ Language
-
+ Tools
-
+ Configuration
-
+ Quit
-
+ Open File(s)...
-
-
+
+ Visit Official Web-Site
-
-
-
-
+
+
+
+ Check for Updates
-
+ Open Folder...
-
+ Clear All
-
+ Plastique
-
+ Cleanlooks
-
+ Windows Vista ("Aero")
-
+ Windows Classic
-
+ Windows XP ("Luna")
-
-
+
+ Disable Update Reminder
-
-
+
+ Disable Sound Effects
-
+ Install WMA Decoder
-
+ Disable Nero AAC Notifications
-
+ Show DropBox
-
+ From File...
-
+ Encode!
-
+ Disable Shell Integration
-
+ Frequently Asked Questions
-
+ Changelog
-
+ Translator's Guide
-
+ Help && Support
-
+ Open Folder Recursively...
-
+ Check for Beta Updates
-
+ Import Cue Sheet
-
+ Disable Slow Startup Notifications
-
+ Hibernate Computer On Shutdown
-
+ Adding file(s), please wait...
-
-
+
+ Access Denied
-
+ %1 file(s) have been rejected, because read access was not granted!
-
+ This usually means the file is locked by another process.
-
+ CDDA Files
-
+ %1 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
-
+ %1 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
-
+ %1 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
-
+ 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 (Very Slow)
-
+ High Quality (Recommended)
-
+ Average Quality (Default)
-
+ Low Quality (Fast)
-
+ Poor Quality (Very Fast)
-
+ File name without extension
-
+ Track number with leading zero
-
+ Track title
-
+ Artist name
-
+ Album name
-
+ Year with (at least) four digits
-
+ Comment
-
+ Characters forbidden in file names:
-
+ Rename Macros
-
+ %1 Instance(s)
-
+ Cannot write to the selected directory. Please choose another directory!
-
+ Already Running
-
+ LameXP is already running, please use the running instance!
@@ -2968,45 +3029,45 @@
-
+ Playlist creation failed
-
+ The playlist file could not be created:
-
+ Warning: Computer will shutdown in %1 seconds...
-
-
+
+ Cancel Shutdown
-
+ hour(s)
-
-
+
+ minute(s)
-
-
+
+ second(s)
-
+ millisecond(s)
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 5e38dd3c..aa400cd3 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -1836,31 +1836,79 @@
MP3
-
+ Ogg/Vorbis
-
+ AAC/MP4
-
+ PCM/Wave
-
+ A/52
-
+ DCA
-
+ Opus
-
+
+
+
+ Opus Encoder Options
+ Opus Kodierer Optionen
+
+
+ Optimize for Signal Type:
+ Optimieren für Signaltyp:
+
+
+ Encoding Complexity:
+ Kodierer Komplexität:
+
+
+ Music
+ Musik
+
+
+ (Undefined)
+ (Undefiniert)
+
+
+ Frame Size:
+ Framegröße:
+
+
+ 2.5
+ 2,5
+
+
+ 5
+
+
+
+ 10
+
+
+
+ 20
+
+
+
+ 40
+
+
+
+ 60
+
@@ -2181,7 +2229,7 @@
WARNING: Decoded file size exceeds 4 GB, problems might occur!
-
+ WARNUNG: Dekodierte Dateigröße übersteigt 4 GB, Probleme sind vorprogrammiert!
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index c20db787..2593f5a4 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -1861,6 +1861,54 @@
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+ 2.5
+
+
+ 5
+ 5
+
+
+ 10
+ 10
+
+
+ 20
+ 20
+
+
+ 40
+ 40
+
+
+ 60
+ 60
+ MetaInfo
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 4f15ce83..2ddbeab0 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -1871,6 +1871,54 @@ Ouvrir le dossier récursivement...
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+ 2.5
+
+
+ 5
+ 5
+
+
+ 10
+ 10
+
+
+ 20
+ 20
+
+
+ 40
+ 40
+
+
+ 60
+ 60
+ MetaInfo
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index 47410007..ef8a6321 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -1862,6 +1862,54 @@
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+
+
+
+ 5
+
+
+
+ 10
+
+
+
+ 20
+
+
+
+ 40
+
+
+
+ 60
+
+ MetaInfo
diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts
index 64656d9a..27d88d06 100644
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -1861,6 +1861,54 @@
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+
+
+
+ 5
+
+
+
+ 10
+
+
+
+ 20
+
+
+
+ 40
+
+
+
+ 60
+
+ MetaInfo
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index 04d43407..9a1c4bc8 100644
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -760,7 +760,7 @@
-
+ Source FilesPliki źródłowe
@@ -781,13 +781,13 @@
-
+ Show DetailsPokaż szczegóły
-
+ Output DirectoryFolder docelowy
@@ -823,7 +823,7 @@
-
+ Meta DataTagi
@@ -864,7 +864,7 @@
-
+ CompressionKompresja
@@ -915,7 +915,7 @@
-
+ Advanced OptionsOpcje zaawansowane
@@ -1281,6 +1281,7 @@
+ Speech
@@ -1290,1133 +1291,1193 @@
Żadna (Domyślnie)
-
+ Auto SelectAutomatycznie
-
+ 1+1 (Ch1,Ch2)1+1 (Ch1,Ch2)
-
+ 1/0 (C)1/0 (C)
-
+ 2/0 (L,R)2/0 (L,R)
-
+ 3/0 (L,R,C)3/0 (L,R,C)
-
+ 2/1 (L,R,S)2/1 (L,R,S)
-
+ 3/1 (L,R,C,S)3/1 (L,R,C,S)
-
+ 2/2 (L,R,SL,SR)2/2 (L,R,SL,SR)
-
+ 3/2 (L,R,C,SL,SR)3/2 (L,R,C,SL,SR)
-
+ Audio Coding Mode:Ilość kanałów:
-
+ Dynamic Range Compression:Kompresja dynamiki (DRC):
-
+ Fast Bit Allocation (Less Accurate)Szybka alokacja bitów (Mniejsza dokładność)
-
+ Exponent Search Size:
-
+ Rename Output Files Zmiana nazwy plików wyjściowych
-
+ Enter the pattern to rename the output files here!Zapisz tutaj wzór wg którego zmienisz nazwy!
-
+ Rename Output FilesZmieniaj nazwy plików
-
+ <a href="reset">Reset</a> <a href="#">Show List of Macros</a><a href="reset">Resetuj</a> <a href="#">Pokaż listę makr</a>
-
+ Rename Pattern:Format wyjściowy:
-
+ Example File Name:Przykładowa nazwa pliku:
-
+
+ Opus Encoder Options
+
+
+
+
+ Optimize for Signal Type:
+
+
+
+
+ Encoding Complexity:
+
+
+
+
+ Music
+
+
+
+
+ (Undefined)
+
+
+
+
+ Frame Size:
+
+
+
+
+ 2.5
+
+
+
+
+ 5
+
+
+
+
+ 10
+
+
+
+
+ 20
+
+
+
+
+ 40
+
+
+
+
+ 60
+
+
+
+ Reset Advanced Options Resetuj opcje zaawansowane
-
+ Encode Now!Kompresuj!
-
-
+
+ About...Info...
-
+ Exit ProgramWyjdź z programu
-
+ FilePlik
-
+ ??
-
+ ViewWidok
-
+ StyleStyl
-
+ LanguageJęzyk
-
+ ToolsNarzędzia
-
+ ConfigurationKonfiguracja
-
+ QuitZamknij
-
+ Open File(s)...Otwórz plik(i)...
-
-
+
+ Visit Official Web-SiteOdwiedź oficjalną stronę
-
-
-
-
+
+
+
+ Check for UpdatesSprawdź aktualizacje
-
+ Open Folder...Otwórz folder...
-
+ Clear AllWyczyść wszystko
-
+ PlastiquePlastique
-
+ CleanlooksCleanlooks
-
+ Windows Vista ("Aero")Windows Vista ("Aero")
-
+ Windows ClassicWindows Classic
-
+ Windows XP ("Luna")Windows XP ("Luna")
-
-
+
+ Disable Update ReminderWyłącz przypominanie o aktualizacji
-
-
+
+ Disable Sound EffectsWyłącz efekty dźwiękowe
-
+ Install WMA DecoderZainstaluj Dekoder WMA
-
+ Disable Nero AAC NotificationsWyłącz powiadomienia Nero AAC
-
+ Show DropBoxPokaż DropBoxa
-
+ From File...Z pliku...
-
+ Encode!Kompresuj!
-
+ Disable Shell IntegrationWyłącz integrację z systemem
-
+ Frequently Asked QuestionsPytania i Odpowiedzi
-
+ ChangelogLista zmian
-
+ Translator's GuidePrzewodnik tłumacza
-
+ Help && SupportPomoc i Wsparcie
-
+ Open Folder Recursively...Otwórz folder rekurencyjnie...
-
+ Check for Beta UpdatesSprawdzaj czy jest Beta
-
+ Import Cue SheetImportuj plik Cue
-
+ Disable Slow Startup NotificationsWyłącz powiadomienia o powolnym starcie
-
+ Hibernate Computer On ShutdownHibernuj zamiast zamykać
-
+ Adding file(s), please wait...Dodawanie plików, prosze czekać...
-
-
+
+ Access DeniedDostęp zablokowany
-
+ %1 file(s) have been rejected, because read access was not granted!%1 plik(ów) zostało odrzuconych z powodu braku dostępu do pliku!
-
+ This usually means the file is locked by another process.To przeważnie oznacza, że plik jest zablokowany przez inny proces.
-
+ CDDA FilesPliki CDDA
-
+ %1 file(s) have been rejected, because they are dummy CDDA files!%1 plik(ów) zostało odrzuconych ponieważ to nie są właściwe pliki 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
-
+ %1 file(s) have been rejected, because they appear to be Cue Sheet images!%1 plik(ów) zostało odrzuconych, ponieważ to nie są pliki obrazów Cue 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
-
+ %1 file(s) have been rejected, because the file format could not be recognized!%1 plik(ów) zostało odrzuconych, ponieważ ich format nie został rozpoznany!
-
+ 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 demo (beta) 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/an/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 DEMO
-
+ (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
-
+ Initializing directory outline, please be patient...Ładowanie zestawu folderów, prosze czekać...
-
+ Refresh Directory OutlineOdśwież foldery
-
+ 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 (Very Slow)Najlepsza jakość (Bardzo wolno)
-
+ High Quality (Recommended)Wysoka jakość (Zalecane)
-
+ Average Quality (Default)Średnia jakość (Domyślnie)
-
+ Low Quality (Fast)Niska jakość (Szybko)
-
+ Poor Quality (Very Fast)Najniższa jakość (Bardzo szybko)
-
+ File name without 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
-
+ %1 Instance(s)%1 wątek/ki
-
+ Cannot write to the selected directory. Please choose another directory!Nie można zapisać do wybranej lokalizacji. Prosze wybierz inną lokalizację!
-
+ Already RunningJuż działa
-
+ LameXP is already running, please use the running instance!LameXP już działa, przejdź do działającego programu!
@@ -2968,45 +3029,45 @@
LameXP - Zrobione
-
+ 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
-
+ hour(s)godzinie/ach
-
-
+
+ minute(s)minutach
-
-
+
+ second(s)sekundach
-
+ millisecond(s)milisekundach
diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index 35b0113e..91b71777 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -1867,6 +1867,54 @@
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+
+
+
+ 5
+
+
+
+ 10
+
+
+
+ 20
+
+
+
+ 40
+
+
+
+ 60
+
+ MetaInfo
diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index 8e76da0d..162c4037 100644
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -760,7 +760,7 @@
-
+ Source FilesKällfiler
@@ -781,13 +781,13 @@
-
+ Show DetailsVisa detaljer
-
+ Output DirectoryMålmapp
@@ -833,7 +833,7 @@
-
+ Meta DataMetadata
@@ -874,7 +874,7 @@
-
+ CompressionKomprimering
@@ -960,7 +960,7 @@
-
+ Advanced OptionsAvancerat
@@ -1281,6 +1281,7 @@
+ SpeechTal
@@ -1290,1133 +1291,1193 @@
Ingen (standard)
-
+ Auto SelectAutomatiskt
-
+ 1+1 (Ch1,Ch2)1+1 (Ch1,Ch2)
-
+ 1/0 (C)1/0 (C)
-
+ 2/0 (L,R)2/0 (V,H)
-
+ 3/0 (L,R,C)3/0 (V,H,C)
-
+ 2/1 (L,R,S)2/1 (V,H,S)
-
+ 3/1 (L,R,C,S)3/1 (V,H,C,S)
-
+ 2/2 (L,R,SL,SR)2/2 (V,H,SV,SH)
-
+ 3/2 (L,R,C,SL,SR)3/2 (V,H,C,SV,SH)
-
+ Audio Coding Mode:Ljudkodningsläge:
-
+ Dynamic Range Compression:Dynamisk intervallkomprimering:
-
+ Fast Bit Allocation (Less Accurate)Snabb bitallokering (mindre exakt)
-
+ Exponent Search Size:Exponentsökstorlek:
-
+ Rename Output Files Namnändra utdatafiler
-
+ Enter the pattern to rename the output files here!Ange namnändringsmall för utdatafiler här!
-
+ Rename Output FilesNamnändra utdatafiler
-
+ <a href="reset">Reset</a> <a href="#">Show List of Macros</a><a href="reset">Återställ</a> <a href="#">Visa lista över Macron</a>
-
+ Rename Pattern:Namnändringsmall:
-
+ Example File Name:Exempelnamn:
-
+
+ Opus Encoder Options
+
+
+
+
+ Optimize for Signal Type:
+
+
+
+
+ Encoding Complexity:
+
+
+
+
+ Music
+
+
+
+
+ (Undefined)
+
+
+
+
+ Frame Size:
+
+
+
+
+ 2.5
+ 2.5
+
+
+
+ 5
+ 5
+
+
+
+ 10
+ 10
+
+
+
+ 20
+ 20
+
+
+
+ 40
+ 40
+
+
+
+ 60
+ 60
+
+
+ Reset Advanced Options Återställ avancerade inställningar
-
+ Encode Now!Koda om nu!
-
-
+
+ About...Om...
-
+ Exit ProgramAvsluta LameXP
-
+ FileArkiv
-
+ ?Info
-
+ ViewVisa
-
+ StyleStil
-
+ LanguageSpråk
-
+ ToolsVerktyg
-
+ ConfigurationInställningar
-
+ QuitAvsluta
-
+ Open File(s)...Öppna fil(er)...
-
-
+
+ Visit Official Web-SiteBesök hemsidan
-
-
-
-
+
+
+
+ Check for UpdatesSök efter uppdateringar
-
+ Open Folder...Öppna mapp...
-
+ Clear AllRensa alla
-
+ PlastiquePlastique
-
+ CleanlooksCleanlooks
-
+ Windows Vista ("Aero")Windows Vista ("Aero")
-
+ Windows ClassicWindows Classic
-
+ Windows XP ("Luna")Windows XP ("Luna")
-
-
+
+ Disable Update ReminderInaktivera uppdateringsmeddelande
-
-
+
+ Disable Sound EffectsInaktivera ljudeffekter
-
+ Install WMA DecoderInstallera WMA-avkodare
-
+ Disable Nero AAC NotificationsInaktivera Nero AAC-meddelanden
-
+ Show DropBoxVisa DropBox
-
+ From File...Från fil...
-
+ Encode!Koda om!
-
+ Disable Shell IntegrationInaktivera utforskarintegration
-
+ Frequently Asked QuestionsVanliga frågor
-
+ ChangelogÄndringslogg
-
+ Translator's GuideÖversättningsguide
-
+ Help && SupportHjälp && support
-
+ Open Folder Recursively...Öppna mapp rekursivt
-
+ Check for Beta UpdatesSök efter beta-uppdateringar
-
+ Import Cue SheetImportera cue-fil
-
+ Disable Slow Startup NotificationsInaktivera meddelanden om långsam uppstart
-
+ Hibernate Computer On ShutdownFörsätt datorn i viloläge vid avslut
-
+ Adding file(s), please wait...Lägger till fil(er), vänta...
-
-
+
+ Access DeniedÅtkomst nekad
-
+ %1 file(s) have been rejected, because read access was not granted!%1 fil(er) har undantagits, på grund av att åtkomst nekades!
-
+ This usually means the file is locked by another process.Det innebär oftast att filen är låst av någon annan process.
-
+ CDDA FilesCDDA-filer
-
+ %1 file(s) have been rejected, because they are dummy CDDA files!%1 fil(er) har undantagits, på grund av att det är fejkade CDDA-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.
-
+ Cue SheetCue-fil
-
+ %1 file(s) have been rejected, because they appear to be Cue Sheet images!%1 fil(er) har undantagits, på grund av att de verkar vara cue-filer!
-
+ Please use LameXP's Cue Sheet wizard for importing Cue Sheet files.Använd LameXPs cue-guide för att importera cue-filer.
-
+ Files RejectedUndantagna filer
-
+ %1 file(s) have been rejected, because the file format could not be recognized!%1 fil(er) har undantagits, på grund av att filformatet inte känns igen!
-
+ 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.
-
+ 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
-
+ 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 (Very Slow)Bäst kvallitet (långsam)
-
+ High Quality (Recommended)Hög kvallitet (rekommenderas)
-
+ Average Quality (Default)Medelkvallitet (standard)
-
+ Low Quality (Fast)Låg kvallitet (snabb)
-
+ Poor Quality (Very Fast)Dålig kvallitet (mycket snabb)
-
+ File name without 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
-
+ %1 Instance(s)%1 instans(er)
-
+ Cannot write to the selected directory. Please choose another directory!Kan inte skriva till den specificerade mappen. Välj en annan destination!
-
+ Already RunningKörs redan
-
+ LameXP is already running, please use the running instance!LameXP körs redan, använd den redan startade instansen!
@@ -2968,45 +3029,45 @@
LameXP - Klar
-
+ 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
-
+ hour(s)timma(r)
-
-
+
+ minute(s)minut(er)
-
-
+
+ second(s)sekund(er)
-
+ millisecond(s)millisekund(er)
diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts
index 14bb6fc4..1eb62930 100644
--- a/etc/Translation/LameXP_TW.ts
+++ b/etc/Translation/LameXP_TW.ts
@@ -1861,6 +1861,54 @@
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+ 2.5
+
+
+ 5
+ 5
+
+
+ 10
+ 10
+
+
+ 20
+ 20
+
+
+ 40
+ 40
+
+
+ 60
+ 60
+ MetaInfo
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 04ca966d..0d0b79c9 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -1862,6 +1862,54 @@
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+ 2.5
+
+
+ 5
+ 5
+
+
+ 10
+ 10
+
+
+ 20
+ 20
+
+
+ 40
+ 40
+
+
+ 60
+ 60
+ MetaInfo
diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts
index 4c6b2afa..3a97e48a 100644
--- a/etc/Translation/LameXP_ZH.ts
+++ b/etc/Translation/LameXP_ZH.ts
@@ -1861,6 +1861,54 @@
Opus
+
+ Opus Encoder Options
+
+
+
+ Optimize for Signal Type:
+
+
+
+ Encoding Complexity:
+
+
+
+ Music
+
+
+
+ (Undefined)
+
+
+
+ Frame Size:
+
+
+
+ 2.5
+ 2.5
+
+
+ 5
+ 5
+
+
+ 10
+ 10
+
+
+ 20
+ 20
+
+
+ 40
+ 40
+
+
+ 60
+ 60
+ MetaInfo
diff --git a/etc/Translation/update.lst b/etc/Translation/update.lst
index 2066076a..b4faaf9c 100644
--- a/etc/Translation/update.lst
+++ b/etc/Translation/update.lst
@@ -17,6 +17,7 @@
..\..\src\Decoder_MAC.cpp
..\..\src\Decoder_MP3.cpp
..\..\src\Decoder_Musepack.cpp
+..\..\src\Decoder_Opus.cpp
..\..\src\Decoder_Shorten.cpp
..\..\src\Decoder_Speex.cpp
..\..\src\Decoder_TTA.cpp
@@ -42,6 +43,7 @@
..\..\src\Encoder_DCA.cpp
..\..\src\Encoder_FLAC.cpp
..\..\src\Encoder_MP3.cpp
+..\..\src\Encoder_Opus.cpp
..\..\src\Encoder_Vorbis.cpp
..\..\src\Encoder_Wave.cpp
..\..\src\Filter_Abstract.cpp
@@ -89,6 +91,7 @@
..\..\src\Decoder_MAC.h
..\..\src\Decoder_MP3.h
..\..\src\Decoder_Musepack.h
+..\..\src\Decoder_Opus.h
..\..\src\Decoder_Shorten.h
..\..\src\Decoder_Speex.h
..\..\src\Decoder_TTA.h
@@ -114,6 +117,7 @@
..\..\src\Encoder_DCA.h
..\..\src\Encoder_FLAC.h
..\..\src\Encoder_MP3.h
+..\..\src\Encoder_Opus.h
..\..\src\Encoder_Vorbis.h
..\..\src\Encoder_Wave.h
..\..\src\Filter_Abstract.h
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 53d40ca8..a6200bf6 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -1324,7 +1324,7 @@
00604
- 1524
+ 1639
@@ -2060,7 +2060,7 @@
-
+
@@ -2253,7 +2253,7 @@
-
+
@@ -2431,7 +2431,7 @@
-
+
@@ -2670,7 +2670,7 @@
-
+
@@ -2834,7 +2834,7 @@
-
+
@@ -3017,6 +3017,9 @@
+
+ 0
+ Auto Select
@@ -3216,7 +3219,7 @@
-
+
@@ -3414,6 +3417,241 @@
+
+
+
+
+ 50
+ false
+
+
+
+ Opus Encoder Options
+
+
+
+
+
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+
+
+
+ Optimize for Signal Type:
+
+
+
+
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 8
+
+
+
+
+
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 8
+
+
+
+
+
+
+
+ Qt::Horizontal
+
+
+
+ 1
+ 20
+
+
+
+
+
+
+
+ Qt::Horizontal
+
+
+
+ 1
+ 20
+
+
+
+
+
+
+
+ Encoding Complexity:
+
+
+
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 128
+ 0
+
+
+
+ 0
+
+
+
+ Music
+
+
+
+
+ Speech
+
+
+
+
+ (Undefined)
+
+
+
+
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 128
+ 0
+
+
+
+ 10
+
+
+ 10
+
+
+
+
+
+
+ Frame Size:
+
+
+
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 128
+ 0
+
+
+
+ 3
+
+
+
+ 2.5
+
+
+
+
+ 5
+
+
+
+
+ 10
+
+
+
+
+ 20
+
+
+
+
+ 40
+
+
+
+
+ 60
+
+
+
+
+
+
+
+
+
@@ -4124,6 +4362,8 @@
+
+
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index e8885999..d17a4003 100644
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ
diff --git a/res/localization/LameXP_ES.qm b/res/localization/LameXP_ES.qm
index a3ca2387..07004d7f 100644
Binary files a/res/localization/LameXP_ES.qm and b/res/localization/LameXP_ES.qm differ
diff --git a/res/localization/LameXP_FR.qm b/res/localization/LameXP_FR.qm
index d9b457fa..63468dee 100644
Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ
diff --git a/res/localization/LameXP_SV.qm b/res/localization/LameXP_SV.qm
index b75a5f60..f1ea55c7 100644
Binary files a/res/localization/LameXP_SV.qm and b/res/localization/LameXP_SV.qm differ
diff --git a/res/localization/LameXP_TW.qm b/res/localization/LameXP_TW.qm
index 7baf9b6a..13f2cb64 100644
Binary files a/res/localization/LameXP_TW.qm and b/res/localization/LameXP_TW.qm differ
diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm
index 6738c71e..0885c233 100644
Binary files a/res/localization/LameXP_UK.qm and b/res/localization/LameXP_UK.qm differ
diff --git a/res/localization/LameXP_ZH.qm b/res/localization/LameXP_ZH.qm
index 80245fbc..a34d9890 100644
Binary files a/res/localization/LameXP_ZH.qm and b/res/localization/LameXP_ZH.qm differ
diff --git a/res/tools/opusdec.exe b/res/tools/opusdec.exe
index 4c56032e..eab797ab 100644
Binary files a/res/tools/opusdec.exe and b/res/tools/opusdec.exe differ
diff --git a/res/tools/opusenc.exe b/res/tools/opusenc.exe
index f5f70050..813997ef 100644
Binary files a/res/tools/opusenc.exe and b/res/tools/opusenc.exe differ
diff --git a/src/Config.h b/src/Config.h
index 2f141eb2..8bd703f3 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 5
#define VER_LAMEXP_TYPE Alpha
-#define VER_LAMEXP_PATCH 8
-#define VER_LAMEXP_BUILD 1052
+#define VER_LAMEXP_PATCH 9
+#define VER_LAMEXP_BUILD 1056
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)
diff --git a/src/Decoder_Opus.cpp b/src/Decoder_Opus.cpp
index 5a557433..8736c592 100644
--- a/src/Decoder_Opus.cpp
+++ b/src/Decoder_Opus.cpp
@@ -59,7 +59,7 @@ bool OpusDecoder::decode(const QString &sourceFile, const QString &outputFile, v
bool bAborted = false;
int prevProgress = -1;
- //QRegExp regExp("\\s+Time:\\s+(\\d+):(\\d+)\\.(\\d+)\\s+\\[(\\d+):(\\d+)\\.(\\d+)\\],");
+ QRegExp regExp("\\[(-|\\\\|/|\\|)\\]");
//The ALAC Decoder doesn't actually send any status updates :-[
emit statusUpdated(20 + (QUuid::createUuid().data1 % 60));
@@ -86,8 +86,10 @@ bool OpusDecoder::decode(const QString &sourceFile, const QString &outputFile, v
{
QByteArray line = process.readLine();
QString text = QString::fromUtf8(line.constData()).simplified();
- /* if(regExp.lastIndexIn(text) >= 0)
+ if(regExp.lastIndexIn(text) >= 0)
{
+ __noop;
+ /*
int values[6];
for(int i = 0; i < 6; i++)
{
@@ -106,8 +108,9 @@ bool OpusDecoder::decode(const QString &sourceFile, const QString &outputFile, v
prevProgress = qMin(newProgress + 2, 99);
}
}
- } */
- if(!text.isEmpty())
+ */
+ }
+ else if(!text.isEmpty())
{
emit messageLogged(text);
}
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index b5ff33d5..75a908bb 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -260,12 +260,15 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
spinBoxToneAdjustBass->setValue(static_cast(m_settings->toneAdjustBass()) / 100.0);
spinBoxToneAdjustTreble->setValue(static_cast(m_settings->toneAdjustTreble()) / 100.0);
spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSize());
+ spinBoxOpusComplexity->setValue(m_settings->opusComplexity());
comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelMode());
comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRate());
comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfile());
comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingMode());
comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompression());
comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEqualizationMode());
+ comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeFor());
+ comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesize());
while(checkBoxBitrateManagement->isChecked() != m_settings->bitrateManagementEnabled()) checkBoxBitrateManagement->click();
while(checkBoxNeroAAC2PassMode->isChecked() != m_settings->neroAACEnable2Pass()) checkBoxNeroAAC2PassMode->click();
while(checkBoxAftenFastAllocation->isChecked() != m_settings->aftenFastBitAllocation()) checkBoxAftenFastAllocation->click();
@@ -316,6 +319,9 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
connect(lineEditRenamePattern, SIGNAL(textChanged(QString)), this, SLOT(renameOutputPatternChanged(QString)));
connect(labelShowRenameMacros, SIGNAL(linkActivated(QString)), this, SLOT(showRenameMacros(QString)));
connect(checkBoxForceStereoDownmix, SIGNAL(clicked(bool)), this, SLOT(forceStereoDownmixEnabledChanged(bool)));
+ connect(comboBoxOpusOptimize, SIGNAL(currentIndexChanged(int)), SLOT(opusSettingsChanged()));
+ connect(comboBoxOpusFramesize, SIGNAL(currentIndexChanged(int)), this, SLOT(opusSettingsChanged()));
+ connect(spinBoxOpusComplexity, SIGNAL(valueChanged(int)), this, SLOT(opusSettingsChanged()));
updateLameAlgoQuality(sliderLameAlgoQuality->value());
updateMaximumInstances(sliderMaxInstances->value());
toneAdjustTrebleChanged(spinBoxToneAdjustTreble->value());
@@ -773,7 +779,7 @@ void MainWindow::changeEvent(QEvent *e)
{
if(e->type() == QEvent::LanguageChange)
{
- int comboBoxIndex[6];
+ int comboBoxIndex[8];
//Backup combobox indices, as retranslateUi() resets
comboBoxIndex[0] = comboBoxMP3ChannelMode->currentIndex();
@@ -782,6 +788,8 @@ void MainWindow::changeEvent(QEvent *e)
comboBoxIndex[3] = comboBoxAftenCodingMode->currentIndex();
comboBoxIndex[4] = comboBoxAftenDRCMode->currentIndex();
comboBoxIndex[5] = comboBoxNormalizationMode->currentIndex();
+ comboBoxIndex[6] = comboBoxOpusOptimize->currentIndex();
+ comboBoxIndex[7] = comboBoxOpusFramesize->currentIndex();
//Re-translate from UIC
Ui::MainWindow::retranslateUi(this);
@@ -793,6 +801,8 @@ void MainWindow::changeEvent(QEvent *e)
comboBoxAftenCodingMode->setCurrentIndex(comboBoxIndex[3]);
comboBoxAftenDRCMode->setCurrentIndex(comboBoxIndex[4]);
comboBoxNormalizationMode->setCurrentIndex(comboBoxIndex[5]);
+ comboBoxOpusOptimize->setCurrentIndex(comboBoxIndex[6]);
+ comboBoxOpusFramesize->setCurrentIndex(comboBoxIndex[7]);
//Update the window title
if(LAMEXP_DEBUG)
@@ -3406,6 +3416,17 @@ void MainWindow::aftenFastAllocationChanged(bool checked)
m_settings->aftenFastBitAllocation(checked);
}
+
+/*
+ * Opus encoder settings changed
+ */
+void MainWindow::opusSettingsChanged(void)
+{
+ m_settings->opusOptimizeFor(comboBoxOpusOptimize->currentIndex());
+ m_settings->opusFramesize(comboBoxOpusFramesize->currentIndex());
+ m_settings->opusComplexity(spinBoxOpusComplexity->value());
+}
+
/*
* Normalization filter enabled changed
*/
@@ -3657,12 +3678,15 @@ void MainWindow::resetAdvancedOptionsButtonClicked(void)
spinBoxToneAdjustBass->setValue(static_cast(m_settings->toneAdjustBassDefault()) / 100.0);
spinBoxToneAdjustTreble->setValue(static_cast(m_settings->toneAdjustTrebleDefault()) / 100.0);
spinBoxAftenSearchSize->setValue(m_settings->aftenExponentSearchSizeDefault());
+ spinBoxOpusComplexity->setValue(m_settings->opusComplexityDefault());
comboBoxMP3ChannelMode->setCurrentIndex(m_settings->lameChannelModeDefault());
comboBoxSamplingRate->setCurrentIndex(m_settings->samplingRateDefault());
comboBoxAACProfile->setCurrentIndex(m_settings->aacEncProfileDefault());
comboBoxAftenCodingMode->setCurrentIndex(m_settings->aftenAudioCodingModeDefault());
comboBoxAftenDRCMode->setCurrentIndex(m_settings->aftenDynamicRangeCompressionDefault());
comboBoxNormalizationMode->setCurrentIndex(m_settings->normalizationFilterEqualizationModeDefault());
+ comboBoxOpusOptimize->setCurrentIndex(m_settings->opusOptimizeForDefault());
+ comboBoxOpusFramesize->setCurrentIndex(m_settings->opusFramesizeDefault());
while(checkBoxBitrateManagement->isChecked() != m_settings->bitrateManagementEnabledDefault()) checkBoxBitrateManagement->click();
while(checkBoxNeroAAC2PassMode->isChecked() != m_settings->neroAACEnable2PassDefault()) checkBoxNeroAAC2PassMode->click();
while(checkBoxNormalizationFilter->isChecked() != m_settings->normalizationFilterEnabledDefault()) checkBoxNormalizationFilter->click();
diff --git a/src/Dialog_MainWindow.h b/src/Dialog_MainWindow.h
index 3e721e85..85dff572 100644
--- a/src/Dialog_MainWindow.h
+++ b/src/Dialog_MainWindow.h
@@ -106,6 +106,7 @@ private slots:
void normalizationModeChanged(int mode);
void notifyOtherInstance(void);
void openFolderActionActivated(void);
+ void opusSettingsChanged(void);
void outputFolderContextMenu(const QPoint &pos);
void outputFolderDirectoryLoaded(const QString &path);
void outputFolderEditFinished(void);
diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp
index 8ce4a373..4a7df5ff 100644
--- a/src/Dialog_Processing.cpp
+++ b/src/Dialog_Processing.cpp
@@ -841,6 +841,9 @@ AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
OpusEncoder *opusEncoder = new OpusEncoder();
opusEncoder->setBitrate(m_settings->compressionBitrate());
opusEncoder->setRCMode(m_settings->compressionRCMode());
+ opusEncoder->setOptimizeFor(m_settings->opusOptimizeFor());
+ opusEncoder->setEncodeComplexity(m_settings->opusComplexity());
+ opusEncoder->setFrameSize(m_settings->opusFramesize());
//TODO: opusEncoder->setCustomParams(m_settings->customParametersOpus());
encoder = opusEncoder;
}
diff --git a/src/Encoder_AAC.cpp b/src/Encoder_AAC.cpp
index 36a04ab2..f7a696a7 100644
--- a/src/Encoder_AAC.cpp
+++ b/src/Encoder_AAC.cpp
@@ -287,3 +287,8 @@ void AACEncoder::setEnable2Pass(bool enabled)
{
m_configEnable2Pass = enabled;
}
+
+const bool AACEncoder::needsTimingInfo(void)
+{
+ return true;
+}
diff --git a/src/Encoder_AAC.h b/src/Encoder_AAC.h
index 4557a104..7129b445 100644
--- a/src/Encoder_AAC.h
+++ b/src/Encoder_AAC.h
@@ -36,6 +36,7 @@ public:
virtual bool encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag);
virtual bool isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion);
virtual QString extension(void);
+ virtual const bool needsTimingInfo(void);
//Advanced options
virtual void setProfile(int profile);
diff --git a/src/Encoder_Abstract.cpp b/src/Encoder_Abstract.cpp
index bb83ccee..0a0a3854 100644
--- a/src/Encoder_Abstract.cpp
+++ b/src/Encoder_Abstract.cpp
@@ -64,6 +64,12 @@ const unsigned int *AbstractEncoder::supportedBitdepths(void)
return NULL;
}
+//Does the encoder need the exact duration of the source?
+const bool AbstractEncoder::needsTimingInfo(void)
+{
+ return false;
+}
+
/*
* Helper functions
*/
diff --git a/src/Encoder_Abstract.h b/src/Encoder_Abstract.h
index fffee7c1..abf04a5d 100644
--- a/src/Encoder_Abstract.h
+++ b/src/Encoder_Abstract.h
@@ -43,6 +43,7 @@ public:
virtual const unsigned int *supportedSamplerates(void);
virtual const unsigned int *supportedChannelCount(void);
virtual const unsigned int *supportedBitdepths(void);
+ virtual const bool needsTimingInfo(void);
//Common setter methods
void setBitrate(int bitrate);
diff --git a/src/Encoder_Opus.cpp b/src/Encoder_Opus.cpp
index 372d84e0..5fbe5794 100644
--- a/src/Encoder_Opus.cpp
+++ b/src/Encoder_Opus.cpp
@@ -36,6 +36,10 @@ OpusEncoder::OpusEncoder(void)
{
throw "Error initializing Opus encoder. Tool 'opusenc.exe' is not registred!";
}
+
+ m_configOptimizeFor = 0;
+ m_configEncodeComplexity = 10;
+ m_configFrameSize = 3;
}
OpusEncoder::~OpusEncoder(void)
@@ -44,11 +48,11 @@ OpusEncoder::~OpusEncoder(void)
bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag)
{
+ const unsigned int fileDuration = metaInfo.fileDuration();
+
QProcess process;
QStringList args;
- args << "--music"; //TODO: Make other optimizations available!
-
switch(m_configRCMode)
{
case SettingsModel::VBRMode:
@@ -65,6 +69,40 @@ bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
break;
}
+ switch(m_configOptimizeFor)
+ {
+ case 0:
+ args << "--music";
+ break;
+ case 1:
+ args << "--speech";
+ break;
+ }
+
+ args << "--comp" << QString::number(m_configEncodeComplexity);
+
+ switch(m_configFrameSize)
+ {
+ case 0:
+ args << "--framesize" << "2.5";
+ break;
+ case 1:
+ args << "--framesize" << "5";
+ break;
+ case 2:
+ args << "--framesize" << "10";
+ break;
+ case 3:
+ args << "--framesize" << "20";
+ break;
+ case 4:
+ args << "--framesize" << "40";
+ break;
+ case 5:
+ args << "--framesize" << "60";
+ break;
+ }
+
args << QString("--bitrate") << QString::number(qMax(0, qMin(500, m_configBitrate * 8)));
if(!metaInfo.fileName().isEmpty()) args << "--title" << metaInfo.fileName();
@@ -89,10 +127,7 @@ bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
bool bAborted = false;
int prevProgress = -1;
- QRegExp regExp("\\[(-|\\\\|/|\\|)\\]");
-
- //The Opus encoder doesn't flus it's status updates :-[
- emit statusUpdated(20 + (QUuid::createUuid().data1 % 60));
+ QRegExp regExp("\\[(-|\\\\|/|\\|)\\]\\s*(\\d+):(\\d+):(\\d+)");
while(process.state() != QProcess::NotRunning)
{
@@ -118,12 +153,19 @@ bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
QString text = QString::fromUtf8(line.constData()).simplified();
if(regExp.lastIndexIn(text) >= 0)
{
- bool ok = false;
- int progress = regExp.cap(1).toInt(&ok);
- if(ok && (progress > prevProgress))
+ bool ok[3] = {false, false, false};
+ int h = regExp.cap(2).toInt(&ok[0]);
+ int m = regExp.cap(3).toInt(&ok[1]);
+ int s = regExp.cap(4).toInt(&ok[2]);
+ if(ok[0] && ok[1] && ok[2] && (fileDuration > 0))
{
- emit statusUpdated(progress);
- prevProgress = qMin(progress + 2, 99);
+ int filePosition = (h * 3600) + (m * 60) + s;
+ int newProgress = qRound((static_cast(filePosition) / static_cast(fileDuration)) * 100.0);
+ if(newProgress > prevProgress)
+ {
+ emit statusUpdated(newProgress);
+ prevProgress = qMin(newProgress + 2, 99);
+ }
}
}
else if(!text.isEmpty())
@@ -151,6 +193,21 @@ bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
return true;
}
+void OpusEncoder::setOptimizeFor(int optimizeFor)
+{
+ m_configOptimizeFor = qBound(0, optimizeFor, 2);
+}
+
+void OpusEncoder::setEncodeComplexity(int complexity)
+{
+ m_configEncodeComplexity = qBound(0, complexity, 10);
+}
+
+void OpusEncoder::setFrameSize(int frameSize)
+{
+ m_configFrameSize = qBound(0, frameSize, 5);
+}
+
QString OpusEncoder::extension(void)
{
return "opus";
@@ -178,3 +235,8 @@ const unsigned int *OpusEncoder::supportedBitdepths(void)
{
return NULL;
}
+
+const bool OpusEncoder::needsTimingInfo(void)
+{
+ return true;
+}
diff --git a/src/Encoder_Opus.h b/src/Encoder_Opus.h
index 4585e91c..9013f3fa 100644
--- a/src/Encoder_Opus.h
+++ b/src/Encoder_Opus.h
@@ -38,7 +38,16 @@ public:
virtual QString extension(void);
virtual const unsigned int *supportedChannelCount(void);
virtual const unsigned int *supportedBitdepths(void);
+ virtual const bool needsTimingInfo(void);
+
+ //Advanced options
+ virtual void setOptimizeFor(int optimizeFor);
+ virtual void setEncodeComplexity(int complexity);
+ virtual void setFrameSize(int frameSize);
private:
const QString m_binary;
+ int m_configOptimizeFor;
+ int m_configEncodeComplexity;
+ int m_configFrameSize;
};
diff --git a/src/Model_Settings.cpp b/src/Model_Settings.cpp
index 2b59ec35..affc8f06 100644
--- a/src/Model_Settings.cpp
+++ b/src/Model_Settings.cpp
@@ -101,6 +101,9 @@ LAMEXP_MAKE_ID(aftenExponentSearchSize, "AdvancedOptions/Aften/ExponentSearchSiz
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(normalizationFilterEnabled, "AdvancedOptions/VolumeNormalization/Enabled");
LAMEXP_MAKE_ID(normalizationFilterMaxVolume, "AdvancedOptions/VolumeNormalization/MaxVolume");
LAMEXP_MAKE_ID(normalizationFilterEqualizationMode, "AdvancedOptions/VolumeNormalization/EqualizationMode");
@@ -378,6 +381,9 @@ 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(normalizationFilterEnabled, false)
LAMEXP_MAKE_OPTION_I(normalizationFilterMaxVolume, -50)
LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode, 0);
diff --git a/src/Model_Settings.h b/src/Model_Settings.h
index fd8a3a4e..2a3da2fc 100644
--- a/src/Model_Settings.h
+++ b/src/Model_Settings.h
@@ -112,6 +112,9 @@ public:
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(normalizationFilterEnabled);
LAMEXP_MAKE_OPTION_I(normalizationFilterMaxVolume);
LAMEXP_MAKE_OPTION_I(normalizationFilterEqualizationMode);
diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp
index 94dd1f27..db6fa687 100644
--- a/src/Thread_Process.cpp
+++ b/src/Thread_Process.cpp
@@ -183,7 +183,7 @@ void ProcessThread::processFile()
//------------------------------------
if(bSuccess && !m_aborted && IS_WAVE(m_audioFile))
{
- if(m_encoder->supportedSamplerates() || m_encoder->supportedBitdepths() || m_encoder->supportedChannelCount() || !m_filters.isEmpty())
+ if(m_encoder->supportedSamplerates() || m_encoder->supportedBitdepths() || m_encoder->supportedChannelCount() || m_encoder->needsTimingInfo() || !m_filters.isEmpty())
{
m_currentStep = AnalyzeStep;
bSuccess = m_propDetect->detect(sourceFile, &m_audioFile, &m_aborted);
diff --git a/src/Tools.h b/src/Tools.h
index 3163ca75..2135cfc1 100644
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -73,8 +73,8 @@ g_lamexp_tools[] =
{"0c019e13450dc664987e21f4e5489d182be7d6d0d81efbbaaf1c78693dfe3e38e0355b93", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 287603},
{"693dd6f779df70a047c15c2c79350855db38d5b0cd7e529b6877b7c821cfe6addfdd50a4", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287603},
{"291cedb6a1b213330a9cb508f975ee7132a25aa26770ab91cade50109b4ffb81c9bdd09a", CPU_TYPE_X64_ALL, "oggenc2.x64.exe", 287603},
- {"003b59fedf9f68a4b63402ee60031d878a323d9406dc535e612151170199490878142d85", CPU_TYPE_ALL_ALL, "opusdec.exe", 914},
- {"187deb9e43bfd96a6510e1f27c0894f0e8c8fa00285976039d22364ebe633251a1dbd1f7", CPU_TYPE_ALL_ALL, "opusenc.exe", 914},
+ {"73379e0d0d99a0faf0b061aa782ca807b4e6c11ad759e0662c10e197fe79a03f3bc8cbe4", CPU_TYPE_ALL_ALL, "opusdec.exe", 20120721},
+ {"7573a9e4b3d9c9a7e774bc6b2dceb939e097f1175a3afa8f8fe8cd7ee33afdd51d020443", CPU_TYPE_ALL_ALL, "opusenc.exe", 20120721},
{"58c2b8bcff8f27bfa8fab8172b80f5da731221d072c7dba4dd3a3d7d6423490a25dc6760", CPU_TYPE_ALL_ALL, "shorten.exe", 361},
{"017a0f613a962af0620618019b015d5c54bb3c07cf1023e5fdb9502b652367ebbfaaebbc", CPU_TYPE_ALL_ALL, "sox.exe", 1440},
{"48e7f81c024cd17dac0eaeab253aad6b223e72dc80688f7576276b0563209514ff0bb9c8", CPU_TYPE_ALL_ALL, "speexdec.exe", 12},