comparison data/fft/FFTDataServer.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 59e7fe1b1003
children 1a73618b0b67
comparison
equal deleted inserted replaced
1037:bf0e5944289b 1038:cc27f35aa75c
106 return getMagnitudeAt(x, y) > threshold; 106 return getMagnitudeAt(x, y) > threshold;
107 } 107 }
108 108
109 QString getError() const; 109 QString getError() const;
110 int getFillCompletion() const; 110 int getFillCompletion() const;
111 int getFillExtent() const; 111 sv_frame_t getFillExtent() const;
112 112
113 private: 113 private:
114 FFTDataServer(QString fileBaseName, 114 FFTDataServer(QString fileBaseName,
115 const DenseTimeValueModel *model, 115 const DenseTimeValueModel *model,
116 int channel, 116 int channel,
243 public: 243 public:
244 FillThread(FFTDataServer &server, int fillFromColumn) : 244 FillThread(FFTDataServer &server, int fillFromColumn) :
245 m_server(server), m_extent(0), m_completion(0), 245 m_server(server), m_extent(0), m_completion(0),
246 m_fillFrom(fillFromColumn) { } 246 m_fillFrom(fillFromColumn) { }
247 247
248 int getExtent() const { return m_extent; } 248 sv_frame_t getExtent() const { return m_extent; }
249 int getCompletion() const { return m_completion ? m_completion : 1; } 249 int getCompletion() const { return m_completion ? m_completion : 1; }
250 QString getError() const { return m_error; } 250 QString getError() const { return m_error; }
251 virtual void run(); 251 virtual void run();
252 252
253 protected: 253 protected:
254 FFTDataServer &m_server; 254 FFTDataServer &m_server;
255 int m_extent; 255 sv_frame_t m_extent;
256 int m_completion; 256 int m_completion;
257 int m_fillFrom; 257 sv_frame_t m_fillFrom;
258 QString m_error; 258 QString m_error;
259 }; 259 };
260 260
261 bool m_exiting; 261 bool m_exiting;
262 bool m_suspended; 262 bool m_suspended;