Mercurial > hg > svcore

changeset 784:8e8d0f1f4f85 qt5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Thu, 28 Mar 2013 10:02:16 +0000
parents 711a4652d616 (current diff) 459235dccff6 (diff)
children a98af74f8e2f
files
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/WavFileReader.cpp	Wed Mar 27 17:21:58 2013 +0000
+++ b/data/fileio/WavFileReader.cpp	Thu Mar 28 10:02:16 2013 +0000
@@ -185,7 +185,14 @@
     for (int i = 0; i < count; ++i) {
         info.format = i;
         if (!sf_command(0, SFC_GET_FORMAT_MAJOR, &info, sizeof(info))) {
-            extensions.insert(QString(info.extension).toLower());
+            QString ext = QString(info.extension).toLower();
+            extensions.insert(ext);
+            if (ext == "oga") {
+                // libsndfile is awfully proper, it says it only
+                // supports .oga but lots of Ogg audio files in the
+                // wild are .ogg and it will accept that
+                extensions.insert("ogg");
+            }
         }
     }
 }