diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj index 371f174b..beca3774 100644 --- a/LameXP_VS2010.vcxproj +++ b/LameXP_VS2010.vcxproj @@ -347,7 +347,9 @@ del "$(TargetDir)imageformats\q???d4.dll" - + + + @@ -951,20 +953,6 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) - - RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" - - $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) - RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" - - $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) - RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" - - $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) - UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1078,6 +1066,42 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + diff --git a/LameXP_VS2010.vcxproj.filters b/LameXP_VS2010.vcxproj.filters index 35009bbc..9cdd311c 100644 --- a/LameXP_VS2010.vcxproj.filters +++ b/LameXP_VS2010.vcxproj.filters @@ -97,9 +97,6 @@ Generated Files\MOC - - Generated Files\QRC - Generated Files\QRC @@ -316,6 +313,15 @@ Generated Files\MOC + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + @@ -482,9 +488,6 @@ Resources - - Resources - Header Files\Decoders @@ -593,6 +596,15 @@ Header Files\Encoders + + Resources + + + Resources + + + Resources + diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index f842578c..467670b2 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -704,7 +704,7 @@ - + Show Details @@ -1331,9 +1331,9 @@ - - - + + + Check for Updates @@ -1374,13 +1374,13 @@ - + Disable Update Reminder - + Disable Sound Effects @@ -1455,671 +1455,671 @@ - + 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&minus;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! - - - + + + 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: - + 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 - + Low Diskspace Warning - + 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: - + Abort Encoding Process - + Clean Disk Now - + Ignore - + 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. - - - + + + 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 + + + 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! @@ -2541,114 +2541,114 @@ - + 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. - + 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 diff --git a/res/Tools.qrc b/res/Tools.qrc deleted file mode 100644 index f71330d1..00000000 --- a/res/Tools.qrc +++ /dev/null @@ -1,35 +0,0 @@ - - - - tools/aften.i386.exe - tools/aften.sse2.exe - tools/aften.x64.exe - tools/alac.exe - tools/avs2wav.exe - tools/elevator.exe - tools/faad.exe - tools/flac.exe - tools/gpgv.exe - tools/gpgv.gpg - tools/lame.i386.exe - tools/lame.sse2.exe - tools/mac.exe - tools/mediainfo.i386.exe - tools/mediainfo.x64.exe - tools/mpcdec.exe - tools/mpg123.exe - tools/oggdec.exe - tools/oggenc2.i386.exe - tools/oggenc2.sse2.exe - tools/oggenc2.x64.exe - tools/shorten.exe - tools/sox.exe - tools/speexdec.exe - tools/tta.exe - tools/valdec.exe - tools/wget.exe - tools/wma2wav.exe - tools/wupdate.exe - tools/wvunpack.exe - - diff --git a/res/Tools_Decd.qrc b/res/Tools_Decd.qrc new file mode 100644 index 00000000..e333ef06 --- /dev/null +++ b/res/Tools_Decd.qrc @@ -0,0 +1,18 @@ + + + + tools/alac.exe + tools/avs2wav.exe + tools/faad.exe + tools/mac.exe + tools/mpcdec.exe + tools/mpg123.exe + tools/oggdec.exe + tools/shorten.exe + tools/speexdec.exe + tools/tta.exe + tools/valdec.exe + tools/wma2wav.exe + tools/wvunpack.exe + + diff --git a/res/Tools_Encd.qrc b/res/Tools_Encd.qrc new file mode 100644 index 00000000..bbc344c2 --- /dev/null +++ b/res/Tools_Encd.qrc @@ -0,0 +1,14 @@ + + + + tools/aften.i386.exe + tools/aften.sse2.exe + tools/aften.x64.exe + tools/flac.exe + tools/lame.i386.exe + tools/lame.sse2.exe + tools/oggenc2.i386.exe + tools/oggenc2.sse2.exe + tools/oggenc2.x64.exe + + diff --git a/res/Tools_Misc.qrc b/res/Tools_Misc.qrc new file mode 100644 index 00000000..30531991 --- /dev/null +++ b/res/Tools_Misc.qrc @@ -0,0 +1,13 @@ + + + + tools/elevator.exe + tools/gpgv.exe + tools/gpgv.gpg + tools/mediainfo.i386.exe + tools/mediainfo.x64.exe + tools/sox.exe + tools/wget.exe + tools/wupdate.exe + + diff --git a/res/tools/lame.i386.exe b/res/tools/lame.i386.exe index 968caf7d..c087e726 100644 Binary files a/res/tools/lame.i386.exe and b/res/tools/lame.i386.exe differ diff --git a/res/tools/lame.sse2.exe b/res/tools/lame.sse2.exe index 385cd503..4241caa8 100644 Binary files a/res/tools/lame.sse2.exe and b/res/tools/lame.sse2.exe differ diff --git a/src/Config.h b/src/Config.h index fa4694a3..85ed0b64 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,15 +29,15 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 14 -#define VER_LAMEXP_BUILD 659 +#define VER_LAMEXP_PATCH 15 +#define VER_LAMEXP_BUILD 660 /////////////////////////////////////////////////////////////////////////////// // Tools versions /////////////////////////////////////////////////////////////////////////////// #define VER_LAMEXP_TOOL_NEROAAC 1540 -#define VER_LAMEXP_TOOL_FHGAACENC 20110821 +#define VER_LAMEXP_TOOL_FHGAACENC 20110822 /////////////////////////////////////////////////////////////////////////////// // Helper macros (aka: having fun with the C pre-processor) diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index fa15251b..bb7d0621 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -72,8 +72,8 @@ g_lamexp_tools[] = {"446054f9a7f705f1aadc9053ca7b8a86a775499ef159978954ebdea92de056c34f8841f7", CPU_TYPE_ALL_ALL, "flac.exe", 121}, {"dd68d074c5e13a607580f3a24595c0f3882e37211d2ca628f46e6df20fabcc832dad488a", CPU_TYPE_ALL_ALL, "gpgv.exe", 1411}, {"b3fca757b3567dab75c042e62213c231de378ea0fdd7fe29b733417cd5d3d33558452f94", CPU_TYPE_ALL_ALL, "gpgv.gpg", UINT_MAX}, - {"ed5592d76cefd74e700306ccc3781904ce9602b1193747b0e6467a90d799f3cb711812b2", CPU_TYPE_X86_GEN, "lame.i386.exe", 3990}, - {"2402a8d28301060a1f01c83a96f2f0157a01143e58cf2c484b9e9bb4474fbc1344dd6642", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3990}, + {"df995d8a9e4e5fab551d0e3460b9209320714dead70f662929fcc00a4bd72d8a6d23844a", CPU_TYPE_X86_GEN, "lame.i386.exe", 3990}, + {"873faeddc44243b4712cd42dd0bfc3174a07113d245dd834657519ffe5dbd4b1e395ce32", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3990}, {"67933924d68ce319795989648f29e7bd1abaac4ec09c26cbb0ff0d15a67a9df17e257933", CPU_TYPE_ALL_ALL, "mac.exe", 406}, {"743db1020556b1815c4d6e6093a2538ae813d7fed1e11d254b8809ce54795b77fa696bca", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 748}, {"86ed4b4bd445b9d0c6ee094987d87fe5161102b59c8c74d11f294206c13f1a2ce899e100", CPU_TYPE_X64_GEN, "mediainfo.x64.exe", 748},