comparison data/fileio/WavFileReader.h @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:16 +0100
parents 59e7fe1b1003
children 36f79bc5c3d7
comparison
equal deleted inserted replaced
917:49618f39ff09 936:0c1d6de8f44b
46 46
47 /** 47 /**
48 * Must be safe to call from multiple threads with different 48 * Must be safe to call from multiple threads with different
49 * arguments on the same object at the same time. 49 * arguments on the same object at the same time.
50 */ 50 */
51 virtual void getInterleavedFrames(size_t start, size_t count, 51 virtual void getInterleavedFrames(int start, int count,
52 SampleBlock &frames) const; 52 SampleBlock &frames) const;
53 53
54 static void getSupportedExtensions(std::set<QString> &extensions); 54 static void getSupportedExtensions(std::set<QString> &extensions);
55 static bool supportsExtension(QString ext); 55 static bool supportsExtension(QString ext);
56 static bool supportsContentType(QString type); 56 static bool supportsContentType(QString type);
73 73
74 bool m_seekable; 74 bool m_seekable;
75 75
76 mutable QMutex m_mutex; 76 mutable QMutex m_mutex;
77 mutable float *m_buffer; 77 mutable float *m_buffer;
78 mutable size_t m_bufsiz; 78 mutable int m_bufsiz;
79 mutable size_t m_lastStart; 79 mutable int m_lastStart;
80 mutable size_t m_lastCount; 80 mutable int m_lastCount;
81 81
82 bool m_updating; 82 bool m_updating;
83 }; 83 };
84 84
85 #endif 85 #endif