comparison data/fileio/WavFileReader.h @ 1038:cc27f35aa75c cxx11

Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 36f79bc5c3d7
children 843f67be0ed9
comparison
equal deleted inserted replaced
1037:bf0e5944289b 1038:cc27f35aa75c
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 void getInterleavedFrames(sv_frame_t start, sv_frame_t count,
54 SampleBlock &frames) const; 54 SampleBlock &frames) const;
55 55
56 static void getSupportedExtensions(std::set<QString> &extensions); 56 static void getSupportedExtensions(std::set<QString> &extensions);
57 static bool supportsExtension(QString ext); 57 static bool supportsExtension(QString ext);
58 static bool supportsContentType(QString type); 58 static bool supportsContentType(QString type);
75 75
76 bool m_seekable; 76 bool m_seekable;
77 77
78 mutable QMutex m_mutex; 78 mutable QMutex m_mutex;
79 mutable float *m_buffer; 79 mutable float *m_buffer;
80 mutable int m_bufsiz; 80 mutable sv_frame_t m_bufsiz;
81 mutable int m_lastStart; 81 mutable sv_frame_t m_lastStart;
82 mutable int m_lastCount; 82 mutable sv_frame_t m_lastCount;
83 83
84 bool m_updating; 84 bool m_updating;
85 }; 85 };
86 86
87 #endif 87 #endif