comparison data/fileio/WavFileReader.h @ 1069:32ab6c48efaa

Merge from branch tonioni
author Chris Cannam
date Mon, 20 Apr 2015 09:11:34 +0100
parents 843f67be0ed9
children 4d9816ba0ebe
comparison
equal deleted inserted replaced
1036:682d64f05e72 1069:32ab6c48efaa
48 48
49 /** 49 /**
50 * Must be safe to call from multiple threads with different 50 * Must be safe to call from multiple threads with different
51 * arguments on the same object at the same time. 51 * arguments on the same object at the same time.
52 */ 52 */
53 virtual void getInterleavedFrames(int start, int count, 53 virtual SampleBlock getInterleavedFrames(sv_frame_t start, sv_frame_t count) const;
54 SampleBlock &frames) const;
55 54
56 static void getSupportedExtensions(std::set<QString> &extensions); 55 static void getSupportedExtensions(std::set<QString> &extensions);
57 static bool supportsExtension(QString ext); 56 static bool supportsExtension(QString ext);
58 static bool supportsContentType(QString type); 57 static bool supportsContentType(QString type);
59 static bool supports(FileSource &source); 58 static bool supports(FileSource &source);
74 QString m_error; 73 QString m_error;
75 74
76 bool m_seekable; 75 bool m_seekable;
77 76
78 mutable QMutex m_mutex; 77 mutable QMutex m_mutex;
79 mutable float *m_buffer; 78 mutable SampleBlock m_buffer;
80 mutable int m_bufsiz; 79 mutable sv_frame_t m_bufsiz;
81 mutable int m_lastStart; 80 mutable sv_frame_t m_lastStart;
82 mutable int m_lastCount; 81 mutable sv_frame_t m_lastCount;
83 82
84 bool m_updating; 83 bool m_updating;
85 }; 84 };
86 85
87 #endif 86 #endif