comparison data/fileio/test/AudioFileReaderTest.h @ 1699:ad33d6c10738 single-point

Merge from default branch

 #include "../AudioFileReaderFactory.h"
 #include "../AudioFileReader.h"
 #include "../WavFileWriter.h"
 
 #include "AudioTestData.h"
+#include "UnsupportedFormat.h"
 
 #include <cmath>
 
 #include <QObject>
 #include <QtTest>

         bitdepth = 16;
         if (bits.length() > 2) {
             bitdepth = bits[2].toInt();
         }
     }
-    
+
     void getExpectedThresholds(QString format,
                                QString filename,
                                bool resampled,
                                bool gapless,
                                bool normalised,

         AudioFileReader *reader =
             AudioFileReaderFactory::createReader
             (audioDir + "/" + format + "/" + audiofile, params);
         
         if (!reader) {
+            if (isLegitimatelyUnsupported(format)) {
 #if ( QT_VERSION >= 0x050000 )
-            QSKIP("Unsupported file, skipping");
+                QSKIP("Unsupported file, skipping");
 #else
-            QSKIP("Unsupported file, skipping", SkipSingle);
+                QSKIP("Unsupported file, skipping", SkipSingle);
 #endif
+            }
         }
 
         QString extension;
         sv_samplerate_t fileRate;
         int channels;