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

Adapt for latest MUtils changes.

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-12-23 22:19:21 +01:00
parent 69fdc81db6
commit a39592ff8a
4 changed files with 162 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

312
LameXP_VS2015.vcxproj.filters
View File

@ -881,168 +881,168 @@
<CustomBuild Include="src\Model_FileExts.h">
<Filter>Header Files\Models</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.wvunpack-x64.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.aften-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.aften-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.aften-x64.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.avs2wav.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.dcaenc.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.elevator.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.faad.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.flac-x64-avx.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.flac-x64-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.flac-x86-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.flac-x86-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.gpgv.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.keyring.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.lame-x64-avx.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.lame-x64-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.lame-x86-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.lame-x86-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mac-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mac-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mediaInfo-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mediainfo-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mediainfo-x64.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mpcdec.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mpg123-avx.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mpg123-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.mpg123-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.nc-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.nc-x64.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.oggdec.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.oggenc2-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.oggenc2-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.oggenc2-x64.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.opusdec-avx.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.opusdec-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.opusdec-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.opusenc-avx.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.opusenc-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.opusenc-sse2.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.refalac-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.refalac-x64.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.shorten.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.sox.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.speexdec.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.tag.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.tta.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.valdec.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.vorbiscomment.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.wget.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.wma2wav.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.wupdate.qrc">
<Filter>Resources</Filter>
</CustomBuild>
<CustomBuild Include="res\Tools.wvunpack-i386.qrc">
<Filter>Resources</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
<None Include="res\MainIcon.ico">
<Filter>Miscellaneous</Filter>
</None>
<None Include="res\Tools.aften-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.aften-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.aften-x64.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.avs2wav.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.dcaenc.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.elevator.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.faad.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.flac-x64-avx.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.flac-x64-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.flac-x86-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.flac-x86-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.gpgv.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.lame-x64-avx.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.lame-x64-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.lame-x86-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.lame-x86-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mac-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mac-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mediaInfo-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mediainfo-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mediainfo-x64.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mpcdec.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mpg123-avx.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mpg123-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.mpg123-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.nc-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.nc-x64.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.oggdec.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.oggenc2-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.oggenc2-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.oggenc2-x64.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.opusdec-avx.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.opusdec-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.opusdec-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.opusenc-avx.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.opusenc-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.opusenc-sse2.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.refalac-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.refalac-x64.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.shorten.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.sox.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.speexdec.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.tag.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.tta.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.valdec.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.vorbiscomment.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.wget.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.wma2wav.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.wupdate.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.wvunpack-i386.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.wvunpack-x64.qrc">
<Filter>Resources</Filter>
</None>
<None Include="res\Tools.keyring.qrc">
<Filter>Resources</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 5
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 1942
#define VER_LAMEXP_BUILD 1945
#define VER_LAMEXP_CONFG 1934
///////////////////////////////////////////////////////////////////////////////

5
src/Main.cpp
View File

@ -207,10 +207,11 @@ static int lamexp_main(int &argc, char **argv)
//Detect CPU capabilities
const MUtils::CPUFetaures::cpu_info_t cpuFeatures = MUtils::CPUFetaures::detect();
qDebug(" CPU vendor id : %s (Intel=%s)", cpuFeatures.vendor, MUTILS_BOOL2STR(cpuFeatures.intel));
qDebug(" CPU vendor id : %s (Intel=%s)", cpuFeatures.idstr, MUTILS_BOOL2STR(cpuFeatures.vendor & MUtils::CPUFetaures::VENDOR_INTEL));
qDebug("CPU brand string : %s", cpuFeatures.brand);
qDebug(" CPU signature : Family=%d Model=%d Stepping=%d", cpuFeatures.family, cpuFeatures.model, cpuFeatures.stepping);
qDebug("CPU capabilities : SSE=%s SSE2=%s SSE3=%s SSSE3=%s SSE4=%s SSE4.2=%s AVX=%s x64=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE4), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE42), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_AVX), MUTILS_BOOL2STR(cpuFeatures.x64));
qDebug("CPU capabilities : CMOV=%s MMX=%s SSE=%s SSE2=%s SSE3=%s SSSE3=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_CMOV), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_MMX), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSSE3));
qDebug("CPU capabilities : SSE4.1=%s SSE4.2=%s AVX=%s EM64T/AMD64=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE4), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE42), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_AVX), MUTILS_BOOL2STR(cpuFeatures.x64));
qDebug(" Number of CPU's : %d\n", cpuFeatures.count);
//Initialize Qt

3
src/Thread_Initialization.cpp
View File

@ -351,7 +351,8 @@ double InitializationThread::doInit(const size_t threadCount)
//CPU type selection
unsigned int cpuSupport = 0;
if((m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE) && (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2) && m_cpuFeatures.intel)
const bool haveSSE2 = (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE) && (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2);
if(haveSSE2 && (m_cpuFeatures.vendor & MUtils::CPUFetaures::VENDOR_INTEL))
{
if (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_AVX)
{