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

Updated x64 binaries with latest MPress version. Also removed Windows 8 workaround.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-12-30 20:21:25 +01:00
parent 46af27d527
commit c772b9bc2d
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/tools/aften.i386.exe
View File

Binary file not shown.

BIN
res/tools/aften.sse2.exe
View File

Binary file not shown.

BIN
res/tools/aften.x64.exe
View File

Binary file not shown.

BIN
res/tools/dcaenc.exe
View File

Binary file not shown.

BIN
res/tools/mediainfo.i386.exe
View File

Binary file not shown.

BIN
res/tools/mediainfo.x64.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

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 13
#define VER_LAMEXP_BUILD 860
#define VER_LAMEXP_BUILD 862
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)

6
src/Encoder_DCA.cpp
View File

@ -49,9 +49,9 @@ bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
int bitrate = qBound(32, m_configBitrate * 32, 6144);
args << QDir::toNativeSeparators(sourceFile);
args << QDir::toNativeSeparators(outputFile);
args << QString::number(bitrate);
args << "-i" << QDir::toNativeSeparators(sourceFile);
args << "-o" << QDir::toNativeSeparators(outputFile);
args << "-b" << QString::number(bitrate);
if(!startProcess(process, m_binary, args))
{

20
src/Thread_Initialization.cpp
View File

@ -75,16 +75,16 @@ void InitializationThread::run()
cpuSupport = m_cpuFeatures.x64 ? CPU_TYPE_X64_GEN : CPU_TYPE_X86_GEN;
}
//Hack to disable x64 on the Windows 8 Developer Preview
if(cpuSupport & CPU_TYPE_X64_ALL)
{
DWORD osVerNo = lamexp_get_os_version();
if((HIWORD(osVerNo) == 6) && (LOWORD(osVerNo) == 2))
{
qWarning("Windows 8 (x64) developer preview detected. Going to disable all x64 support!\n");
cpuSupport = (cpuSupport == CPU_TYPE_X64_SSE) ? CPU_TYPE_X86_SSE : CPU_TYPE_X86_GEN;
}
}
//Hack to disable x64 on the Windows 8 Developer Preview (not required anymore)
//if(cpuSupport & CPU_TYPE_X64_ALL)
//{
// DWORD osVerNo = lamexp_get_os_version();
// if((HIWORD(osVerNo) == 6) && (LOWORD(osVerNo) == 2))
// {
// qWarning("Windows 8 (x64) developer preview detected. Going to disable all x64 support!\n");
// cpuSupport = (cpuSupport == CPU_TYPE_X64_SSE) ? CPU_TYPE_X86_SSE : CPU_TYPE_X86_GEN;
// }
//}
//Print selected CPU type
switch(cpuSupport)

14
src/Tools.h
View File

