Updated MediaInfo binaries with latest fix to properly handle tags with a "\n" when...

diff --git a/res/tools/mediainfo.i386.exe b/res/tools/mediainfo.i386.exe
index d941554..7f39da4 100644 (file)
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 eacc0da..0eeb007 100644 (file)
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 de304f7..13427e5 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI                                    0
 #define VER_LAMEXP_MINOR_LO                                    4
 #define VER_LAMEXP_TYPE                                                Alpha
-#define VER_LAMEXP_PATCH                                       15
-#define VER_LAMEXP_BUILD                                       878
+#define VER_LAMEXP_PATCH                                       16
+#define VER_LAMEXP_BUILD                                       880
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)

diff --git a/src/Thread_FileAnalyzer.cpp b/src/Thread_FileAnalyzer.cpp
index 5c36e55..f56b59f 100644 (file)
--- a/src/Thread_FileAnalyzer.cpp
+++ b/src/Thread_FileAnalyzer.cpp
@@ -37,6 +37,8 @@
 #include <math.h>
 
 #define IS_KEY(KEY) (key.compare(KEY, Qt::CaseInsensitive) == 0)
+#define IS_SEC(SEC) (key.startsWith((SEC "_"), Qt::CaseInsensitive))
+#define FIRST_TOK(STR) (STR.split(" ", QString::SkipEmptyParts).first())
 
 ////////////////////////////////////////////////////////////
 // Constructor
@@ -81,6 +83,7 @@ FileAnalyzer::~FileAnalyzer(void)
 
 const char *FileAnalyzer::g_tags_gen[] =
 {
+       "ID",
        "Format",
        "Format_Profile",
        "Format_Version",
@@ -101,6 +104,7 @@ const char *FileAnalyzer::g_tags_gen[] =
 
 const char *FileAnalyzer::g_tags_aud[] =
 {
+       "ID",
        "Format",
        "Format_Profile",
        "Format_Version",
@@ -243,6 +247,8 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *typ
        }
        readTest.close();
 
+       bool skipNext = false;
+       unsigned int id_val[2] = {UINT_MAX, UINT_MAX};
        cover_t coverType = coverNone;
        QByteArray coverData;
 
@@ -298,9 +304,9 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *typ
                                {
                                        QString key = line.left(index).trimmed();
                                        QString val = line.mid(index+1).trimmed();
-                                       if(!(key.isEmpty() || val.isEmpty()))
+                                       if(!key.isEmpty())
                                        {
-                                               updateInfo(audioFile, &coverType, &coverData, key, val);
+                                               updateInfo(audioFile, &skipNext, id_val, &coverType, &coverData, key, val);
                                        }
                                }
                        }
@@ -343,123 +349,177 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *typ
        return audioFile;
 }
 
