comparison 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
comparison
equal deleted inserted replaced
289:3020904de772 290:92e8dbde73cd
35 enum DecodeMode { 35 enum DecodeMode {
36 DecodeAtOnce, // decode the file on construction, with progress dialog 36 DecodeAtOnce, // decode the file on construction, with progress dialog
37 DecodeThreaded // decode in a background thread after construction 37 DecodeThreaded // decode in a background thread after construction
38 }; 38 };
39 39
40 OggVorbisFileReader(std::string path, DecodeMode decodeMode, 40 OggVorbisFileReader(QString path, DecodeMode decodeMode,
41 CacheMode cacheMode); 41 CacheMode cacheMode);
42 virtual ~OggVorbisFileReader(); 42 virtual ~OggVorbisFileReader();
43 43
44 virtual std::string getTitle() const { return m_title; } 44 virtual QString getError() const { return m_error; }
45
46 virtual QString getTitle() const { return m_title; }
45 47
46 static void getSupportedExtensions(std::set<std::string> &extensions); 48 static void getSupportedExtensions(std::set<QString> &extensions);
47 49
48 virtual int getDecodeCompletion() const { return m_completion; } 50 virtual int getDecodeCompletion() const { return m_completion; }
49 51
50 virtual bool isUpdating() const { 52 virtual bool isUpdating() const {
51 return m_decodeThread && m_decodeThread->isRunning(); 53 return m_decodeThread && m_decodeThread->isRunning();
52 } 54 }
53 55
54 protected: 56 protected:
55 std::string m_path; 57 QString m_path;
56 std::string m_title; 58 QString m_error;
59 QString m_title;
57 60
58 OGGZ *m_oggz; 61 OGGZ *m_oggz;
59 FishSound *m_fishSound; 62 FishSound *m_fishSound;
60 QProgressDialog *m_progress; 63 QProgressDialog *m_progress;
61 size_t m_fileSize; 64 size_t m_fileSize;