Mercurial > hg > svcore
diff data/fileio/WavFileReader.h @ 290:92e8dbde73cd
* Revert revision 713. We do like QStrings after all.
author | Chris Cannam |
---|---|
date | Fri, 24 Aug 2007 11:41:48 +0000 |
parents | 20028c634494 |
children | 3a6725f285d6 |
line wrap: on
line diff
--- a/data/fileio/WavFileReader.h Thu Aug 16 16:47:07 2007 +0000 +++ b/data/fileio/WavFileReader.h Fri Aug 24 11:41:48 2007 +0000 @@ -26,9 +26,11 @@ class WavFileReader : public AudioFileReader { public: - WavFileReader(std::string path, bool fileUpdating = false); + WavFileReader(QString path, bool fileUpdating = false); virtual ~WavFileReader(); + virtual QString getError() const { return m_error; } + /** * Must be safe to call from multiple threads with different * arguments on the same object at the same time. @@ -36,7 +38,7 @@ virtual void getInterleavedFrames(size_t start, size_t count, SampleBlock &frames) const; - static void getSupportedExtensions(std::set<std::string> &extensions); + static void getSupportedExtensions(std::set<QString> &extensions); virtual int getDecodeCompletion() const { return 100; } @@ -49,7 +51,8 @@ SF_INFO m_fileInfo; SNDFILE *m_file; - std::string m_path; + QString m_path; + QString m_error; mutable QMutex m_mutex; mutable float *m_buffer;