Mercurial > hg > svcore

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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).
author Chris Cannam
date Thu, 05 Oct 2006 11:03:06 +0000
parents b0f4555b625e
children 89b05b679dc3
line wrap: on
line diff
--- a/data/model/WaveFileModel.h	Thu Oct 05 11:02:05 2006 +0000
+++ b/data/model/WaveFileModel.h	Thu Oct 05 11:03:06 2006 +0000
@@ -27,8 +27,7 @@
 
 class AudioFileReader;
 
-class WaveFileModel : public RangeSummarisableTimeValueModel,
-		      virtual public PowerOfSqrtTwoZoomConstraint
+class WaveFileModel : public RangeSummarisableTimeValueModel
 {
     Q_OBJECT
 
@@ -40,6 +39,8 @@
     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;
@@ -107,6 +108,7 @@
     QTimer *m_updateTimer;
     size_t m_lastFillExtent;
     bool m_exiting;
+    static PowerOfSqrtTwoZoomConstraint m_zoomConstraint;
 };    
 
 #endif