Mercurial > hg > svgui

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 13 Jun 2016 12:46:36 +0100
parents f535f6e5dbb0
children 5144d7185fb5
line wrap: on
line diff
--- a/view/View.h	Wed Feb 03 16:51:37 2016 +0000
+++ b/view/View.h	Mon Jun 13 12:46:36 2016 +0100
@@ -62,6 +62,12 @@
      * 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.
@@ -367,7 +373,7 @@
                             bool globalScroll,
                             PlaybackFollowMode followMode);
 
-    void zoomLevelChanged(int, bool);
+    void zoomLevelChanged(int level, bool locked);
 
     void contextHelpChanged(const QString &);