diff data/fileio/AudioFileReaderFactory.cpp @ 290:92e8dbde73cd

* Revert revision 713.  We do like QStrings after all.

--- a/data/fileio/AudioFileReaderFactory.cpp	Thu Aug 16 16:47:07 2007 +0000
+++ b/data/fileio/AudioFileReaderFactory.cpp	Fri Aug 24 11:41:48 2007 +0000
@@ -24,10 +24,10 @@
 #include <QFileInfo>
 #include <iostream>
 
-std::string
+QString
 AudioFileReaderFactory::getKnownExtensions()
 {
-    std::set<std::string> extensions;
+    std::set<QString> extensions;
 
     WavFileReader::getSupportedExtensions(extensions);
 #ifdef HAVE_MAD
@@ -42,8 +42,8 @@
     QuickTimeFileReader::getSupportedExtensions(extensions);
 #endif
 
-    std::string rv;
-    for (std::set<std::string>::const_iterator i = extensions.begin();
+    QString rv;
+    for (std::set<QString>::const_iterator i = extensions.begin();
          i != extensions.end(); ++i) {
         if (i != extensions.begin()) rv += " ";
         rv += "*." + *i;
@@ -53,9 +53,9 @@
 }
 
 AudioFileReader *
-AudioFileReaderFactory::createReader(std::string path)
+AudioFileReaderFactory::createReader(QString path)
 {
-    std::string err;
+    QString err;
 
     AudioFileReader *reader = 0;
 
@@ -63,16 +63,8 @@
     // extension.  If we can't identify one or it fails to load the
     // file, fall back to trying all readers in no particular order.
 
-    std::string ext;
-    std::string::size_type idx = path.rfind('.');
-    if (idx != std::string::npos) {
-        ext = path.substr(idx + 1);
-        for (size_t i = 0; i < ext.length(); ++i) {
-            ext[i] = std::tolower(ext[i]);
-        }
-    }
-
-    std::set<std::string> extensions;
+    QString ext = QFileInfo(path).suffix().toLower();
+    std::set<QString> extensions;
 
     WavFileReader::getSupportedExtensions(extensions);
     if (extensions.find(ext) != extensions.end()) {
@@ -124,11 +116,11 @@
         if (reader->isOK()) return reader;
         if (reader->getError() != "") {
             std::cerr << "AudioFileReaderFactory: Preferred reader for "
-                      << "extension \"" << ext << "\" failed: \""
-                      << reader->getError() << "\"" << std::endl;
+                      << "extension \"" << ext.toStdString() << "\" failed: \""
+                      << reader->getError().toStdString() << "\"" << std::endl;
         } else {
             std::cerr << "AudioFileReaderFactory: Preferred reader for "
-                      << "extension \"" << ext << "\" failed"
+                      << "extension \"" << ext.toStdString() << "\" failed"
                       << std::endl;
         }            
         delete reader;
@@ -139,7 +131,7 @@
     if (reader->isOK()) return reader;
     if (reader->getError() != "") {
 	std::cerr << "AudioFileReaderFactory: WAV file reader error: \""
-                  << reader->getError() << "\"" << std::endl;
+                  << reader->getError().toStdString() << "\"" << std::endl;
     } else {
 	std::cerr << "AudioFileReaderFactory: WAV file reader failed"
                   << std::endl;
@@ -155,7 +147,7 @@
     if (reader->isOK()) return reader;
     if (reader->getError() != "") {
 	std::cerr << "AudioFileReaderFactory: Ogg file reader error: \""
-                  << reader->getError() << "\"" << std::endl;
+                  << reader->getError().toStdString() << "\"" << std::endl;
     } else {
 	std::cerr << "AudioFileReaderFactory: Ogg file reader failed"
                   << std::endl;
@@ -172,7 +164,7 @@
     if (reader->isOK()) return reader;
     if (reader->getError() != "") {
 	std::cerr << "AudioFileReaderFactory: MP3 file reader error: \""
-                  << reader->getError() << "\"" << std::endl;
+                  << reader->getError().toStdString() << "\"" << std::endl;
     } else {
 	std::cerr << "AudioFileReaderFactory: MP3 file reader failed"
                   << std::endl;
@@ -188,7 +180,7 @@
     if (reader->isOK()) return reader;
     if (reader->getError() != "") {
 	std::cerr << "AudioFileReaderFactory: QuickTime file reader error: \""
-                  << reader->getError() << "\"" << std::endl;
+                  << reader->getError().toStdString() << "\"" << std::endl;
     } else {
 	std::cerr << "AudioFileReaderFactory: QuickTime file reader failed"
                   << std::endl;