comparison view/View.h @ 1057:218be6cf2d4f spectrogram-minor-refactor

Merge from default branch

     /**
      * Deleting a View does not delete any of its layers.  They should
      * be managed elsewhere (e.g. by the Document).
      */
     virtual ~View();
+
+    /**
+     * Retrieve the id of this object. Views have their own unique
+     * ids, but ViewProxy objects share the id of their View.
+     */
+    int getId() const { return m_id; }
     
     /**
      * Retrieve the first visible sample frame on the widget.
      * This is a calculated value based on the centre-frame, widget
      * width and zoom level.  The result may be negative.

 
     void centreFrameChanged(sv_frame_t frame,
                             bool globalScroll,
                             PlaybackFollowMode followMode);
 
-    void zoomLevelChanged(int, bool);
+    void zoomLevelChanged(int level, bool locked);
 
     void contextHelpChanged(const QString &);
 
 public slots:
     virtual void modelChanged();