diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj index dc19d48b..b5ad6f79 100644 --- a/LameXP_VS2010.vcxproj +++ b/LameXP_VS2010.vcxproj @@ -275,6 +275,7 @@ del "$(TargetDir)imageformats\q???d4.dll" + @@ -327,6 +328,7 @@ del "$(TargetDir)imageformats\q???d4.dll" + @@ -451,6 +453,17 @@ del "$(TargetDir)imageformats\q???d4.dll" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" diff --git a/LameXP_VS2010.vcxproj.filters b/LameXP_VS2010.vcxproj.filters index b9af950c..31beb517 100644 --- a/LameXP_VS2010.vcxproj.filters +++ b/LameXP_VS2010.vcxproj.filters @@ -346,6 +346,12 @@ Generated Files\MOC + + Source Files\Encoders + + + Generated Files\MOC + @@ -644,6 +650,9 @@ Header Files\Misc + + Header Files\Encoders + diff --git a/doc/Changelog.html b/doc/Changelog.html index 0e1b564e..66cb1bc0 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -19,6 +19,7 @@ a:visited { color: #0000EE; } Changes between v4.03 and v4.04:
  • Added support for the QAAC Encoder, requires QuickTime v7.7.1 or newer (see FAQ doc for details)
  • Added Chinese and Taiwanese translations, thanks to 456Vv <123@456vv.com> +
  • Added experimental support for dcaenc, created by Alexander E. Patrakov <patrakov@gmail.com>
  • Updated Qt runtime libraries to v4.8.0 (2011-12-15), compiled with MSVC 10.0
  • Updated LAME encoder to v3.99.2 Final (2011-11-18), compiled with ICL 12.1.7 and MSVC 10.0 (details)
  • Updated MediaInfo to v0.7.52 (2011-12-19), compiled with ICL 12.1.6 and MSVC 10.0 diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 3c16d2ef..1f6a3051 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -66,7 +66,7 @@ - + Discard @@ -108,10 +108,10 @@ - + Released under the terms of the GNU Lesser General Public License. @@ -252,46 +252,46 @@ - MediaInfo - Media File Analysis Tool + dcaenc + + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. - SoX - Sound eXchange + MediaInfo - Media File Analysis Tool - GnuPG - The GNU Privacy Guard + SoX - Sound eXchange - GNU Wget - Software for retrieving files using HTTP + GnuPG - The GNU Privacy Guard - Silk Icons - Over 700 icons in PNG format + GNU Wget - Software for retrieving files using HTTP - - By Mark James, released under the Creative Commons 'by' License. - - - - + LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. - + About Third-party Software - + n/a @@ -729,7 +729,7 @@ - + Source Files @@ -750,13 +750,13 @@ - + Show Details - + Output Directory @@ -792,7 +792,7 @@ - + Meta Data @@ -833,7 +833,7 @@ - + Compression @@ -873,1373 +873,1378 @@ - + + DCA Enc + + + + Rate Control Method - + Quality-based (VBR) - + Average Bitrate (ABR) - + Constant Bitrate (CBR) - + Quality / Bitrate - + Minimum - + Maximum - - + + Advanced Options - + Bitrate Management (LAME and OggEnc2) - + Enable Bitrate Management - + Minimum (kbps): - + Maximum (kbps): - + LAME Algorithm Quality - + Faster Processing - + Better quality - + Warning: Audio quality will be very poor. Please do <u>not</u> complain about audio quality! - + Warning: Processing speed will be very slow. Please do <u>not</u> complain about processing speed! - + Channel Mode / Sampling Rate - - + + Auto Select (Default) - + Joint Stereo - + Forced Joint Stereo - + Simple - + Dual Mono - + Mono - + MP3 Channel Mode: - + Sampling Rate (Hz): - + 16.000 - + 22.050 - + 24.000 - + 32.000 - + 44.100 - + 48.000 - + Enforce Stereo Downmix of Surround (Multi-Channel) Sources - + AAC Encoder-Options - + Enable 2-Pass Processing (ABR Mode) - + Select AAC Profile: - + Auto Select (Recommended) - + Enforce LC-AAC - + Enforce HE-AAC (AAC + SBR) - + Enforce HE-AAC v2 (AAC + SBR + PS) - + Volume Normalization - + Enable Normalization Filter - + Peak Volume (dB): - + Peak Level - + RMS Level - + None - + Equalization Mode: - + Tone Adjustment - + Adjust Treble (dB): - + Adjust Bass (dB): - + Custom Encoder Parameters - - - - - + + + + + You can enter custom parameters here! - + Lame MP3: - + OggEnc2: - + MPEG-4 AAC: - + FLAC: - + Warning: Custom parameters won't be checked at all. Use them at your own risk !!! - + Aften A/52: - + Multi-Threading - + Choose the number of parallel instances based on the number of CPU cores (Recommended) - + Fewer Instances - + More Instances - + Temp Directory - + Browse... - + Store temporary files in your system's default TEMP directory (Recommended) - + Aften A/52 Options - + Film Light - + Film Standard - + Music Light - + Music Standard - + Speech - + None (Default) - + 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> &nbsp; <a href="#">Show List of Macros</a> - + Rename Pattern: - + Example File Name: - + 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! - + Open File in External Application - + Browse File Location - + Browse Selected Folder - + Bookmark Current Output Folder - + 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 - - + + 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! - - - - + + + + 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! @@ -2533,112 +2538,112 @@ ProcessThread - + Starting... - + Not found! - + The format of this file is NOT supported: - + Container Format: - + Audio Format: - + Unsupported! - + Done. - + Aborted! - + Failed! - + Encoding - + Analyzing - + Filtering - + Decoding - + The source audio file could not be found: - + The source audio file could not be opened for reading: - + The target output directory doesn't exist and could NOT be created: - + The target output directory is NOT writable: - + Unknown File Name - + Unknown Title - + Unknown Artist - + Unknown Album - + Unknown Comment @@ -2689,141 +2694,141 @@ - + Show details for selected job - + Browse Output File Location - + 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: %1 files of %2 completed so far, please wait... - + Creating the playlist file, please wait... - + Process was aborted by the user after %1 file(s)! - + Process was aborted prematurely by the user! - + LameXP - Aborted - + Process was aborted by the user. - + Process finished after %1. - + Error: %1 of %2 files failed. Double-click failed items for detailed information! - + LameXP - Error - + At least one file has failed! - + All files completed successfully. - + LameXP - Done - + 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 290fe7b3..734ccc11 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -87,10 +87,6 @@ Open and patent-free lossless audio compression technology. Offene und patentfreie Technlogie zur verlustfreien Audiokompression. - - By Mark James, released under the Creative Commons 'by' License. - Von Mark James, veröffentlicht unter der Creative Commons 'by' Lizenz. - About Third-party Software Über Drittsoftware @@ -191,10 +187,6 @@ GNU Wget - Software for retrieving files using HTTP GNU Wget - Software für den Datei-Download über HTTP - - Silk Icons - Over 700 icons in PNG format - Silk Icons - Über 700 Symbole im PNG Format - Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left. Hinweise: Diese Demo (Test) Version von LameXP läuft am %1 ab. Noch %2 Tage übrig. @@ -227,6 +219,14 @@ avs2wav - Avisynth to Wave Audio converter avs2wav - Avisynth zu Wave Audio Konverter + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1730,6 +1730,10 @@ Skipping update check this time, please be patient... Update-Überprüfung wird übersprungen, bitte warten... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index 6584986c..0a324fcc 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -87,10 +87,6 @@ Open and patent-free lossless audio compression technology. Tecnología de codificación de audio sin pérdidas, abierta y libre de patentes. - - By Mark James, released under the Creative Commons 'by' License. - Por Mark James, distribuido bajo Licencia Creative Commons. - About Third-party Software Acerca del Software de terceros @@ -167,10 +163,6 @@ GnuPG - The GNU Privacy Guard GnuPG - Guardián de privacidad GNU - - Silk Icons - Over 700 icons in PNG format - Silk Icons - Más de 700 iconos en formato PNG - Nero AAC Reference MPEG-4 Encoder Codificador MPEG-4 Nero AAC @@ -227,6 +219,14 @@ avs2wav - Avisynth to Wave Audio converter avs2wav - Conversor de Avisynth a WAV + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1729,6 +1729,10 @@ Skipping update check this time, please be patient... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index 5ed87c5a..b0392e5f 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -88,10 +88,6 @@ Open and patent-free lossless audio compression technology. Technologie de compression audio sans perte ouverte et libre de brevets. - - By Mark James, released under the Creative Commons 'by' License. - Par Mark James, publié sous licence Creative Commons. - About Third-party Software A propos des logiciels tiers @@ -171,10 +167,6 @@ GnuPG - The GNU Privacy Guard GnuPG - The GNU Privacy Guard - - Silk Icons - Over 700 icons in PNG format - Silk Icons - Plus de 700 icônes au format PNG - Nero AAC Reference MPEG-4 Encoder Encodeur de référence MPEG-4 Nero AAC @@ -231,6 +223,14 @@ avs2wav - Avisynth to Wave Audio converter + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1739,6 +1739,10 @@ Ouvrir le dossier récursivement... Skipping update check this time, please be patient... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 54055631..aad2d054 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -87,10 +87,6 @@ Open and patent-free lossless audio compression technology. Tecnologia di compressione audio libera e non vincolata da brevetti. - - By Mark James, released under the Creative Commons 'by' License. - Di Mark James, rilasciato sotto Licenza 'by' Creative Commons. - About Third-party Software Riguardo Software Terze Parti @@ -167,10 +163,6 @@ GnuPG - The GNU Privacy Guard - - Silk Icons - Over 700 icons in PNG format - - Nero AAC Reference MPEG-4 Encoder @@ -227,6 +219,14 @@ avs2wav - Avisynth to Wave Audio converter + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1730,6 +1730,10 @@ Skipping update check this time, please be patient... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts index 8c43d15a..e850cd51 100644 --- a/etc/Translation/LameXP_KR.ts +++ b/etc/Translation/LameXP_KR.ts @@ -175,14 +175,6 @@ GNU Wget - Software for retrieving files using HTTP GNU Wget - HTTP를 사용하여 파일을 검색하기 위한 소프트웨어 - - Silk Icons - Over 700 icons in PNG format - Silk Icons - PNG 형식의 700 이상의 아이콘 - - - By Mark James, released under the Creative Commons 'by' License. - By Mark James, 크리에이티브 커먼즈 'by' 라이센스 하에 출시됨. - LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. LameXP 전체는 LoRd_MuldeR에게 저작권이 있습니다. LameXP에 사용된 타사 소프트웨어는 각 소프트웨어의 저작자에게 저작권이 있습니다. @@ -227,6 +219,14 @@ avs2wav - Avisynth to Wave Audio converter + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1729,6 +1729,10 @@ Skipping update check this time, please be patient... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 68535b5d..81209870 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -66,7 +66,7 @@ - + Discard Zamknij @@ -108,10 +108,10 @@ - + Released under the terms of the GNU Lesser General Public License. Wydane na warunkach licencji GNU Lesser General Public License. @@ -252,46 +252,46 @@ + dcaenc + + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + + + MediaInfo - Media File Analysis Tool MediaInfo - Narzędzie do analizy plików multimedialnych - + SoX - Sound eXchange SoX - Sound eXchange - + GnuPG - The GNU Privacy Guard GnuPG - GNU Privacy Guard - + GNU Wget - Software for retrieving files using HTTP GNU Wget - Oprogramowanie służące do pobierania plików za pomocą protokołu HTTP - - Silk Icons - Over 700 icons in PNG format - Silk Icons - Ponad 700 ikon w formacie PNG - - - - By Mark James, released under the Creative Commons 'by' License. - Autorem pakietu jest Mark James, wydano na licencji Creative Commons. - - - + LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. Do programu LameXP jako całości, prawa autorskie posiada LoRd_MuldeR. Prawa autorskie oprogramowania firm trzecich należą do autorów poszczególnych programów. - + About Third-party Software Informacje o programach firm trzecich - + n/a n/d @@ -729,7 +729,7 @@ - + Source Files Pliki źródłowe @@ -750,13 +750,13 @@ - + Show Details Pokaż szczegóły - + Output Directory Folder docelowy @@ -792,7 +792,7 @@ - + Meta Data Tagi @@ -833,7 +833,7 @@ - + Compression Kompresja @@ -873,1373 +873,1378 @@ Aften A/52 - + + DCA Enc + + + + Rate Control Method Tryby przepływności bitów - + Quality-based (VBR) Jakość - Zmienny bitrate (VBR) - + Average Bitrate (ABR) Średni bitrate (ABR) - + Constant Bitrate (CBR) Stały bitrate (CBR) - + Quality / Bitrate Jakość/Bitrate - + Minimum Minimalny - + Maximum Maksymalny - - + + Advanced Options Opcje zaawansowane - + Bitrate Management (LAME and OggEnc2) Zarządzanie bitami (LAME i OggEnc2) - + Enable Bitrate Management Włącz zarządzanie bitami - + Minimum (kbps): Minimalny (kbps): - + Maximum (kbps): Maksymalny (kbps): - + LAME Algorithm Quality Jakość algorytmu LAME - + Faster Processing Szybsza kompresja - + Better quality Lepsza jakość - + Warning: Audio quality will be very poor. Please do <u>not</u> complain about audio quality! Ostrzeżnie: Jakość dźwięku będzie bardzo niska. Prosze <b>nie<b> kierować skarg do autora programu! - + Warning: Processing speed will be very slow. Please do <u>not</u> complain about processing speed! Ostrzeżenie: Kompresja może trwać bardzo długo. Prosze <b>nie<b> kierować skarg do autora programu! - + Channel Mode / Sampling Rate Tryb kanałów/Częstotliwość próbkowania - - + + Auto Select (Default) Automatycznie (Domyślnie) - + Joint Stereo Joint Stereo - + Forced Joint Stereo Wymuś Joint Stereo - + Simple Simple - + Dual Mono Dual Mono - + Mono Mono - + MP3 Channel Mode: Tryb kanałów MP3: - + Sampling Rate (Hz): Próbkowanie (Hz): - + 16.000 16.000 - + 22.050 22.050 - + 24.000 24.000 - + 32.000 32.000 - + 44.100 44.100 - + 48.000 48.000 - + Enforce Stereo Downmix of Surround (Multi-Channel) Sources Wymuś miksowanie plików wielokanałowych do stereo - + AAC Encoder-Options Opcje kodera AAC - + Enable 2-Pass Processing (ABR Mode) Włącz kompresję dwuprzebiegową (w trybie ABR) - + Select AAC Profile: Wybierz profil AAC: - + Auto Select (Recommended) Automatyczny (Zalecane) - + Enforce LC-AAC Wymuś LC-AAC - + Enforce HE-AAC (AAC + SBR) Wymuś HE-AAC (AAC + SBR) - + Enforce HE-AAC v2 (AAC + SBR + PS) Wymuś HE-AAC v2 (AAC + SBR + PS) - + Volume Normalization Normalizacja dźwięku - + Enable Normalization Filter Włącz filtr normalizacji - + Peak Volume (dB): Najwyższa głośność (dB): - + Peak Level - + RMS Level - + None - + Equalization Mode: Tryb korekcji: - + Tone Adjustment Zmiana tonów - + Adjust Treble (dB): Zmień tony wysokie (dB): - + Adjust Bass (dB): Zmień tony niskie (dB): - + Custom Encoder Parameters Własne parametry kodowania - - - - - + + + + + You can enter custom parameters here! Tutaj możesz wpisać własne parametry kodowania! - + Lame MP3: Lame MP3: - + OggEnc2: OggEnc2: - + MPEG-4 AAC: MPEG-4 AAC: - + FLAC: FLAC: - + Warning: Custom parameters won't be checked at all. Use them at your own risk !!! Ostrzeżenie: Włąśne parametry kompresji nie będą weryfikowane. Używasz je na własne ryzyko!!! - + Aften A/52: Aften A/52: - + Multi-Threading Wielowątkowość - + Choose the number of parallel instances based on the number of CPU cores (Recommended) Wybierz ilość równoległych kodowań na podstawie ilości wątków procesora (Zalecane) - + Fewer Instances Mniej - + More Instances Więcej - + Temp Directory Folder tymczasowy - + Browse... Wybierz... - + Store temporary files in your system's default TEMP directory (Recommended) Zapisuj pliki tymczasowe w systemowej lokalizacji TEMP (Zalecane) - + Aften A/52 Options Opcje A/52 - + Film Light - + Film Standard - + Music Light - + Music Standard - + Speech Mowa - + None (Default) Żadna (Domyślnie) - + Auto Select Automatycznie - + 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 Files Zmieniaj nazwy plików - + <a href="reset">Reset</a> &nbsp; <a href="#">Show List of Macros</a> <a href="reset">Resetuj</a> &nbsp; <a href="#">Pokaż listę makr</a> - + Rename Pattern: Wzór wyjściowy: - + Example File Name: Przykładowa nazwa pliku: - + Reset Advanced Options Resetuj opcje zaawansowane - + Encode Now! Kompresuj! - - + + About... Info... - + Exit Program Wyjdź z programu - + File Plik - + ? ? - + View Widok - + Style Styl - + Language Język - + Tools Narzędzia - + Configuration Konfiguracja - + Quit Zamknij - + Open File(s)... Otwórz plik(i)... - - + + Visit Official Web-Site Odwiedź oficjalną stronę - - - - + + + + Check for Updates Sprawdź aktualizacje - + Open Folder... Otwórz folder... - + Clear All Wyczyść wszystko - + Plastique Plastique - + Cleanlooks Cleanlooks - + Windows Vista ("Aero") Windows Vista ("Aero") - + Windows Classic Windows Classic - + Windows XP ("Luna") Windows XP ("Luna") - - + + Disable Update Reminder Wyłącz przypominanie o aktualizacji - - + + Disable Sound Effects Wyłącz efekty dźwiękowe - + Install WMA Decoder Zainstaluj Dekoder WMA - + Disable Nero AAC Notifications Wyłącz powiadomienia Nero AAC - + Show DropBox Pokaż DropBoxa - + From File... Z pliku... - + Encode! Kompresuj! - + Disable Shell Integration Wyłącz integrację z systemem - + Frequently Asked Questions Pytania i Odpowiedzi - + Changelog Lista zmian - + Translator's Guide Przewodnik tłumacza - + Help && Support Pomoc i Wsparcie - + Open Folder Recursively... Otwórz folder rekurencyjnie... - + Check for Beta Updates Sprawdzaj czy jest Beta - + Import Cue Sheet Importuj plik Cue - + Disable Slow Startup Notifications Wyłącz powiadomienia o powolnym starcie - + Hibernate Computer On Shutdown - + Adding file(s), please wait... Dodawanie plików, prosze czekać... - - + + Access Denied Dostę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 Files Pliki 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 Sheet Cue 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 Rejected Pliki 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 Application Otwórz plik w zewnętrznym programie - + Browse File Location Otwórz lokalizację pliku - + Browse Selected Folder Otwórz wybrany folder - + Bookmark Current Output Folder Zapamiętaj wybrany folder - + License Declined Licencja 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 - Expired LameXP - 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 Program Wyjdź z programu - + 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! Prosze sprawdzić dokument %1 w celu dalszych szcegółów i rozwiązań! - + Slow Startup Powolny start - - - - - - + + + + + + Discard Zamknij - - + + Don't Show Again Nie pokazuj ponownie - + Urgent Update Waż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 Reminder Powiadomienie 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? - + Postpone Przełóż - + 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/a n/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 Outdated Koder 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 Disabled Wsparcie dla AAC wyłączone - - - + + + LameXP LameXP - + You must add at least one file to the list before proceeding! Powinienieś dodać przynajmniej jeden plik do listy aby zacząć działać! - + Not Found Nie znaleziono - + Your currently selected TEMP folder does not exist anymore: Wybrany przez Ciebie folder tymczasowy TEMP już nie istnieje: - + Restore Default Przywróć domyślne - + Cancel Anuluj - + Low Diskspace Warning Ostrzeż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 VERSION - + (Hint: Please ignore the name of the downloaded ZIP file and check the included 'changelog.txt' instead!) - + 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 Process Przerwij proces kompresji - + Clean Disk Now Wykonaj oczyszczanie dysku - - + + Ignore Ignoruj - + Skipping update check this time, please be patient... - + Low Diskspace Mał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 Translation Zaladuj plik językowy - + Translation Files Pliki językowe - + Do you really want to disable the update reminder? Czy na pewno chcesz wyłączyć przypominanie o aktualizacjach? - - - - - - - + + + + + + + Yes Tak - - - - - - - + + + + + + + No Nie - + 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 Effects Efekty 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 Notifications Powiadomienia 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 Notifications Powiadomienia 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 Sheet Otwórz plik Cue Sheet - - + + Cue Sheet File Plik Cue Sheet - - - + + + Beta Updates Aktualizacje 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 Now Sprawdź 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 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 Integracja 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 Folder Dodaj folder - - + + New Folder Nowy folder - + Enter the name of the new folder: Wprowadź nazwę nowego folderu: - + Failed to create folder Utworzenie 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! - - - - + + + + Quality Level %1 Poziom jakości %1 - - - + + + Compression %1 Kompresja %1 - - - + + + Uncompressed Nieskompresowany - + Best Quality (Very Slow) Najlepsza jakość (Bardzo wolno) - + High Quality (Recommended) Wysoka jakość (Zalecane) - + Average Quality (Default) Średnia jakość (Domyślnie) - + Low Quality (Fast) Niska jakość (Szybko) - + Poor Quality (Very Fast) Najniższa jakość (Bardzo szybko) - + File name without extension Nazwa pliku bez rozszerzenia - + Track number with leading zero Numer ścieżki z zerem na początku - + Track title Nazwa ścieżki - + Artist name Nazwa Artysty - + Album name Nazwa Albumu - + Year with (at least) four digits Rok z (przynajmniej) czterema cyframi - + Comment Komentarz - + Characters forbidden in file names: Zabronione znaki w nazwach plików: - + Rename Macros Zmień nazwy makr - + %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 Running Już działa - + LameXP is already running, please use the running instance! LameXP już działa, przejdź do działającego programu! @@ -2533,112 +2538,112 @@ ProcessThread - + Starting... Rozpoczynanie... - + Not found! Nie znaleziono! - + The format of this file is NOT supported: Format tego pliku NIE jest obsługiwany: - + Container Format: Format kontenera: - + Audio Format: Format dźwięku: - + Unsupported! Nieobsługiwany! - + Done. Zrobione. - + Aborted! Przerwane! - + Failed! Niepowodzenie! - + Encoding Kompresowanie - + Analyzing - + Filtering Filtrowanie - + Decoding Dekodowanie - + The source audio file could not be found: Źródłowy plik dźwiękowy nie został odnaleziony: - + The source audio file could not be opened for reading: Źródłowy plik dźwiękowy nie mógł zostać otworzony: - + The target output directory doesn't exist and could NOT be created: Lokalizacja docelowa nie istnieje lu NIE mogła zostać utworzona: - + The target output directory is NOT writable: Nie można zapisać do lokalizacji docelowej: - + Unknown File Name Nieznana nazwa pliku - + Unknown Title Nieznany Tytuł - + Unknown Artist Nieznany Artysta - + Unknown Album Nieznany Album - + Unknown Comment Nieznany Komentarz @@ -2689,141 +2694,141 @@ Powrót - + Show details for selected job Pokaż szczegóły wybranego zadania - + Browse Output File Location Wybierz lokalizację dla plików wyjściowych - + Encoding Files Kompresowanie 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: %1 files of %2 completed so far, please wait... Kompresja: Prosze czekać, jak dotąd wykonano %1 z %2 plików... - + Creating the playlist file, please wait... Tworzenie pliku playlisty, prosze czekać... - + Process was aborted by the user after %1 file(s)! Proces został przerwany przez użytkownika po wykonaniu %1 plików! - + Process was aborted prematurely by the user! Proces został przedwcześnie zakończony przez użytkownika! - + LameXP - Aborted LameXP - Przerwano - + Process was aborted by the user. Proces został przerwany przez użytkownika. - + Process finished after %1. - + Error: %1 of %2 files failed. Double-click failed items for detailed information! Błąd: %1 z %2 plików nie zostało skompresowanych. Kliknij dwukrotnie na plik aby zobaczyć szczegóły! - + LameXP - Error LameXP - 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 - Done LameXP - Zrobione - + Playlist creation failed Tworzenie 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 Shutdown Anuluj wyłączenie komputera - + hour(s) - - + + minute(s) - - + + second(s) - + millisecond(s) diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts index 393faf49..1a44da5a 100644 --- a/etc/Translation/LameXP_RU.ts +++ b/etc/Translation/LameXP_RU.ts @@ -175,14 +175,6 @@ GNU Wget - Software for retrieving files using HTTP - - Silk Icons - Over 700 icons in PNG format - - - - By Mark James, released under the Creative Commons 'by' License. - - LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. LameXP защищена авторским правом LoRd_MuldeR. Авторское право на программное обеспечение третьих сторон, используемое в LameXP, принадлежит индивидуальным авторам. @@ -227,6 +219,14 @@ avs2wav - Avisynth to Wave Audio converter + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1735,6 +1735,10 @@ Skipping update check this time, please be patient... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts index 90f89e33..8d491415 100644 --- a/etc/Translation/LameXP_TW.ts +++ b/etc/Translation/LameXP_TW.ts @@ -87,10 +87,6 @@ Open and patent-free lossless audio compression technology. 打開和專利自由無損音頻壓縮技術. - - By Mark James, released under the Creative Commons 'by' License. - By Mark James,在知識共享的許可證發布. - About Third-party Software 關于第三方軟件 @@ -163,10 +159,6 @@ GnuPG - The GNU Privacy Guard GnuPG - GNU 隱私 - - Silk Icons - Over 700 icons in PNG format - Silk Icons - 超過 700 圖標 PNG 格式 - Nero AAC Reference MPEG-4 Encoder Nero AAC 參考 MPEG-4 編碼器 @@ -227,6 +219,14 @@ LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. LameXP是作為一個整體版權由 LoRd_MuldeR 保護.在 LameXP 中使用的第三方軟件作著權屬于第三方. + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1729,6 +1729,10 @@ Skipping update check this time, please be patient... 跳過檢查更新的時間,請耐心等待... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts index 047ab66a..afbe2c5c 100644 --- a/etc/Translation/LameXP_UK.ts +++ b/etc/Translation/LameXP_UK.ts @@ -175,14 +175,6 @@ GNU Wget - Software for retrieving files using HTTP GNU Wget - Software for retrieving files using HTTP - - Silk Icons - Over 700 icons in PNG format - Silk Icons - Більш ніж 700 іконок в форматі PNG - - - By Mark James, released under the Creative Commons 'by' License. - Створено Mark James, випущено під ліцензією Creative Commons 'by' License. - LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. Всі права на LameXP належать LoRd_MuldeR. Права на стороннє ПЗ, що використовується в LameXP, належать авторам цього ПЗ. @@ -228,6 +220,14 @@ avs2wav - Avisynth to Wave Audio converter avs2wav - аудіоконвертер у Wave аудіо, що базується на Avisynth + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1730,6 +1730,10 @@ Skipping update check this time, please be patient... + + DCA Enc + + MetaInfo diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index f267ec92..bb935486 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -87,10 +87,6 @@ Open and patent-free lossless audio compression technology. 打开和专利自由无损音频压缩技术. - - By Mark James, released under the Creative Commons 'by' License. - By Mark James,在知识共享的许可证发布. - About Third-party Software 关于第三方软件 @@ -163,10 +159,6 @@ GnuPG - The GNU Privacy Guard GnuPG - GNU 隐私 - - Silk Icons - Over 700 icons in PNG format - Silk Icons - 超过 700 图标 PNG 格式 - Nero AAC Reference MPEG-4 Encoder Nero AAC 参考 MPEG-4 编码器 @@ -227,6 +219,14 @@ LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors. LameXP是作为一个整体版权由 LoRd_MuldeR 保护.在 LameXP 中使用的第三方软件作著权属于第三方. + + dcaenc + + + + Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL. + + AudioFileModel @@ -1729,6 +1729,10 @@ Skipping update check this time, please be patient... 跳过检查更新的时间,请耐心等待... + + DCA Enc + + MetaInfo diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 2c8e2bf0..584cefc4 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -770,7 +770,7 @@ - + Wave (PCM) @@ -807,6 +807,13 @@ + + + + DCA Enc + + + @@ -1099,8 +1106,8 @@ 0 0 - 602 - 1515 + 604 + 1524 diff --git a/res/Tools_Encd.qrc b/res/Tools_Encd.qrc index bbc344c2..4c59c0a7 100644 --- a/res/Tools_Encd.qrc +++ b/res/Tools_Encd.qrc @@ -4,6 +4,7 @@ tools/aften.i386.exe tools/aften.sse2.exe tools/aften.x64.exe + tools/dcaenc.exe tools/flac.exe tools/lame.i386.exe tools/lame.sse2.exe diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 27582946..fd2c6529 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 14ec4ce5..a49b90cd 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 03e753b4..7ad42a05 100644 Binary files a/res/localization/LameXP_FR.qm and b/res/localization/LameXP_FR.qm differ diff --git a/res/localization/LameXP_IT.qm b/res/localization/LameXP_IT.qm index 983260cc..a8491a0a 100644 Binary files a/res/localization/LameXP_IT.qm and b/res/localization/LameXP_IT.qm differ diff --git a/res/localization/LameXP_KR.qm b/res/localization/LameXP_KR.qm index a2327ea2..e98c8642 100644 Binary files a/res/localization/LameXP_KR.qm and b/res/localization/LameXP_KR.qm differ diff --git a/res/localization/LameXP_PL.qm b/res/localization/LameXP_PL.qm index 95066207..187c3cb2 100644 Binary files a/res/localization/LameXP_PL.qm and b/res/localization/LameXP_PL.qm differ diff --git a/res/localization/LameXP_TW.qm b/res/localization/LameXP_TW.qm index 191a92f5..2a00b429 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 82d415f3..d0d29f3f 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 509e540e..af6bdb6b 100644 Binary files a/res/localization/LameXP_ZH.qm and b/res/localization/LameXP_ZH.qm differ diff --git a/src/Config.h b/src/Config.h index 2d238b01..12f2d8f6 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,8 +29,8 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 11 -#define VER_LAMEXP_BUILD 827 +#define VER_LAMEXP_PATCH 12 +#define VER_LAMEXP_BUILD 830 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp index 1a3b5ee0..8e47f89a 100644 --- a/src/Dialog_About.cpp +++ b/src/Dialog_About.cpp @@ -430,7 +430,7 @@ void AboutDialog::showMoreAbout(void) ); moreAboutText += QString ( - "
    " + "
    " /* ----------------------------------------- */ ); moreAboutText += makeToolText ( @@ -475,6 +475,13 @@ void AboutDialog::showMoreAbout(void) "http://forum.doom9.org/showthread.php?t=70882" ); moreAboutText += makeToolText + ( + tr("dcaenc"), + "dcaenc.exe", "????-??-??", + tr("Copyright (c) 2008-2011 Alexander E. Patrakov. Distributed under the LGPL."), + "http://gitorious.org/dtsenc/dtsenc/trees/master" + ); + moreAboutText += makeToolText ( tr("MediaInfo - Media File Analysis Tool"), "mediainfo.exe", "v?.?.??", @@ -502,13 +509,13 @@ void AboutDialog::showMoreAbout(void) tr("Released under the terms of the GNU Lesser General Public License."), "http://www.gnu.org/software/wget/" ); - moreAboutText += makeToolText - ( - tr("Silk Icons - Over 700 icons in PNG format"), - QString(), "v1.3", - tr("By Mark James, released under the Creative Commons 'by' License."), - "http://www.famfamfam.com/lab/icons/silk/" - ); + //moreAboutText += makeToolText + //( + // tr("Silk Icons - Over 700 icons in PNG format"), + // QString(), "v1.3", + // tr("By Mark James, released under the Creative Commons 'by' License."), + // "http://www.famfamfam.com/lab/icons/silk/" + //); moreAboutText += QString("
 %1