@ -51,12 +51,12 @@ static const struct
}
g_lamexp_tools[] =
{
{"1e4c983fe00ccc6236ee1c3f76250f64139cf86a6f4aa68f36929907fe45cf37b00862d8", CPU_TYPE_X86_GEN, "aften.i386.exe", 8},
{"7c843f1eaf61823285237911493d8d20da11149853d4bb7953a3279196f6dbbd310c61e3", CPU_TYPE_X86_SSE, "aften.sse2.exe", 8},
{"29da0d3e810bc3e8d2cddb3db452325eefca0d0c1fff1379fa17806ad447752be1b88e2f", CPU_TYPE_X64_ALL, "aften.x64.exe", 8},
{"fff2a8f9116c6cff9b8ccf18a486c827df6be623b715899ae882f514c46e112bdbf510a2", CPU_TYPE_X86_GEN, "aften.i386.exe", 8},
{"9b52bd2efcb59aef1f65e9e11e6b51b171705e155af7c624562842f3c35429d41af9da30", CPU_TYPE_X86_SSE, "aften.sse2.exe", 8},
{"73a9ab3cf1859d469a3e3acb29ebca504f2bf044c6cd2a1b0c3d91aec3e3197dd1a71af5", CPU_TYPE_X64_ALL, "aften.x64.exe", 8},
{"1cca303fabd889a18fc01c32a7fd861194cfcac60ba63740ea2d7c55d049dbf8f59259fa", CPU_TYPE_ALL_ALL, "alac.exe", 20},
{"6d22d4bbd7ce2162e38f70ac9187bc84eb28233b36ee6c0492d0a6195318782d7f05c444", CPU_TYPE_ALL_ALL, "avs2wav.exe", 13},
{"57e89bc253993b530a549de8d543946ea867ffefff361c4a3c091da6cf261fe5075f1cfc", CPU_TYPE_ALL_ALL, "dcaenc.exe", 20111223},
{"30c7d280726acd92ace2b3c50c0d660ed502739adc87d518517f46b473a7bb15855f606e", CPU_TYPE_ALL_ALL, "dcaenc.exe", 20111230},
{"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},
@ -65,14 +65,14 @@ g_lamexp_tools[] =
{"d5b35689208aaaf2809c3fb501e8e74af410378dc5f1921df30f2525e2ee084e5a9f9595", CPU_TYPE_ALL_GEN, "lame.i386.exe", 3992},
{"cfc59f7c299569355d8b4143a4f0524edf5b78dc61402c03be938dbabb5c2db5695feedd", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3992},
{"67933924d68ce319795989648f29e7bd1abaac4ec09c26cbb0ff0d15a67a9df17e257933", CPU_TYPE_ALL_ALL, "mac.exe", 406},
{"0eeaef330b43c3e24a7aeca5c2d3b60c9e2dc3baff89f8921b3d3687a8693f1fbd9f02a4", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 752},
{"8a2b61a7f344bd145cb5ec0e0a35c8ba58b90a99ece91e462724143dd98b30db5a79bda7", CPU_TYPE_X64_ALL, "mediainfo.x64.exe", 752},
{"87ff2ec0db786740e8f3f567238369c907ac6d62a9548377179063ea8b98a78fc9b72254", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 752},
{"c0723723091996c4f6ba61322718d7953e258bcf89e70df6fe5b9392b18204f3334592bc", CPU_TYPE_X64_ALL, "mediainfo.x64.exe", 752},
{"a93ec86187025e66fb78026af35555bd3b4e30fe1a40e8d66f600cfd918f07f431f0b2f2", CPU_TYPE_ALL_ALL, "mpcdec.exe", 435},
{"7fa1beb4161d603563089cadd601f68fb9f436f05d9477b6a604501b072f5a973dd45fbb", CPU_TYPE_ALL_ALL, "mpg123.exe", 1134},
{"0c781805dda931c529bd16069215f616a7a4c5e5c2dfb6b75fe85d52b20511830693e528", CPU_TYPE_ALL_ALL, "oggdec.exe", UINT_MAX},
{"0c019e13450dc664987e21f4e5489d182be7d6d0d81efbbaaf1c78693dfe3e38e0355b93", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 287603},
{"693dd6f779df70a047c15c2c79350855db38d5b0cd7e529b6877b7c821cfe6addfdd50a4", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287603},
{"32cb0b2182488e5e9278ba6b9fc9141214c7546eec67ee02fa895810b0e56900368695be", CPU_TYPE_X64_ALL, "oggenc2.x64.exe", 287603},
{"291cedb6a1b213330a9cb508f975ee7132a25aa26770ab91cade50109b4ffb81c9bdd09a", CPU_TYPE_X64_ALL, "oggenc2.x64.exe", 287603},
{"58c2b8bcff8f27bfa8fab8172b80f5da731221d072c7dba4dd3a3d7d6423490a25dc6760", CPU_TYPE_ALL_ALL, "shorten.exe", 361},
{"abdf9b20a8031a09d0abca9cb10c31c8418f72403b5d1350fd69bfa34041591aca3060ab", CPU_TYPE_ALL_ALL, "sox.exe", 1432},
{"48e7f81c024cd17dac0eaeab253aad6b223e72dc80688f7576276b0563209514ff0bb9c8", CPU_TYPE_ALL_ALL, "speexdec.exe", 12},