comparison view/ViewManager.h @ 1327:646e713a4632 zoom

Further ZoomLevel fixes

 #include "base/ViewManagerBase.h"
 #include "base/Selection.h"
 #include "base/Command.h"
 #include "base/Clipboard.h"
 #include "base/BaseTypes.h"
+#include "base/ZoomLevel.h"
 
 class AudioPlaySource;
 class AudioRecordTarget;
 class Model;
 

 
     bool isPlaying() const;
     bool isRecording() const;
 
     sv_frame_t getGlobalCentreFrame() const; // the set method is a slot
-    int getGlobalZoom() const;
+    ZoomLevel getGlobalZoom() const;
 
     sv_frame_t getPlaybackFrame() const; // the set method is a slot
 
     // Only meaningful in solo mode, and used for optional alignment feature
     Model *getPlaybackModel() const;

 
     /** Emitted when user scrolls a view, but doesn't affect global centre. */
     void viewCentreFrameChanged(View *v, sv_frame_t frame);
 
     /** Emitted when a view zooms. */
-    void viewZoomLevelChanged(View *v, int zoom, bool locked);
+    void viewZoomLevelChanged(View *v, ZoomLevel zoom, bool locked);
 
     /** Emitted when the playback frame changes. */
     void playbackFrameChanged(sv_frame_t frame);
 
     /** Emitted when the output or record levels change. Values in range 0.0 -> 1.0. */

     /** Emitted when any loggable activity has occurred. */
     void activity(QString);
 
 public slots:
     void viewCentreFrameChanged(sv_frame_t, bool, PlaybackFollowMode);
-    void viewZoomLevelChanged(int, bool);
+    void viewZoomLevelChanged(ZoomLevel, bool);
     void setGlobalCentreFrame(sv_frame_t);
     void setPlaybackFrame(sv_frame_t);
     void playStatusChanged(bool playing);
     void recordStatusChanged(bool recording);
 

 protected:
     AudioPlaySource *m_playSource;
     AudioRecordTarget *m_recordTarget;
     
     sv_frame_t m_globalCentreFrame;
-    int m_globalZoom;
+    ZoomLevel m_globalZoom;
     mutable sv_frame_t m_playbackFrame;
     Model *m_playbackModel; //!!!
     sv_samplerate_t m_mainModelSampleRate;
 
     float m_lastLeft;