comparison data/model/WaveFileModel.h @ 179:0ed2b2e26b44

* Tidy up inheritance hierarchy of model classes -- remove ZoomConstraint as
  a base class (make it a member instead) and remove virtual inheritances of
  QObject (no longer necessary).

 
 #include <stdlib.h>
 
 class AudioFileReader;
 
-class WaveFileModel : public RangeSummarisableTimeValueModel,
-		      virtual public PowerOfSqrtTwoZoomConstraint
+class WaveFileModel : public RangeSummarisableTimeValueModel
 {
     Q_OBJECT
 
 public:
     WaveFileModel(QString path);
     WaveFileModel(QString path, AudioFileReader *reader);
     ~WaveFileModel();
 
     bool isOK() const;
     bool isReady(int *) const;
+
+    const ZoomConstraint *getZoomConstraint() const { return &m_zoomConstraint; }
 
     size_t getFrameCount() const;
     size_t getChannelCount() const;
     size_t getSampleRate() const;
 

     mutable QMutex m_mutex;
     RangeCacheFillThread *m_fillThread;
     QTimer *m_updateTimer;
     size_t m_lastFillExtent;
     bool m_exiting;
+    static PowerOfSqrtTwoZoomConstraint m_zoomConstraint;
 };    
 
 #endif