Mercurial > hg > sonic-visualiser
comparison main/MainWindow.h @ 245:fc542303eda2 1.2-stable
* merge from trunk (1.2 ended up being tracked from trunk, but we may want
this branch for fixes later)
author | Chris Cannam |
---|---|
date | Wed, 27 Feb 2008 10:32:45 +0000 |
parents | 474ddd0f4bb4 |
children |
comparison
equal
deleted
inserted
replaced
223:35e438b612ff | 245:fc542303eda2 |
---|---|
111 | 111 |
112 virtual void setInstantsNumbering(); | 112 virtual void setInstantsNumbering(); |
113 virtual void setInstantsCounterCycle(); | 113 virtual void setInstantsCounterCycle(); |
114 virtual void resetInstantsCounters(); | 114 virtual void resetInstantsCounters(); |
115 | 115 |
116 virtual void modelGenerationFailed(QString); | 116 virtual void modelGenerationFailed(QString, QString); |
117 virtual void modelRegenerationFailed(QString, QString); | 117 virtual void modelGenerationWarning(QString, QString); |
118 virtual void modelRegenerationFailed(QString, QString, QString); | |
119 virtual void modelRegenerationWarning(QString, QString, QString); | |
120 virtual void alignmentFailed(QString, QString); | |
118 | 121 |
119 virtual void rightButtonMenuRequested(Pane *, QPoint point); | 122 virtual void rightButtonMenuRequested(Pane *, QPoint point); |
123 | |
124 virtual void propertyStacksResized(int); | |
120 | 125 |
121 virtual void addPane(); | 126 virtual void addPane(); |
122 virtual void addLayer(); | 127 virtual void addLayer(); |
123 virtual void renameCurrentLayer(); | 128 virtual void renameCurrentLayer(); |
124 | 129 |
130 | 135 |
131 virtual void setupRecentFilesMenu(); | 136 virtual void setupRecentFilesMenu(); |
132 virtual void setupRecentTransformsMenu(); | 137 virtual void setupRecentTransformsMenu(); |
133 | 138 |
134 virtual void playSpeedChanged(int); | 139 virtual void playSpeedChanged(int); |
135 #ifndef HAVE_RUBBERBAND | |
136 virtual void playSharpenToggled(); | |
137 virtual void playMonoToggled(); | |
138 #endif | |
139 virtual void playSoloToggled(); | 140 virtual void playSoloToggled(); |
140 virtual void alignToggled(); | 141 virtual void alignToggled(); |
142 | |
143 virtual void currentPaneChanged(Pane *); | |
141 | 144 |
142 virtual void speedUpPlayback(); | 145 virtual void speedUpPlayback(); |
143 virtual void slowDownPlayback(); | 146 virtual void slowDownPlayback(); |
144 virtual void restoreNormalPlayback(); | 147 virtual void restoreNormalPlayback(); |
145 | 148 |
165 | 168 |
166 protected: | 169 protected: |
167 Overview *m_overview; | 170 Overview *m_overview; |
168 Fader *m_fader; | 171 Fader *m_fader; |
169 AudioDial *m_playSpeed; | 172 AudioDial *m_playSpeed; |
170 #ifndef HAVE_RUBBERBAND | |
171 QPushButton *m_playSharpen; | |
172 QPushButton *m_playMono; | |
173 #endif | |
174 WaveformLayer *m_panLayer; | 173 WaveformLayer *m_panLayer; |
175 | 174 |
176 bool m_mainMenusCreated; | 175 bool m_mainMenusCreated; |
177 QMenu *m_paneMenu; | 176 QMenu *m_paneMenu; |
178 QMenu *m_layerMenu; | 177 QMenu *m_layerMenu; |
193 QAction *m_rwdAction; | 192 QAction *m_rwdAction; |
194 | 193 |
195 bool m_soloModified; | 194 bool m_soloModified; |
196 bool m_prevSolo; | 195 bool m_prevSolo; |
197 | 196 |
197 QFrame *m_playControlsSpacer; | |
198 int m_playControlsWidth; | |
199 | |
198 QPointer<PreferencesDialog> m_preferencesDialog; | 200 QPointer<PreferencesDialog> m_preferencesDialog; |
199 QPointer<LayerTreeDialog> m_layerTreeDialog; | 201 QPointer<LayerTreeDialog> m_layerTreeDialog; |
200 | 202 |
201 KeyReference *m_keyReference; | 203 KeyReference *m_keyReference; |
202 | 204 |
203 struct PaneConfiguration { | 205 struct LayerConfiguration { |
204 PaneConfiguration(LayerFactory::LayerType _layer | 206 LayerConfiguration(LayerFactory::LayerType _layer |
205 = LayerFactory::TimeRuler, | 207 = LayerFactory::TimeRuler, |
206 Model *_source = 0, | 208 Model *_source = 0, |
207 int _channel = -1) : | 209 int _channel = -1) : |
208 layer(_layer), sourceModel(_source), channel(_channel) { } | 210 layer(_layer), sourceModel(_source), channel(_channel) { } |
209 LayerFactory::LayerType layer; | 211 LayerFactory::LayerType layer; |
210 Model *sourceModel; | 212 Model *sourceModel; |
211 int channel; | 213 int channel; |
212 }; | 214 }; |
213 | 215 |
214 typedef std::map<QAction *, PaneConfiguration> PaneActionMap; | 216 typedef std::map<QAction *, LayerConfiguration> PaneActionMap; |
215 PaneActionMap m_paneActions; | 217 PaneActionMap m_paneActions; |
218 | |
219 typedef std::map<QAction *, LayerConfiguration> LayerActionMap; | |
220 LayerActionMap m_layerActions; | |
216 | 221 |
217 typedef std::map<QAction *, TransformId> TransformActionMap; | 222 typedef std::map<QAction *, TransformId> TransformActionMap; |
218 TransformActionMap m_transformActions; | 223 TransformActionMap m_transformActions; |
219 | 224 |
220 typedef std::map<TransformId, QAction *> TransformActionReverseMap; | 225 typedef std::map<TransformId, QAction *> TransformActionReverseMap; |
221 TransformActionReverseMap m_transformActionsReverse; | 226 TransformActionReverseMap m_transformActionsReverse; |
222 | |
223 typedef std::map<QAction *, LayerFactory::LayerType> LayerActionMap; | |
224 LayerActionMap m_layerActions; | |
225 | 227 |
226 typedef std::map<QAction *, Layer *> ExistingLayerActionMap; | 228 typedef std::map<QAction *, Layer *> ExistingLayerActionMap; |
227 ExistingLayerActionMap m_existingLayerActions; | 229 ExistingLayerActionMap m_existingLayerActions; |
228 ExistingLayerActionMap m_sliceActions; | 230 ExistingLayerActionMap m_sliceActions; |
229 | 231 |
241 virtual void setupTransformsMenu(); | 243 virtual void setupTransformsMenu(); |
242 virtual void setupHelpMenu(); | 244 virtual void setupHelpMenu(); |
243 virtual void setupExistingLayersMenus(); | 245 virtual void setupExistingLayersMenus(); |
244 virtual void setupToolbars(); | 246 virtual void setupToolbars(); |
245 | 247 |
246 virtual void addPane(const PaneConfiguration &configuration, QString text); | 248 virtual void addPane(const LayerConfiguration &configuration, QString text); |
247 | 249 |
248 virtual void closeEvent(QCloseEvent *e); | 250 virtual void closeEvent(QCloseEvent *e); |
249 virtual bool checkSaveModified(); | 251 virtual bool checkSaveModified(); |
250 | 252 |
251 virtual void updateVisibleRangeDisplay(Pane *p) const; | 253 virtual void updateVisibleRangeDisplay(Pane *p) const; |