diff data/model/WritableWaveFileModel.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).
author Chris Cannam
date Thu, 05 Oct 2006 11:03:06 +0000
parents b0f4555b625e
children f86b74d1b143
line wrap: on
line diff
--- a/data/model/WritableWaveFileModel.h	Thu Oct 05 11:02:05 2006 +0000
+++ b/data/model/WritableWaveFileModel.h	Thu Oct 05 11:03:06 2006 +0000
@@ -21,8 +21,7 @@
 class WavFileWriter;
 class WavFileReader;
 
-class WritableWaveFileModel : public RangeSummarisableTimeValueModel,
-                              virtual public PowerOfSqrtTwoZoomConstraint
+class WritableWaveFileModel : public RangeSummarisableTimeValueModel
 {
     Q_OBJECT
 
@@ -36,6 +35,11 @@
     bool isOK() const;
     bool isReady(int *) const;
 
+    const ZoomConstraint *getZoomConstraint() const {
+        static PowerOfSqrtTwoZoomConstraint zc;
+        return &zc;
+    }
+
     size_t getFrameCount() const;
     size_t getChannelCount() const { return m_channels; }
     size_t getSampleRate() const { return m_sampleRate; }