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

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

--- a/data/fileio/WavFileReader.cpp	Thu Aug 16 16:47:07 2007 +0000
+++ b/data/fileio/WavFileReader.cpp	Fri Aug 24 11:41:48 2007 +0000
@@ -19,7 +19,7 @@
 
 #include <QMutexLocker>
 
-WavFileReader::WavFileReader(std::string path, bool fileUpdating) :
+WavFileReader::WavFileReader(QString path, bool fileUpdating) :
     m_file(0),
     m_path(path),
     m_buffer(0),
@@ -34,16 +34,18 @@
 
     m_fileInfo.format = 0;
     m_fileInfo.frames = 0;
-    m_file = sf_open(m_path.c_str(), SFM_READ, &m_fileInfo);
+    m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
 
     if (!m_file || (!fileUpdating && m_fileInfo.channels <= 0)) {
 	std::cerr << "WavFileReader::initialize: Failed to open file ("
 		  << sf_strerror(m_file) << ")" << std::endl;
 
 	if (m_file) {
-	    setError("Couldn't load audio file", sf_strerror(m_file));
+	    m_error = QString("Couldn't load audio file '%1':\n%2")
+		.arg(m_path).arg(sf_strerror(m_file));
 	} else {
-	    setError("Failed to open audio file");
+	    m_error = QString("Failed to open audio file '%1'")
+		.arg(m_path);
 	}
 	return;
     }
@@ -72,7 +74,7 @@
 
     if (m_file) {
         sf_close(m_file);
-        m_file = sf_open(m_path.c_str(), SFM_READ, &m_fileInfo);
+        m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
         if (!m_file || m_fileInfo.channels <= 0) {
             std::cerr << "WavFileReader::updateFrameCount: Failed to open file ("
                       << sf_strerror(m_file) << ")" << std::endl;
@@ -162,7 +164,7 @@
 }
 
 void
-WavFileReader::getSupportedExtensions(std::set<std::string> &extensions)
+WavFileReader::getSupportedExtensions(std::set<QString> &extensions)
 {
     int count;