diff --git a/res/tools/mediainfo.i386.exe b/res/tools/mediainfo.i386.exe index 1c019ef2..4f57a099 100644 Binary files a/res/tools/mediainfo.i386.exe and b/res/tools/mediainfo.i386.exe differ diff --git a/res/tools/mediainfo.x64.exe b/res/tools/mediainfo.x64.exe index aac52365..9ab19d55 100644 Binary files a/res/tools/mediainfo.x64.exe and b/res/tools/mediainfo.x64.exe differ diff --git a/src/Config.h b/src/Config.h index bc72f0a5..1cacb928 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 8 -#define VER_LAMEXP_BUILD 473 +#define VER_LAMEXP_BUILD 474 /////////////////////////////////////////////////////////////////////////////// // Tools versions diff --git a/src/Thread_FileAnalyzer.cpp b/src/Thread_FileAnalyzer.cpp index 0bd47701..31d87912 100644 --- a/src/Thread_FileAnalyzer.cpp +++ b/src/Thread_FileAnalyzer.cpp @@ -114,7 +114,6 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath) AudioFileModel audioFile(filePath); m_currentSection = sectionOther; m_currentCover = coverNone; - m_lineBreakBugWorkaround = false; QFile readTest(filePath); if(!readTest.open(QIODevice::ReadOnly)) @@ -170,7 +169,6 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath) int index = line.indexOf(':'); if(index > 0) { - m_lineBreakBugWorkaround = false; QString key = line.left(index-1).trimmed(); QString val = line.mid(index+1).trimmed(); if(!key.isEmpty() && !val.isEmpty()) @@ -232,11 +230,8 @@ void FileAnalyzer::updateSection(const QString §ion) } else { - if(!m_lineBreakBugWorkaround) - { - m_currentSection = sectionOther; - qWarning("Unknown section: %s", section.toUtf8().constData()); - } + m_currentSection = sectionOther; + qWarning("Unknown section: %s", section.toUtf8().constData()); } } @@ -305,10 +300,6 @@ void FileAnalyzer::updateInfo(AudioFileModel &audioFile, const QString &key, con m_currentCover = coverGif; } } - else if(!key.compare("Complete Name", Qt::CaseInsensitive)) - { - m_lineBreakBugWorkaround = true; - } break; case sectionAudio: diff --git a/src/Thread_FileAnalyzer.h b/src/Thread_FileAnalyzer.h index 2a3313f7..b5d61d65 100644 --- a/src/Thread_FileAnalyzer.h +++ b/src/Thread_FileAnalyzer.h @@ -83,6 +83,5 @@ private: unsigned int m_filesRejected; unsigned int m_filesDenied; unsigned int m_filesDummyCDDA; - bool m_lineBreakBugWorkaround; bool m_bSuccess; }; diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 557c29d6..b1d634ad 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -60,8 +60,8 @@ g_lamexp_tools[] = {"d837bf6ee4dab557d8b02d46c75a24e58980fffa", CPU_TYPE_ALL, "gpgv.gpg", UINT_MAX}, {"d5b3b80220d85a9fd2f486e37c1fb6511f3c2d72", CPU_TYPE_ALL, "lame.exe", 3990}, {"a4e929cfaa42fa2e61a3d0c6434c77a06d45aef3", CPU_TYPE_ALL, "mac.exe", 406}, - {"3cbf0c5afba64378ca30f646b57741d877be520a", CPU_TYPE_GEN, "mediainfo.i386.exe", 744}, - {"69f8733ad935d71d48cc3d907b4596adbabb2e81", CPU_TYPE_X64, "mediainfo.x64.exe", 744}, + {"a9aa99209fb9ad6ceb97b7a46774fc97141d3dce", CPU_TYPE_GEN, "mediainfo.i386.exe", 745}, + {"9f6b81378e4c408fe5ded8a26ddd0d6c705d81cb", CPU_TYPE_X64, "mediainfo.x64.exe", 745}, {"aa89763a5ba4d1a5986549b9ee53e005c51940c1", CPU_TYPE_ALL, "mpcdec.exe", 435}, {"c327400fcee268f581d8c03e2a5cbbe8031abb6f", CPU_TYPE_ALL, "mpg123.exe", 1133}, {"8dd7138714c3bcb39f5a3213413addba13d06f1e", CPU_TYPE_ALL, "oggdec.exe", UINT_MAX},