Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Updated OggEnc binary to v2.87 using aoTuV Beta-6 (2011-02-22), compiled with ICL 11.1 and MSVC 9.0.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-02-23 02:19:50 +01:00
parent 950422e63f
commit 442ff4095d
8 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LameXP.vcproj
View File

@ -130,6 +130,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui"" AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui""
PreprocessorDefinitions="WIN32;NDEBUG;_WIN32_WINNT 0x0500;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_NO_DEBUG" PreprocessorDefinitions="WIN32;NDEBUG;_WIN32_WINNT 0x0500;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_NO_DEBUG"
MinimalRebuild="false" MinimalRebuild="false"
@ -155,6 +156,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=""/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'"" AdditionalOptions=""/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'""
AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib Winmm.lib Shlwapi.lib" AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib Winmm.lib Shlwapi.lib"
ShowProgress="2"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories=""$(QTDIR)\lib";"$(QTDIR)\plugins\imageformats"" AdditionalLibraryDirectories=""$(QTDIR)\lib";"$(QTDIR)\plugins\imageformats""
GenerateDebugInformation="false" GenerateDebugInformation="false"
@ -164,6 +166,8 @@
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1"
SetChecksum="true"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -249,6 +253,7 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;" AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib Shlwapi.lib" AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib Shlwapi.lib"
ShowProgress="2"
Version="" Version=""
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\lib&quot;;&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats&quot;" AdditionalLibraryDirectories="&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\lib&quot;;&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats&quot;"
@ -260,6 +265,7 @@
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1" LinkTimeCodeGeneration="1"
SetChecksum="true"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool

7
doc/Changelog.html
View File

@ -3,6 +3,11 @@
<body><tt> <body><tt>
<h3>LameXP - Version History</h3><br> <h3>LameXP - Version History</h3><br>
Changes between v4.00 and v4.01:<br><ul>
<li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6 (2011-02-22), compiled with ICL 11.1 and MSVC 9.0
<li>Updated language files (big "thank you" to all contributors !!!)
</ul><br>
Changes between v3.18 and v4.00:<br><ul> Changes between v3.18 and v4.00:<br><ul>
<li>Complete re-write of LameXP in the C++ programming language <li>Complete re-write of LameXP in the C++ programming language
<li>Switched IDE from Delphi 7.0 to Visual Studio 2008 + Qt Framework v4.7.1 (GNU Toolchain not yet) <li>Switched IDE from Delphi 7.0 to Visual Studio 2008 + Qt Framework v4.7.1 (GNU Toolchain not yet)
@ -17,7 +22,7 @@ Changes between v3.18 and v4.00:<br><ul>
<li>Added an option to prepend the relative source file path to the output file path <li>Added an option to prepend the relative source file path to the output file path
<li>Updated all command-line tools to support Unicode file names, mostly required custom patches <li>Updated all command-line tools to support Unicode file names, mostly required custom patches
<li>Updated LAME encoder to v3.99.0.11 (2011-02-11), compiled with ICL 11.1.065 <li>Updated LAME encoder to v3.99.0.11 (2011-02-11), compiled with ICL 11.1.065
<li>Updated OggEnc v2.87 using libvorbis v1.3.2 (2010-11-06), compiled with ICL 11.1 and MSVC 9.0 <li>Updated Vorbis encoder to v2.87 using libvorbis v1.3.2 (2010-11-06), compiled with ICL 11.1 and MSVC 9.0
<li>Updated mpg123 decoder to v1.13.2 (2011-02-19), compiled with GCC 4.5.2 <li>Updated mpg123 decoder to v1.13.2 (2011-02-19), compiled with GCC 4.5.2
<li>Updated MediaInfo to v0.7.41 (2011-01-24), compiled with ICL 11.1.065 <li>Updated MediaInfo to v0.7.41 (2011-01-24), compiled with ICL 11.1.065
<li>Updated SoX to v14.3.1 (2010-04-11), compiled with MSVC 9.0 <li>Updated SoX to v14.3.1 (2010-04-11), compiled with MSVC 9.0

BIN
res/tools/oggenc2_i386.exe
View File

Binary file not shown.

BIN
res/tools/oggenc2_sse2.exe
View File

Binary file not shown.

BIN
res/tools/oggenc2_x64.exe
View File

Binary file not shown.

2
src/Config.h
View File

