OSDN Git Service

Better method to prevent MediaInfo from detecting playlist files.
authorlordmulder <mulder2@gmx.de>
Fri, 20 Apr 2012 20:39:19 +0000 (22:39 +0200)
committerlordmulder <mulder2@gmx.de>
Fri, 20 Apr 2012 20:39:19 +0000 (22:39 +0200)
src/Config.h
src/Thread_FileAnalyzer.cpp

index 6182087..4ac04e2 100644 (file)
@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI                                    0
 #define VER_LAMEXP_MINOR_LO                                    4
 #define VER_LAMEXP_TYPE                                                RC
-#define VER_LAMEXP_PATCH                                       3
-#define VER_LAMEXP_BUILD                                       985
+#define VER_LAMEXP_PATCH                                       4
+#define VER_LAMEXP_BUILD                                       986
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
index 4690f71..4599a9d 100644 (file)
@@ -105,6 +105,7 @@ const char *FileAnalyzer::g_tags_gen[] =
 const char *FileAnalyzer::g_tags_aud[] =
 {
        "ID",
+       "Source",
        "Format",
        "Format_Profile",
        "Format_Version",
@@ -383,21 +384,28 @@ void FileAnalyzer::updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigne
                return;
        }
 
-       /*Skip?*/
+       /*Skip or empty?*/
        if((*skipNext) || value.isEmpty())
        {
                return;
        }
 
+       /*Playlist file?*/
+       if(IS_KEY("Aud_Source"))
+       {
+               *skipNext = true;
+               audioFile.setFormatContainerType(QString());
+               audioFile.setFormatAudioType(QString());
+               qWarning("Skipping info for playlist file!");
+               return;
+       }
+
        /*General Section*/
        if(IS_SEC("Gen"))
        {
                if(IS_KEY("Gen_Format"))
                {
-                       if(value.compare("HLS", Qt::CaseInsensitive)) //MediaInfo detects "HLS" for .m3u files, we'll ignore that
-                       {
-                               audioFile.setFormatContainerType(value);
-                       }
+                       audioFile.setFormatContainerType(value);
                }
                else if(IS_KEY("Gen_Format_Profile"))
                {