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

Merge from default branch
author Chris Cannam
date Mon, 23 Mar 2015 10:33:32 +0000
parents ffd1a89a68fa 836afacacd92
children 51a51a174fe7
comparison
equal deleted inserted replaced
400:4b9b7ff3f19c 402:a0eedd10dee3
25 class MainWindow : public MainWindowBase 25 class MainWindow : public MainWindowBase
26 { 26 {
27 Q_OBJECT 27 Q_OBJECT
28 28
29 public: 29 public:
30 MainWindow(bool withAudioOutput = true); 30 MainWindow(bool withAudioOutput = true, bool withSonification = true, bool withSpectrogram = true);
31 virtual ~MainWindow(); 31 virtual ~MainWindow();
32 32
33 signals: 33 signals:
34 void canExportPitchTrack(bool); 34 void canExportPitchTrack(bool);
35 void canExportNotes(bool); 35 void canExportNotes(bool);
183 183
184 void moveOneNoteRight(); 184 void moveOneNoteRight();
185 void moveOneNoteLeft(); 185 void moveOneNoteLeft();
186 void selectOneNoteRight(); 186 void selectOneNoteRight();
187 void selectOneNoteLeft(); 187 void selectOneNoteLeft();
188
189 void ffwd();
190 void rewind();
188 191
189 protected: 192 protected:
190 Analyser *m_analyser; 193 Analyser *m_analyser;
191 194
192 Overview *m_overview; 195 Overview *m_overview;
228 KeyReference *m_keyReference; 231 KeyReference *m_keyReference;
229 VersionTester *m_versionTester; 232 VersionTester *m_versionTester;
230 233
231 sv_frame_t m_selectionAnchor; 234 sv_frame_t m_selectionAnchor;
232 235
236 bool m_withSonification;
237 bool m_withSpectrogram;
238
233 Analyser::FrequencyRange m_pendingConstraint; 239 Analyser::FrequencyRange m_pendingConstraint;
234 240
235 QString exportToSVL(QString path, Layer *layer); 241 QString exportToSVL(QString path, Layer *layer);
236 FileOpenStatus importPitchLayer(FileSource source); 242 FileOpenStatus importPitchLayer(FileSource source);
237 243