@ -25,7 +25,7 @@
#define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_MINOR_LO 1
#define VER_LAMEXP_BUILD 328 #define VER_LAMEXP_BUILD 330
#define VER_LAMEXP_SUFFIX Beta-1 #define VER_LAMEXP_SUFFIX Beta-1
/* /*

11
src/LockedFile.cpp
View File

@ -77,6 +77,7 @@ LockedFile::LockedFile(const QString &resourcePath, const QString &outPath, cons
outFile.close(); outFile.close();
} }
//Compare hashes
if(_stricmp(fileHash.result().toHex().constData(), expectedHash.constData())) if(_stricmp(fileHash.result().toHex().constData(), expectedHash.constData()))
{ {
qWarning("\nFile checksum error:\n Expected = %040s\n Detected = %040s\n", expectedHash.constData(), fileHash.result().toHex().constData()); qWarning("\nFile checksum error:\n Expected = %040s\n Detected = %040s\n", expectedHash.constData(), fileHash.result().toHex().constData());
@ -92,7 +93,9 @@ LockedFile::LockedFile(const QString &filePath)
{ {
m_fileHandle = NULL; m_fileHandle = NULL;
QFileInfo existingFile(filePath); QFileInfo existingFile(filePath);
existingFile.setCaching(false);
//Make sure the file exists, before we try to lock it
if(!existingFile.exists()) if(!existingFile.exists())
{ {
char error_msg[256]; char error_msg[256];
@ -104,9 +107,15 @@ LockedFile::LockedFile(const QString &filePath)
m_filePath = existingFile.canonicalFilePath(); m_filePath = existingFile.canonicalFilePath();
//Now lock the file //Now lock the file
for(int i = 0; i < 10; i++)
{
m_fileHandle = CreateFileW(QWCHAR(QDir::toNativeSeparators(filePath)), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL); m_fileHandle = CreateFileW(QWCHAR(QDir::toNativeSeparators(filePath)), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, NULL, NULL);
if((m_fileHandle != NULL) && (m_fileHandle != INVALID_HANDLE_VALUE)) break;
Sleep(100);
}
if(m_fileHandle == INVALID_HANDLE_VALUE) //Locked successfully?
if((m_fileHandle == NULL) || (m_fileHandle == INVALID_HANDLE_VALUE))
{ {
char error_msg[256]; char error_msg[256];
strcpy_s(error_msg, 256, QString("File '%1' could not be locked!").arg(existingFile.fileName()).toLatin1().constData()); strcpy_s(error_msg, 256, QString("File '%1' could not be locked!").arg(existingFile.fileName()).toLatin1().constData());

6
src/Thread_Initialization.cpp
View File

@ -60,9 +60,9 @@ g_lamexp_tools[] =
{"aa89763a5ba4d1a5986549b9ee53e005c51940c1", "mpcdec.exe", 435}, {"aa89763a5ba4d1a5986549b9ee53e005c51940c1", "mpcdec.exe", 435},
{"38f81efca6c1eeab0b9dc39d06c2ac750267217f", "mpg123.exe", 1132}, {"38f81efca6c1eeab0b9dc39d06c2ac750267217f", "mpg123.exe", 1132},
{"8dd7138714c3bcb39f5a3213413addba13d06f1e", "oggdec.exe", UINT_MAX}, {"8dd7138714c3bcb39f5a3213413addba13d06f1e", "oggdec.exe", UINT_MAX},
{"ecd15abe103184aca96e406f5f1c82c6fb2e665d", "oggenc2_i386.exe", 287}, {"a99109c88ef15ec12a482e38ee2e2e5f383b3628", "oggenc2_i386.exe", 287},
{"ffe0fbd73352396dc3752ac9d484dbfc754a226d", "oggenc2_sse2.exe", 287}, {"c4472f9eb4373e7ecb020ea8efcf5d80cff546c6", "oggenc2_sse2.exe", 287},
{"a8c50872e544a55495a824426e9378984f2ae01d", "oggenc2_x64.exe", 287}, {"693946b97d03f0e3708a3e194f61e656a0c9ebb5", "oggenc2_x64.exe", 287},
{"0d9035bb62bdf46a2785261f8be5a4a0972abd15", "shorten.exe", 361}, {"0d9035bb62bdf46a2785261f8be5a4a0972abd15", "shorten.exe", 361},
{"2d08c3586f9cf99f2e4c89ac54eeb595f63aef61", "sox.exe", 1431}, {"2d08c3586f9cf99f2e4c89ac54eeb595f63aef61", "sox.exe", 1431},
{"8671e16497a2d217d3707d4aa418678d02b16bcc", "speexdec.exe", 12}, {"8671e16497a2d217d3707d4aa418678d02b16bcc", "speexdec.exe", 12},