Mercurial > hg > sonic-visualiser
comparison main/MainWindow.h @ 1053:2f8018eb1573 3.0-integration
Merge from branch recording
author | Chris Cannam |
---|---|
date | Thu, 20 Aug 2015 13:15:19 +0100 |
parents | 2aaeb77609cf |
children | 25e1cc4f34eb |
comparison
equal
deleted
inserted
replaced
1042:100b3fd8e171 | 1053:2f8018eb1573 |
---|---|
30 class MainWindow : public MainWindowBase | 30 class MainWindow : public MainWindowBase |
31 { | 31 { |
32 Q_OBJECT | 32 Q_OBJECT |
33 | 33 |
34 public: | 34 public: |
35 MainWindow(bool withAudioOutput = true, | 35 MainWindow(SoundOptions options, bool withOSCSupport = true); |
36 bool withOSCSupport = true); | |
37 virtual ~MainWindow(); | 36 virtual ~MainWindow(); |
38 | 37 |
39 signals: | 38 signals: |
40 void canChangeSolo(bool); | 39 void canChangeSolo(bool); |
41 void canAlign(bool); | 40 void canAlign(bool); |
186 QAction *m_rwdAction; | 185 QAction *m_rwdAction; |
187 QAction *m_ffwdAction; | 186 QAction *m_ffwdAction; |
188 QAction *m_ffwdSimilarAction; | 187 QAction *m_ffwdSimilarAction; |
189 QAction *m_ffwdEndAction; | 188 QAction *m_ffwdEndAction; |
190 QAction *m_playAction; | 189 QAction *m_playAction; |
190 QAction *m_recordAction; | |
191 QAction *m_playSelectionAction; | 191 QAction *m_playSelectionAction; |
192 QAction *m_playLoopAction; | 192 QAction *m_playLoopAction; |
193 QAction *m_manageTemplatesAction; | 193 QAction *m_manageTemplatesAction; |
194 QAction *m_zoomInAction; | 194 QAction *m_zoomInAction; |
195 QAction *m_zoomOutAction; | 195 QAction *m_zoomOutAction; |