Mercurial > hg > svcore
diff data/fft/FFTDataServer.h @ 1069:32ab6c48efaa
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:11:34 +0100 |
parents | 1a73618b0b67 |
children | 027d8b943be5 |
line wrap: on
line diff
--- a/data/fft/FFTDataServer.h Mon Mar 02 17:21:34 2015 +0000 +++ b/data/fft/FFTDataServer.h Mon Apr 20 09:11:34 2015 +0100 @@ -49,7 +49,7 @@ bool polar, StorageAdviser::Criteria criteria = StorageAdviser::NoCriteria, - int fillFromColumn = 0); + sv_frame_t fillFromFrame = 0); static FFTDataServer *getFuzzyInstance(const DenseTimeValueModel *model, int channel, @@ -60,7 +60,7 @@ bool polar, StorageAdviser::Criteria criteria = StorageAdviser::NoCriteria, - int fillFromColumn = 0); + sv_frame_t fillFromFrame = 0); static void claimInstance(FFTDataServer *); static void releaseInstance(FFTDataServer *); @@ -108,7 +108,7 @@ QString getError() const; int getFillCompletion() const; - int getFillExtent() const; + sv_frame_t getFillExtent() const; private: FFTDataServer(QString fileBaseName, @@ -120,7 +120,7 @@ int fftSize, bool polar, StorageAdviser::Criteria criteria, - int fillFromColumn = 0); + sv_frame_t fillFromFrame = 0); virtual ~FFTDataServer(); @@ -241,20 +241,20 @@ class FillThread : public Thread { public: - FillThread(FFTDataServer &server, int fillFromColumn) : + FillThread(FFTDataServer &server, sv_frame_t fillFromFrame) : m_server(server), m_extent(0), m_completion(0), - m_fillFrom(fillFromColumn) { } + m_fillFrom(fillFromFrame) { } - int getExtent() const { return m_extent; } + sv_frame_t getExtent() const { return m_extent; } int getCompletion() const { return m_completion ? m_completion : 1; } QString getError() const { return m_error; } virtual void run(); protected: FFTDataServer &m_server; - int m_extent; + sv_frame_t m_extent; int m_completion; - int m_fillFrom; + sv_frame_t m_fillFrom; QString m_error; };