Mercurial > hg > sonic-visualiser

comparison main/MainWindow.h @ 1523:f73a4e8c7040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch 3.0-integration
author Chris Cannam
date Tue, 10 Jan 2017 16:21:32 +0000
parents f016667b4adb
children 3b8bd7e520c5
comparison
equal deleted inserted replaced
1522:a0a37ed3c07a 1523:f73a4e8c7040
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);
42 41
43 public slots: 42 public slots:
44 virtual void preferenceChanged(PropertyContainer::PropertyName); 43 virtual void preferenceChanged(PropertyContainer::PropertyName);
44 virtual void coloursChanged();
45
45 virtual bool commitData(bool mayAskUser); 46 virtual bool commitData(bool mayAskUser);
46 47
47 void goFullScreen(); 48 void goFullScreen();
48 void endFullScreen(); 49 void endFullScreen();
49 50
51 virtual void importAudio(); 52 virtual void importAudio();
52 virtual void importMoreAudio(); 53 virtual void importMoreAudio();
53 virtual void replaceMainAudio(); 54 virtual void replaceMainAudio();
54 virtual void openSomething(); 55 virtual void openSomething();
55 virtual void openLocation(); 56 virtual void openLocation();
56 virtual void openRecentFile(); 57 /* F. Nicol patch 13 Aug. 2016 */
58 virtual void openRecentFile(const QString& );
59 /* End of F. Nicol patch 13 Aug. 2016 */
57 virtual void applyTemplate(); 60 virtual void applyTemplate();
58 virtual void exportAudio(); 61 virtual void exportAudio();
59 virtual void exportAudioData(); 62 virtual void exportAudioData();
60 virtual void importLayer(); 63 virtual void importLayer();
61 virtual void exportLayer(); 64 virtual void exportLayer();
62 virtual void exportImage(); 65 virtual void exportImage();
66 virtual void exportSVG();
67 virtual void browseRecordedAudio();
63 virtual void saveSession(); 68 virtual void saveSession();
64 virtual void saveSessionAs(); 69 virtual void saveSessionAs();
65 virtual void newSession(); 70 virtual void newSession();
66 virtual void closeSession(); 71 virtual void closeSession();
67 virtual void preferences(); 72 virtual void preferences();
86 91
87 virtual void setInstantsNumbering(); 92 virtual void setInstantsNumbering();
88 virtual void setInstantsCounterCycle(); 93 virtual void setInstantsCounterCycle();
89 virtual void setInstantsCounters(); 94 virtual void setInstantsCounters();
90 virtual void resetInstantsCounters(); 95 virtual void resetInstantsCounters();
96 virtual void subdivideInstants();
97 virtual void winnowInstants();
91 98
92 virtual void modelGenerationFailed(QString, QString); 99 virtual void modelGenerationFailed(QString, QString);
93 virtual void modelGenerationWarning(QString, QString); 100 virtual void modelGenerationWarning(QString, QString);
94 virtual void modelRegenerationFailed(QString, QString, QString); 101 virtual void modelRegenerationFailed(QString, QString, QString);
95 virtual void modelRegenerationWarning(QString, QString, QString); 102 virtual void modelRegenerationWarning(QString, QString, QString);
96 virtual void alignmentFailed(QString, QString); 103 virtual void alignmentFailed(QString);
97 104
98 virtual void rightButtonMenuRequested(Pane *, QPoint point); 105 virtual void rightButtonMenuRequested(Pane *, QPoint point);
99 106
100 virtual void propertyStacksResized(int); 107 virtual void propertyStacksResized(int);
101 108
124 131
125 virtual void speedUpPlayback(); 132 virtual void speedUpPlayback();
126 virtual void slowDownPlayback(); 133 virtual void slowDownPlayback();
127 virtual void restoreNormalPlayback(); 134 virtual void restoreNormalPlayback();
128 135
129 virtual void outputLevelsChanged(float, float); 136 virtual void monitoringLevelsChanged(float, float);
130 137
131 virtual void layerRemoved(Layer *); 138 virtual void layerRemoved(Layer *);
132 virtual void layerInAView(Layer *, bool); 139 virtual void layerInAView(Layer *, bool);
133 140
134 virtual void mainModelChanged(WaveFileModel *); 141 virtual void mainModelChanged(WaveFileModel *);
142 virtual void mainModelGainChanged(float);
143 virtual void mainModelPanChanged(float);
135 virtual void modelAdded(Model *); 144 virtual void modelAdded(Model *);
136 virtual void modelAboutToBeDeleted(Model *); 145 virtual void modelAboutToBeDeleted(Model *);
137 146
138 virtual void showLayerTree(); 147 virtual void showLayerTree();
139 virtual void showActivityLog(); 148 virtual void showActivityLog();
144 153
145 virtual void handleOSCMessage(const OSCMessage &); 154 virtual void handleOSCMessage(const OSCMessage &);
146 virtual void midiEventsAvailable(); 155 virtual void midiEventsAvailable();
147 virtual void playStatusChanged(bool); 156 virtual void playStatusChanged(bool);
148 157
158 virtual void betaReleaseWarning();
159 virtual void pluginPopulationWarning();
160
149 virtual void saveSessionAsTemplate(); 161 virtual void saveSessionAsTemplate();
150 virtual void manageSavedTemplates(); 162 virtual void manageSavedTemplates();
151 163
152 virtual void website(); 164 virtual void website();
153 virtual void help(); 165 virtual void help();
154 virtual void about(); 166 virtual void about();
167 virtual void whatsNew();
155 virtual void keyReference(); 168 virtual void keyReference();
156 virtual void newerVersionAvailable(QString); 169 virtual void newerVersionAvailable(QString);
157 170
158 protected: 171 protected:
159 Overview *m_overview; 172 Overview *m_overview;
160 Fader *m_fader; 173 LevelPanToolButton *m_mainLevelPan;
161 AudioDial *m_playSpeed; 174 AudioDial *m_playSpeed;
162 WaveformLayer *m_panLayer; 175 WaveformLayer *m_panLayer;
163 176
164 QScrollArea *m_mainScroll; 177 QScrollArea *m_mainScroll;
165 178
185 QAction *m_rwdAction; 198 QAction *m_rwdAction;
186 QAction *m_ffwdAction; 199 QAction *m_ffwdAction;
187 QAction *m_ffwdSimilarAction; 200 QAction *m_ffwdSimilarAction;
188 QAction *m_ffwdEndAction; 201 QAction *m_ffwdEndAction;
189 QAction *m_playAction; 202 QAction *m_playAction;
203 QAction *m_recordAction;
190 QAction *m_playSelectionAction; 204 QAction *m_playSelectionAction;
191 QAction *m_playLoopAction; 205 QAction *m_playLoopAction;
192 QAction *m_manageTemplatesAction; 206 QAction *m_manageTemplatesAction;
193 QAction *m_zoomInAction; 207 QAction *m_zoomInAction;
194 QAction *m_zoomOutAction; 208 QAction *m_zoomOutAction;
215 229
216 QFileSystemWatcher *m_templateWatcher; 230 QFileSystemWatcher *m_templateWatcher;
217 231
218 Surveyer *m_surveyer; 232 Surveyer *m_surveyer;
219 VersionTester *m_versionTester; 233 VersionTester *m_versionTester;
234 QString m_newerVersionIs;
220 235
221 struct LayerConfiguration { 236 struct LayerConfiguration {
222 LayerConfiguration(LayerFactory::LayerType _layer 237 LayerConfiguration(LayerFactory::LayerType _layer
223 = LayerFactory::TimeRuler, 238 = LayerFactory::TimeRuler,
224 Model *_source = 0, 239 Model *_source = 0,