comparison data/fileio/CodedAudioFileReader.h @ 933:d03b3d956358 warnfix_no_size_t

Merge from branch tony_integration
author Chris Cannam
date Wed, 18 Jun 2014 08:34:46 +0100
parents 59e7fe1b1003 f3cda3280398
children 36f79bc5c3d7
comparison
equal deleted inserted replaced
932:e06f03013f46 933:d03b3d956358
48 48
49 signals: 49 signals:
50 void progress(int); 50 void progress(int);
51 51
52 protected: 52 protected:
53 CodedAudioFileReader(CacheMode cacheMode, int targetRate); 53 CodedAudioFileReader(CacheMode cacheMode,
54 int targetRate,
55 bool normalised);
54 56
55 void initialiseDecodeCache(); // samplerate, channels must have been set 57 void initialiseDecodeCache(); // samplerate, channels must have been set
56 58
57 // may throw InsufficientDiscSpace: 59 // may throw InsufficientDiscSpace:
58 void addSamplesToDecodeCache(float **samples, int nframes); 60 void addSamplesToDecodeCache(float **samples, int nframes);
89 int m_cacheWriteBufferSize; // frames 91 int m_cacheWriteBufferSize; // frames
90 92
91 Resampler *m_resampler; 93 Resampler *m_resampler;
92 float *m_resampleBuffer; 94 float *m_resampleBuffer;
93 int m_fileFrameCount; 95 int m_fileFrameCount;
96
97 bool m_normalised;
98 float m_max;
99 float m_gain;
94 }; 100 };
95 101
96 #endif 102 #endif