").arg ( NOBR(tr("LameXP as a whole is copyrighted by LoRd_MuldeR. The copyright of third-party software used in LameXP belongs to the individual authors.")) diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index 282a3483..64ff5897 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -203,6 +203,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S m_encoderButtonGroup->addButton(radioButtonEncoderAAC, SettingsModel::AACEncoder); m_encoderButtonGroup->addButton(radioButtonEncoderAC3, SettingsModel::AC3Encoder); m_encoderButtonGroup->addButton(radioButtonEncoderFLAC, SettingsModel::FLACEncoder); + m_encoderButtonGroup->addButton(radioButtonEncoderDCA, SettingsModel::DCAEncoder); m_encoderButtonGroup->addButton(radioButtonEncoderPCM, SettingsModel::PCMEncoder); m_modeButtonGroup = new QButtonGroup(this); m_modeButtonGroup->addButton(radioButtonModeQuality, SettingsModel::VBRMode); @@ -214,6 +215,7 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S radioButtonEncoderAAC->setChecked((m_settings->compressionEncoder() == SettingsModel::AACEncoder) && (m_neroEncoderAvailable || m_fhgEncoderAvailable || m_qaacEncoderAvailable)); radioButtonEncoderAC3->setChecked(m_settings->compressionEncoder() == SettingsModel::AC3Encoder); radioButtonEncoderFLAC->setChecked(m_settings->compressionEncoder() == SettingsModel::FLACEncoder); + radioButtonEncoderDCA->setChecked(m_settings->compressionEncoder() == SettingsModel::DCAEncoder); radioButtonEncoderPCM->setChecked(m_settings->compressionEncoder() == SettingsModel::PCMEncoder); radioButtonModeQuality->setChecked(m_settings->compressionRCMode() == SettingsModel::VBRMode); radioButtonModeAverageBitrate->setChecked(m_settings->compressionRCMode() == SettingsModel::ABRMode); @@ -1217,6 +1219,7 @@ void MainWindow::encodeButtonClicked(void) case SettingsModel::AACEncoder: case SettingsModel::AC3Encoder: case SettingsModel::FLACEncoder: + case SettingsModel::DCAEncoder: case SettingsModel::PCMEncoder: break; default: @@ -2481,6 +2484,13 @@ void MainWindow::updateEncoder(int id) radioButtonConstBitrate->setEnabled(true); sliderBitrate->setEnabled(true); break; + case SettingsModel::DCAEncoder: + radioButtonModeQuality->setEnabled(false); + radioButtonModeAverageBitrate->setEnabled(false); + radioButtonConstBitrate->setEnabled(true); + radioButtonConstBitrate->setChecked(true); + sliderBitrate->setEnabled(true); + break; default: radioButtonModeQuality->setEnabled(true); radioButtonModeAverageBitrate->setEnabled(true); @@ -2557,6 +2567,10 @@ void MainWindow::updateRCMode(int id) sliderBitrate->setMinimum(0); sliderBitrate->setMaximum(8); break; + case SettingsModel::DCAEncoder: + sliderBitrate->setMinimum(1); + sliderBitrate->setMaximum(192); + break; case SettingsModel::PCMEncoder: sliderBitrate->setMinimum(0); sliderBitrate->setMaximum(2); @@ -2638,6 +2652,9 @@ void MainWindow::updateBitrate(int value) case SettingsModel::AC3Encoder: labelBitrate->setText(QString("%1 kbps").arg(SettingsModel::ac3Bitrates[value])); break; + case SettingsModel::DCAEncoder: + labelBitrate->setText(QString("%1 kbps").arg(value * 32)); + break; case SettingsModel::PCMEncoder: labelBitrate->setText(tr("Uncompressed")); break; diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp index ed875d47..21ae2493 100644 --- a/src/Dialog_Processing.cpp +++ b/src/Dialog_Processing.cpp @@ -31,13 +31,14 @@ #include "Thread_RAMObserver.h" #include "Thread_DiskObserver.h" #include "Dialog_LogView.h" -#include "Encoder_MP3.h" -#include "Encoder_Vorbis.h" #include "Encoder_AAC.h" #include "Encoder_AAC_FHG.h" #include "Encoder_AAC_QAAC.h" #include "Encoder_AC3.h" +#include "Encoder_DCA.h" #include "Encoder_FLAC.h" +#include "Encoder_MP3.h" +#include "Encoder_Vorbis.h" #include "Encoder_Wave.h" #include "Filter_Downmix.h" #include "Filter_Normalize.h" @@ -638,10 +639,66 @@ void ProcessingDialog::startNextJob(void) m_currentFile++; AudioFileModel currentFile = updateMetaInfo(m_pendingJobs.takeFirst()); - AbstractEncoder *encoder = NULL; bool nativeResampling = false; //Create encoder instance + AbstractEncoder *encoder = makeEncoder(&nativeResampling); + + //Create processing thread + ProcessThread *thread = new ProcessThread + ( + currentFile, + (m_settings->outputToSourceDir() ? QFileInfo(currentFile.filePath()).absolutePath() : m_settings->outputDir()), + (m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2()), + encoder, + m_settings->prependRelativeSourcePath() && (!m_settings->outputToSourceDir()) + ); + + //Add audio filters + if(m_settings->forceStereoDownmix()) + { + thread->addFilter(new DownmixFilter()); + } + if((m_settings->samplingRate() > 0) && !nativeResampling) + { + if(SettingsModel::samplingRates[m_settings->samplingRate()] != currentFile.formatAudioSamplerate() || currentFile.formatAudioSamplerate() == 0) + { + thread->addFilter(new ResampleFilter(SettingsModel::samplingRates[m_settings->samplingRate()])); + } + } + if((m_settings->toneAdjustBass() != 0) || (m_settings->toneAdjustTreble() != 0)) + { + thread->addFilter(new ToneAdjustFilter(m_settings->toneAdjustBass(), m_settings->toneAdjustTreble())); + } + if(m_settings->normalizationFilterEnabled()) + { + thread->addFilter(new NormalizeFilter(m_settings->normalizationFilterMaxVolume(), m_settings->normalizationFilterEqualizationMode())); + } + if(m_settings->renameOutputFilesEnabled() && (!m_settings->renameOutputFilesPattern().simplified().isEmpty())) + { + thread->setRenamePattern(m_settings->renameOutputFilesPattern()); + } + + m_threadList.append(thread); + m_allJobs.append(thread->getId()); + + //Connect thread signals + connect(thread, SIGNAL(finished()), this, SLOT(doneEncoding()), Qt::QueuedConnection); + connect(thread, SIGNAL(processStateInitialized(QUuid,QString,QString,int)), m_progressModel, SLOT(addJob(QUuid,QString,QString,int)), Qt::QueuedConnection); + connect(thread, SIGNAL(processStateChanged(QUuid,QString,int)), m_progressModel, SLOT(updateJob(QUuid,QString,int)), Qt::QueuedConnection); + connect(thread, SIGNAL(processStateFinished(QUuid,QString,bool)), this, SLOT(processFinished(QUuid,QString,bool)), Qt::QueuedConnection); + connect(thread, SIGNAL(processMessageLogged(QUuid,QString)), m_progressModel, SLOT(appendToLog(QUuid,QString)), Qt::QueuedConnection); + + //Give it a go! + m_runningThreads++; + thread->start(); +} + +AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling) +{ + AbstractEncoder *encoder = NULL; + *nativeResampling = false; + switch(m_settings->compressionEncoder()) { case SettingsModel::MP3Encoder: @@ -657,7 +714,7 @@ void ProcessingDialog::startNextJob(void) if(m_settings->samplingRate() > 0) { mp3Encoder->setSamplingRate(SettingsModel::samplingRates[m_settings->samplingRate()]); - nativeResampling = true; + *nativeResampling = true; } mp3Encoder->setChannelMode(m_settings->lameChannelMode()); mp3Encoder->setCustomParams(m_settings->customParametersLAME()); @@ -676,7 +733,7 @@ void ProcessingDialog::startNextJob(void) if(m_settings->samplingRate() > 0) { vorbisEncoder->setSamplingRate(SettingsModel::samplingRates[m_settings->samplingRate()]); - nativeResampling = true; + *nativeResampling = true; } vorbisEncoder->setCustomParams(m_settings->customParametersOggEnc()); encoder = vorbisEncoder; @@ -736,6 +793,14 @@ void ProcessingDialog::startNextJob(void) encoder = flacEncoder; } break; + case SettingsModel::DCAEncoder: + { + DCAEncoder *dcaEncoder = new DCAEncoder(); + dcaEncoder->setBitrate(m_settings->compressionBitrate()); + dcaEncoder->setRCMode(m_settings->compressionRCMode()); + encoder = dcaEncoder; + } + break; case SettingsModel::PCMEncoder: { WaveEncoder *waveEncoder = new WaveEncoder(); @@ -748,54 +813,7 @@ void ProcessingDialog::startNextJob(void) throw "Unsupported encoder!"; } - //Create processing thread - ProcessThread *thread = new ProcessThread - ( - currentFile, - (m_settings->outputToSourceDir() ? QFileInfo(currentFile.filePath()).absolutePath() : m_settings->outputDir()), - (m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2()), - encoder, - m_settings->prependRelativeSourcePath() && (!m_settings->outputToSourceDir()) - ); - - //Add audio filters - if(m_settings->forceStereoDownmix()) - { - thread->addFilter(new DownmixFilter()); - } - if((m_settings->samplingRate() > 0) && !nativeResampling) - { - if(SettingsModel::samplingRates[m_settings->samplingRate()] != currentFile.formatAudioSamplerate() || currentFile.formatAudioSamplerate() == 0) - { - thread->addFilter(new ResampleFilter(SettingsModel::samplingRates[m_settings->samplingRate()])); - } - } - if((m_settings->toneAdjustBass() != 0) || (m_settings->toneAdjustTreble() != 0)) - { - thread->addFilter(new ToneAdjustFilter(m_settings->toneAdjustBass(), m_settings->toneAdjustTreble())); - } - if(m_settings->normalizationFilterEnabled()) - { - thread->addFilter(new NormalizeFilter(m_settings->normalizationFilterMaxVolume(), m_settings->normalizationFilterEqualizationMode())); - } - if(m_settings->renameOutputFilesEnabled() && (!m_settings->renameOutputFilesPattern().simplified().isEmpty())) - { - thread->setRenamePattern(m_settings->renameOutputFilesPattern()); - } - - m_threadList.append(thread); - m_allJobs.append(thread->getId()); - - //Connect thread signals - connect(thread, SIGNAL(finished()), this, SLOT(doneEncoding()), Qt::QueuedConnection); - connect(thread, SIGNAL(processStateInitialized(QUuid,QString,QString,int)), m_progressModel, SLOT(addJob(QUuid,QString,QString,int)), Qt::QueuedConnection); - connect(thread, SIGNAL(processStateChanged(QUuid,QString,int)), m_progressModel, SLOT(updateJob(QUuid,QString,int)), Qt::QueuedConnection); - connect(thread, SIGNAL(processStateFinished(QUuid,QString,bool)), this, SLOT(processFinished(QUuid,QString,bool)), Qt::QueuedConnection); - connect(thread, SIGNAL(processMessageLogged(QUuid,QString)), m_progressModel, SLOT(appendToLog(QUuid,QString)), Qt::QueuedConnection); - - //Give it a go! - m_runningThreads++; - thread->start(); + return encoder; } void ProcessingDialog::writePlayList(void) diff --git a/src/Dialog_Processing.h b/src/Dialog_Processing.h index 2deb92e3..21e51566 100644 --- a/src/Dialog_Processing.h +++ b/src/Dialog_Processing.h @@ -36,6 +36,7 @@ class SettingsModel; class CPUObserverThread; class RAMObserverThread; class DiskObserverThread; +class AbstractEncoder; enum shutdownFlag_t { @@ -79,6 +80,7 @@ protected: private: void setCloseButtonEnabled(bool enabled); void startNextJob(void); + AbstractEncoder *makeEncoder(bool *nativeResampling); AudioFileModel updateMetaInfo(const AudioFileModel &audioFile); void writePlayList(void); bool shutdownComputer(void); diff --git a/src/Encoder_DCA.cpp b/src/Encoder_DCA.cpp new file mode 100644 index 00000000..91bfd1cc --- /dev/null +++ b/src/Encoder_DCA.cpp @@ -0,0 +1,152 @@ +/////////////////////////////////////////////////////////////////////////////// +// LameXP - Audio Encoder Front-End +// Copyright (C) 2004-2011 LoRd_MuldeR +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// http://www.gnu.org/licenses/gpl-2.0.txt +/////////////////////////////////////////////////////////////////////////////// + +#include "Encoder_DCA.h" + +#include "Global.h" +#include "Model_Settings.h" + +#include +#include +#include + +DCAEncoder::DCAEncoder(void) +: + m_binary(lamexp_lookup_tool("dcaenc.exe")) +{ + if(m_binary.isEmpty()) + { + throw "Error initializing DCA encoder. Tool 'dcaenc.exe' is not registred!"; + } +} + +DCAEncoder::~DCAEncoder(void) +{ +} + +bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInfo, const QString &outputFile, volatile bool *abortFlag) +{ + QProcess process; + QStringList args; + + int bitrate = qBound(32, m_configBitrate * 32, 6144); + + args << QDir::toNativeSeparators(sourceFile); + args << QDir::toNativeSeparators(outputFile); + args << QString::number(bitrate); + + if(!startProcess(process, m_binary, args)) + { + return false; + } + + bool bTimeout = false; + bool bAborted = false; + int prevProgress = -1; + + QRegExp regExp("\\[(\\d+)\\.(\\d+)%\\]"); + + while(process.state() != QProcess::NotRunning) + { + if(*abortFlag) + { + process.kill(); + bAborted = true; + emit messageLogged("\nABORTED BY USER !!!"); + break; + } + process.waitForReadyRead(m_processTimeoutInterval); + if(!process.bytesAvailable() && process.state() == QProcess::Running) + { + process.kill(); + qWarning("DCAENC process timed out <-- killing!"); + emit messageLogged("\nPROCESS TIMEOUT !!!"); + bTimeout = true; + break; + } + while(process.bytesAvailable() > 0) + { + QByteArray line = process.readLine(); + 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)) + { + emit statusUpdated(progress); + prevProgress = qMin(progress + 2, 99); + } + } + else if(!text.isEmpty()) + { + emit messageLogged(text); + } + } + } + + process.waitForFinished(); + if(process.state() != QProcess::NotRunning) + { + process.kill(); + process.waitForFinished(-1); + } + + emit statusUpdated(100); + emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode())); + + if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS) + { + return false; + } + + return true; +} + +QString DCAEncoder::extension(void) +{ + return "dts"; +} + +bool DCAEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion) +{ + if(containerType.compare("Wave", Qt::CaseInsensitive) == 0) + { + if(formatType.compare("PCM", Qt::CaseInsensitive) == 0) + { + return true; + } + } + + return false; +} + +const unsigned int *DCAEncoder::supportedSamplerates(void) +{ + static const unsigned int supportedRates[] = {48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, NULL}; + return supportedRates; +} + +const unsigned int *DCAEncoder::supportedBitdepths(void) +{ + static const unsigned int supportedBPS[] = {16, 32, NULL}; + return supportedBPS; +} diff --git a/src/Encoder_DCA.h b/src/Encoder_DCA.h new file mode 100644 index 00000000..a941e21a --- /dev/null +++ b/src/Encoder_DCA.h @@ -0,0 +1,45 @@ +/////////////////////////////////////////////////////////////////////////////// +// LameXP - Audio Encoder Front-End +// Copyright (C) 2004-2011 LoRd_MuldeR +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// http://www.gnu.org/licenses/gpl-2.0.txt +/////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "Encoder_Abstract.h" + +#include + +class DCAEncoder : public AbstractEncoder +{ + Q_OBJECT + +public: + DCAEncoder(void); + ~DCAEncoder(void); + + 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 unsigned int *supportedBitdepths(void); + virtual const unsigned int *supportedSamplerates(void); + +private: + const QString m_binary; + int clipBitrate(int bitrate); +}; diff --git a/src/Model_Settings.h b/src/Model_Settings.h index 19a0fd24..2bc93d48 100644 --- a/src/Model_Settings.h +++ b/src/Model_Settings.h @@ -62,7 +62,8 @@ public: AACEncoder = 2, AC3Encoder = 3, FLACEncoder = 4, - PCMEncoder = 5 + DCAEncoder = 5, + PCMEncoder = 6 }; enum RCMode { diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp index dcc7166f..b7842246 100644 --- a/src/Thread_Process.cpp +++ b/src/Thread_Process.cpp @@ -420,7 +420,7 @@ void ProcessThread::insertDownsampleFilter(void) for(int i = 0; supportedRates[i]; i++) { currentDiff = DIFF(inputRate, supportedRates[i]); - if(currentDiff < minimumDiff) + if((currentDiff < minimumDiff) || ((currentDiff == minimumDiff) && (bestRate < supportedRates[i]))) { bestRate = supportedRates[i]; minimumDiff = currentDiff; @@ -446,7 +446,7 @@ void ProcessThread::insertDownsampleFilter(void) for(int i = 0; supportedBPS[i]; i++) { currentDiff = DIFF(inputBPS, supportedBPS[i]); - if(currentDiff < minimumDiff) + if((currentDiff < minimumDiff) || ((currentDiff == minimumDiff) && (bestBPS < supportedBPS[i]))) { bestBPS = supportedBPS[i]; minimumDiff = currentDiff; diff --git a/src/Tools.h b/src/Tools.h index be872b22..080e621e 100644 --- a/src/Tools.h +++ b/src/Tools.h @@ -56,6 +56,7 @@ g_lamexp_tools[] = {"29da0d3e810bc3e8d2cddb3db452325eefca0d0c1fff1379fa17806ad447752be1b88e2f", CPU_TYPE_X64_ALL, "aften.x64.exe", 8}, {"1cca303fabd889a18fc01c32a7fd861194cfcac60ba63740ea2d7c55d049dbf8f59259fa", CPU_TYPE_ALL_ALL, "alac.exe", 20}, {"6d22d4bbd7ce2162e38f70ac9187bc84eb28233b36ee6c0492d0a6195318782d7f05c444", CPU_TYPE_ALL_ALL, "avs2wav.exe", 13}, + {"d94bea403cbd24a890d91f55a4e4fed47898b21b62de3ba1202da55dc0917187304171f6", CPU_TYPE_ALL_ALL, "dcaenc.exe", 20111222}, {"e53a787d4a0319453f4fe48c3145f190fcce7ac4802e521db908771437f6250746116e6c", CPU_TYPE_ALL_ALL, "elevator.exe", UINT_MAX}, {"9ae98a3fc779f69ee876a3b477fbc35a709ba5066823b2eb62eeb015057c38807e4be51f", CPU_TYPE_ALL_ALL, "faad.exe", 27}, {"446054f9a7f705f1aadc9053ca7b8a86a775499ef159978954ebdea92de056c34f8841f7", CPU_TYPE_ALL_ALL, "flac.exe", 121},