Update MediaInfo to v0.7.38.

res/Tools.qrc

@@ -9,7 +9,8 @@
     <file>tools/gpgv.gpg</file>
     <file>tools/lame.exe</file>
     <file>tools/MAC.exe</file>
-    <file>tools/mediainfo_icl11.exe</file>
+    <file>tools/mediainfo_i386.exe</file>
+    <file>tools/mediainfo_x64.exe</file>
     <file>tools/mpcdec.exe</file>
     <file>tools/mpg123.exe</file>
     <file>tools/oggdec.exe</file>

src/Config.h

@@ -25,7 +25,7 @@
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
 #define VER_LAMEXP_MINOR_LO				0
-#define VER_LAMEXP_BUILD				161
+#define VER_LAMEXP_BUILD				162
 #define VER_LAMEXP_SUFFIX				TechPreview
 
 /*

src/Dialog_About.cpp

@@ -238,7 +238,7 @@ void AboutDialog::showMoreAbout(void)
 	moreAboutText += LINK("http://flac.sourceforge.net/");
 	moreAboutText += "<br>";
 	
-	moreAboutText += VSTR("<li><b>MediaInfo - Media File Analysis Tool (%1)</b><br>", "mediainfo_icl11.exe", "v?.?.??");
+	moreAboutText += VSTR("<li><b>MediaInfo - Media File Analysis Tool (%1)</b><br>", "mediainfo_i386.exe", "v?.?.??");
 	moreAboutText += "Released under the terms of the GNU Leser General Public License.<br>";
 	moreAboutText += LINK("http://mediainfo.sourceforge.net/");
 	moreAboutText += "<br></ul></div>";

src/Thread_FileAnalyzer.cpp

@@ -39,12 +39,14 @@
 ////////////////////////////////////////////////////////////
 
 FileAnalyzer::FileAnalyzer(const QStringList &inputFiles)
-	: m_inputFiles(inputFiles)
+:
+	m_inputFiles(inputFiles),
+	m_mediaInfoBin_x86(lamexp_lookup_tool("mediainfo_i386.exe")),
+	m_mediaInfoBin_x64(lamexp_lookup_tool("mediainfo_x64.exe"))
 {
 	m_bSuccess = false;
-	m_mediaInfoBin = lamexp_lookup_tool("mediainfo_icl11.exe");
 	
-	if(m_mediaInfoBin.isEmpty())
+	if(m_mediaInfoBin_x86.isEmpty() || m_mediaInfoBin_x64.isEmpty())
 	{
 		qFatal("Invalid path to MediaInfo binary. Tool not initialized properly.");
 	}
@@ -94,6 +96,9 @@ void FileAnalyzer::run()
 
 const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath)
 {
+	lamexp_cpu_t cpuInfo = lamexp_detect_cpu_features();
+	const QString mediaInfoBin = cpuInfo.x64 ? m_mediaInfoBin_x64 : m_mediaInfoBin_x86;
+	
 	AudioFileModel audioFile(filePath);
 	m_currentSection = sectionOther;
 
@@ -112,7 +117,7 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath)
 	QProcess process;
 	process.setProcessChannelMode(QProcess::MergedChannels);
 	process.setReadChannel(QProcess::StandardOutput);
-	process.start(m_mediaInfoBin, QStringList() << QDir::toNativeSeparators(filePath));
+	process.start(mediaInfoBin, QStringList() << QDir::toNativeSeparators(filePath));
 	
 	if(!process.waitForStarted())
 	{

src/Thread_FileAnalyzer.h

@@ -63,7 +63,8 @@ private:
 	unsigned int parseDuration(const QString &str);
 
 	QStringList m_inputFiles;
-	QString m_mediaInfoBin;
+	const QString m_mediaInfoBin_x86;
+	const QString m_mediaInfoBin_x64;
 	section_t m_currentSection;
 	unsigned int m_filesAccepted;
 	unsigned int m_filesRejected;

src/Thread_Initialization.cpp

@@ -54,7 +54,8 @@ static const struct lamexp_tool_t g_lamexp_tools[] =
 	{"d837bf6ee4dab557d8b02d46c75a24e58980fffa", "gpgv.gpg", UINT_MAX},
 	{"143fc001a2f6c56fe1b9e6f8a2eb2b53b9e1e504", "lame.exe", 39910},
 	{"775b260b3f64101beaeb317b74746f9bccdab842", "MAC.exe", UINT_MAX},
-	{"e8719fbfd7b690b3e518489f7aae3915305711c2", "mediainfo_icl11.exe", 737},
+	{"c7aa8ca8e05a5083d0ef961c1224ac3037718d4f", "mediainfo_i386.exe", 738},
+	{"74ca0c218eab75393a45fa8f3b53b7f2852fd28f", "mediainfo_x64.exe", 738},
 	{"55c293a80475f7aeccf449ac9487a4626e5139cb", "mpcdec.exe", UINT_MAX},
 	{"8bbf4a3fffe2ff143eb5ba2cf82ca16d676e865d", "mpg123.exe", UINT_MAX},
 	{"380c734e3c3948a844b9fae213d53a93ab20beba", "oggdec.exe", UINT_MAX},
@@ -98,14 +99,20 @@ void InitializationThread::run()
 	//Init checksums
 	for(int i = 0; i < INT_MAX; i++)
 	{
-		if(g_lamexp_tools[i].pcName && g_lamexp_tools[i].pcHash)
+		if(!g_lamexp_tools[i].pcName && !g_lamexp_tools[i].pcHash && !g_lamexp_tools[i].uiVersion)
+		{
+			break;
+		}
+		else if(g_lamexp_tools[i].pcName && g_lamexp_tools[i].pcHash && g_lamexp_tools[i].uiVersion)
 		{
 			const QString currentTool = QString::fromLatin1(g_lamexp_tools[i].pcName);
 			checksum.insert(currentTool, QString::fromLatin1(g_lamexp_tools[i].pcHash));
 			version.insert(currentTool, g_lamexp_tools[i].uiVersion);
-			continue;
 		}
-		break;
+		else
+		{
+			qFatal("Inconsistent checksum data detected. Take care!");
+		}
 	}
 
 	QDir toolsDir(":/tools/");