diff src/MainWindow.h @ 402:a0eedd10dee3 cxx11-types

Merge from default branch

--- a/src/MainWindow.h	Wed Mar 11 12:20:06 2015 +0000
+++ b/src/MainWindow.h	Mon Mar 23 10:33:32 2015 +0000
@@ -27,7 +27,7 @@
     Q_OBJECT
 
 public:
-    MainWindow(bool withAudioOutput = true);
+    MainWindow(bool withAudioOutput = true, bool withSonification = true, bool withSpectrogram = true);
     virtual ~MainWindow();
 
 signals:
@@ -186,6 +186,9 @@
     void selectOneNoteRight();
     void selectOneNoteLeft();
 
+    void ffwd();
+    void rewind();
+
 protected:
     Analyser      *m_analyser;
 
@@ -230,6 +233,9 @@
 
     sv_frame_t m_selectionAnchor;
 
+    bool m_withSonification;
+    bool m_withSpectrogram;
+
     Analyser::FrequencyRange m_pendingConstraint;
 
     QString exportToSVL(QString path, Layer *layer);