-void FileAnalyzer::updateInfo(AudioFileModel &audioFile, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value)
+void FileAnalyzer::updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigned int *id_val, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value)
 {
        //qWarning("'%s' -> '%s'", key.toUtf8().constData(), value.toUtf8().constData());
        
-       if(IS_KEY("Gen_Format"))
+       /*New Stream*/
+       if(IS_KEY("Gen_ID") || IS_KEY("Aud_ID"))
        {
-               audioFile.setFormatContainerType(value);
-       }
-       else if(IS_KEY("Gen_Format_Profile"))
-       {
-               audioFile.setFormatContainerProfile(value);
-       }
-       else if(IS_KEY("Gen_Title") || IS_KEY("Gen_Track"))
-       {
-               audioFile.setFileName(value);
-       }
-       else if(IS_KEY("Gen_Duration"))
-       {
-               unsigned int tmp = parseDuration(value);
-               if(tmp > 0) audioFile.setFileDuration(tmp);
-       }
-       else if(IS_KEY("Gen_Artist") || IS_KEY("Gen_Performer"))
-       {
-               audioFile.setFileArtist(value);
-       }
-       else if(IS_KEY("Gen_Album"))
-       {
-               audioFile.setFileAlbum(value);
-       }
-       else if(IS_KEY("Gen_Genre"))
-       {
-               audioFile.setFileGenre(value);
-       }
-       else if(IS_KEY("Gen_Released_Date") || IS_KEY("Gen_Recorded_Date"))
-       {
-               unsigned int tmp = parseYear(value);
-               if(tmp > 0) audioFile.setFileYear(tmp);
-       }
-       else if(IS_KEY("Gen_Comment"))
-       {
-               audioFile.setFileComment(value);
-       }
-       else if(IS_KEY("Gen_Track/Position"))
-       {
-               bool ok = false;
-               unsigned int tmp = value.toUInt(&ok);
-               if(ok) audioFile.setFilePosition(tmp);
-       }
-       else if(IS_KEY("Gen_Cover") || IS_KEY("Gen_Cover_Type"))
-       {
-               if(*coverType == coverNone)
+               if(value.isEmpty())
                {
-                       *coverType = coverJpeg;
+                       *skipNext = false;
                }
+               else
+               {
+                       //We ignore all ID's, except for the lowest one!
+                       bool ok = false;
+                       unsigned int id = value.toUInt(&ok);
+                       if(ok)
+                       {
+                               if(IS_KEY("Gen_ID")) { id_val[0] = qMin(id_val[0], id); *skipNext = (id > id_val[0]); }
+                               if(IS_KEY("Aud_ID")) { id_val[1] = qMin(id_val[1], id); *skipNext = (id > id_val[1]); }
+                       }
+                       else
+                       {
+                               *skipNext = true;
+                       }
+               }
+               if(*skipNext)
+               {
+                       qWarning("Skipping info for non-primary stream!");
+               }
+               return;
        }
-       else if(IS_KEY("Gen_Cover_Mime"))
-       {
-               QString temp = value.split(" ", QString::SkipEmptyParts).first();
-               if(!temp.compare("image/jpeg", Qt::CaseInsensitive)) *coverType = coverJpeg;
-               else if(!temp.compare("image/png", Qt::CaseInsensitive)) *coverType = coverPng;
-               else if(!temp.compare("image/gif", Qt::CaseInsensitive)) *coverType = coverGif;
-       }
-       else if(IS_KEY("Gen_Cover_Data"))
-       {
-               if(!coverData->isEmpty()) coverData->clear();
-               coverData->append(QByteArray::fromBase64(value.toLatin1()));
-       }
-       else if(IS_KEY("Aud_Format"))
-       {
-               audioFile.setFormatAudioType(value);
-       }
-       else if(IS_KEY("Aud_Format_Profile"))
-       {
-               audioFile.setFormatAudioProfile(value);
-       }
-       else if(IS_KEY("Aud_Format_Version"))
-       {
-               audioFile.setFormatAudioVersion(value);
-       }
-       else if(IS_KEY("Aud_Channel(s)"))
-       {
-               bool ok = false;
-               unsigned int tmp = value.toUInt(&ok);
-               if(ok) audioFile.setFormatAudioChannels(tmp);
-       }
-       else if(IS_KEY("Aud_SamplingRate"))
-       {
-               bool ok = false;
-               unsigned int tmp = value.toUInt(&ok);
-               if(ok) audioFile.setFormatAudioSamplerate(tmp);
-       }
-       else if(IS_KEY("Aud_BitDepth"))
-       {
-               bool ok = false;
-               unsigned int tmp = value.toUInt(&ok);
-               if(ok) audioFile.setFormatAudioBitdepth(tmp);
-       }
-       else if(IS_KEY("Aud_Duration"))
-       {
-               unsigned int tmp = parseDuration(value);
-               if(tmp > 0) audioFile.setFileDuration(tmp);
-       }
-       else if(IS_KEY("Aud_BitRate"))
+
+       /*Skip?*/
+       if((*skipNext) || value.isEmpty())
        {
-               bool ok = false;
-               unsigned int tmp = value.toUInt(&ok);
-               if(ok) audioFile.setFormatAudioBitrate(tmp/1000);
+               return;
        }
-       else if(IS_KEY("Aud_BitRate_Mode"))
+
+       /*General Section*/
+       if(IS_SEC("Gen"))
        {
-               if(!value.compare("CBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeConstant);
-               if(!value.compare("VBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeVariable);
+               if(IS_KEY("Gen_Format"))
+               {
+                       audioFile.setFormatContainerType(value);
+               }
+               else if(IS_KEY("Gen_Format_Profile"))
+               {
+                       audioFile.setFormatContainerProfile(value);
+               }
+               else if(IS_KEY("Gen_Title") || IS_KEY("Gen_Track"))
+               {
+                       audioFile.setFileName(value);
+               }
+               else if(IS_KEY("Gen_Duration"))
+               {
+                       unsigned int tmp = parseDuration(value);
+                       if(tmp > 0) audioFile.setFileDuration(tmp);
+               }
+               else if(IS_KEY("Gen_Artist") || IS_KEY("Gen_Performer"))
+               {
+                       audioFile.setFileArtist(value);
+               }
+               else if(IS_KEY("Gen_Album"))
+               {
+                       audioFile.setFileAlbum(value);
+               }
+               else if(IS_KEY("Gen_Genre"))
+               {
+                       audioFile.setFileGenre(value);
+               }
+               else if(IS_KEY("Gen_Released_Date") || IS_KEY("Gen_Recorded_Date"))
+               {
+                       unsigned int tmp = parseYear(value);
+                       if(tmp > 0) audioFile.setFileYear(tmp);
+               }
+               else if(IS_KEY("Gen_Comment"))
+               {
+                       audioFile.setFileComment(value);
+               }
+               else if(IS_KEY("Gen_Track/Position"))
+               {
+                       bool ok = false;
+                       unsigned int tmp = value.toUInt(&ok);
+                       if(ok) audioFile.setFilePosition(tmp);
+               }
+               else if(IS_KEY("Gen_Cover") || IS_KEY("Gen_Cover_Type"))
+               {
+                       if(*coverType == coverNone)
+                       {
+                               *coverType = coverJpeg;
+                       }
+               }
+               else if(IS_KEY("Gen_Cover_Mime"))
+               {
+                       QString temp = FIRST_TOK(value);
+                       if(!temp.compare("image/jpeg", Qt::CaseInsensitive)) *coverType = coverJpeg;
+                       else if(!temp.compare("image/png", Qt::CaseInsensitive)) *coverType = coverPng;
+                       else if(!temp.compare("image/gif", Qt::CaseInsensitive)) *coverType = coverGif;
+               }
+               else if(IS_KEY("Gen_Cover_Data"))
+               {
+                       if(!coverData->isEmpty()) coverData->clear();
+                       coverData->append(QByteArray::fromBase64(FIRST_TOK(value).toLatin1()));
+               }
+               else
+               {
+                       qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
+               }
+               return;
        }
-       else
+
+       /*Audio Section*/
+       if(IS_SEC("Aud"))
        {
-               qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
+
+               if(IS_KEY("Aud_Format"))
+               {
+                       audioFile.setFormatAudioType(value);
+               }
+               else if(IS_KEY("Aud_Format_Profile"))
+               {
+                       audioFile.setFormatAudioProfile(value);
+               }
+               else if(IS_KEY("Aud_Format_Version"))
+               {
+                       audioFile.setFormatAudioVersion(value);
+               }
+               else if(IS_KEY("Aud_Channel(s)"))
+               {
+                       bool ok = false;
+                       unsigned int tmp = value.toUInt(&ok);
+                       if(ok) audioFile.setFormatAudioChannels(tmp);
+               }
+               else if(IS_KEY("Aud_SamplingRate"))
+               {
+                       bool ok = false;
+                       unsigned int tmp = value.toUInt(&ok);
+                       if(ok) audioFile.setFormatAudioSamplerate(tmp);
+               }
+               else if(IS_KEY("Aud_BitDepth"))
+               {
+                       bool ok = false;
+                       unsigned int tmp = value.toUInt(&ok);
+                       if(ok) audioFile.setFormatAudioBitdepth(tmp);
+               }
+               else if(IS_KEY("Aud_Duration"))
+               {
+                       unsigned int tmp = parseDuration(value);
+                       if(tmp > 0) audioFile.setFileDuration(tmp);
+               }
+               else if(IS_KEY("Aud_BitRate"))
+               {
+                       bool ok = false;
+                       unsigned int tmp = value.toUInt(&ok);
+                       if(ok) audioFile.setFormatAudioBitrate(tmp/1000);
+               }
+               else if(IS_KEY("Aud_BitRate_Mode"))
+               {
+                       if(!value.compare("CBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeConstant);
+                       if(!value.compare("VBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeVariable);
+               }
+               else
+               {
+                       qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
+               }
+               return;
        }
+
+       /*Section not recognized*/
+       qWarning("Unknown section: %s", key.toUtf8().constData());
 }
 
 bool FileAnalyzer::checkFile_CDDA(QFile &file)
@@ -646,14 +706,14 @@ bool FileAnalyzer::createTemplate(void)
        {
                templateFile.write(QString("Gen_%1=%%1%\\n").arg(g_tags_gen[i]).toLatin1().constData());
        }
-       templateFile.write("\r\n");
+       templateFile.write("\\n\r\n");
 
        templateFile.write("Audio;");
        for(size_t i = 0; g_tags_aud[i]; i++)
        {
                templateFile.write(QString("Aud_%1=%%1%\\n").arg(g_tags_aud[i]).toLatin1().constData());
        }
-       templateFile.write("\r\n");
+       templateFile.write("\\n\r\n");
 
        bool success = (templateFile.error() == QFile::NoError);
        templateFile.close();

diff --git a/src/Thread_FileAnalyzer.h b/src/Thread_FileAnalyzer.h
index e2f53d9..1281805 100644 (file)
--- a/src/Thread_FileAnalyzer.h
+++ b/src/Thread_FileAnalyzer.h
@@ -75,7 +75,7 @@ private:
        };
 
        const AudioFileModel analyzeFile(const QString &filePath, int *type);
-       void updateInfo(AudioFileModel &audioFile, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value);
+       void updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigned int *id_val, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value);
        unsigned int parseYear(const QString &str);
        unsigned int parseDuration(const QString &str);
        bool checkFile_CDDA(QFile &file);

diff --git a/src/Tools.h b/src/Tools.h
index f40c4c2..0b5e152 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -65,8 +65,8 @@ 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},
-       {"87ff2ec0db786740e8f3f567238369c907ac6d62a9548377179063ea8b98a78fc9b72254", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 752},
-       {"c0723723091996c4f6ba61322718d7953e258bcf89e70df6fe5b9392b18204f3334592bc", CPU_TYPE_X64_ALL, "mediainfo.x64.exe",  752},
+       {"c3163199c58c1a7d6269ae682a6f73817bae3ffac4a92d9c0de63cc4128386c8c15ad851", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 752},
+       {"1f905a78460ca33b0e9d03eb9cb96d7f9b0959b054d3eb2a6882653117a6ce92545e7748", 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},