comparison base/View.h @ 22:a1a6acb7cd37

* Some fixes to waveform layer greyscaling
* Tidying in panner class

      * Return the closest frame to the given pixel x-coordinate.
      */
     long getFrameForX(int x) const;
 
     /**
-     * Return the zoom level, i.e. the number of frames per pixel.
-     */
-    virtual int getZoomLevel() const { return m_zoomLevel; }
+     * Return the zoom level, i.e. the number of frames per pixel
+     */
+    int getZoomLevel() const;
 
     /**
      * Set the zoom level, i.e. the number of frames per pixel.  The
      * centre frame will be unchanged; the start and end frames will
      * change.

 
     void checkProgress(void *object);
 
     size_t              m_centreFrame;
     int                 m_zoomLevel;
-    bool                m_newModel;
     bool                m_followPan;
     bool                m_followZoom;
     PlaybackFollowMode  m_followPlay;
     size_t              m_playPointerFrame;
     bool                m_lightBackground;