Mercurial > hg > svcore
diff data/fileio/OggVorbisFileReader.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 | c022976d18e8 |
line wrap: on
line diff
--- a/data/fileio/OggVorbisFileReader.h Thu Aug 16 16:47:07 2007 +0000 +++ b/data/fileio/OggVorbisFileReader.h Fri Aug 24 11:41:48 2007 +0000 @@ -37,13 +37,15 @@ DecodeThreaded // decode in a background thread after construction }; - OggVorbisFileReader(std::string path, DecodeMode decodeMode, + OggVorbisFileReader(QString path, DecodeMode decodeMode, CacheMode cacheMode); virtual ~OggVorbisFileReader(); - virtual std::string getTitle() const { return m_title; } + virtual QString getError() const { return m_error; } + + virtual QString getTitle() const { return m_title; } - static void getSupportedExtensions(std::set<std::string> &extensions); + static void getSupportedExtensions(std::set<QString> &extensions); virtual int getDecodeCompletion() const { return m_completion; } @@ -52,8 +54,9 @@ } protected: - std::string m_path; - std::string m_title; + QString m_path; + QString m_error; + QString m_title; OGGZ *m_oggz; FishSound *m_fishSound;