comparison src/Analyser.h @ 341:6b57c58b88d2

Cancel async layer creation in Tony when selection is changed during it
author Chris Cannam
date Mon, 16 Jun 2014 09:28:12 +0100
parents b176ea403ee8
children 56109ef020b4 ffd1a89a68fa
comparison
equal deleted inserted replaced
340:1277a5dd11f6 341:6b57c58b88d2
16 #ifndef ANALYSER_H 16 #ifndef ANALYSER_H
17 #define ANALYSER_H 17 #define ANALYSER_H
18 18
19 #include <QObject> 19 #include <QObject>
20 #include <QRect> 20 #include <QRect>
21 #include <QMutex>
21 22
22 #include <map> 23 #include <map>
23 #include <vector> 24 #include <vector>
24 25
25 #include "framework/Document.h" 26 #include "framework/Document.h"
226 Clipboard m_preAnalysis; 227 Clipboard m_preAnalysis;
227 Selection m_reAnalysingSelection; 228 Selection m_reAnalysingSelection;
228 std::vector<Layer *> m_reAnalysisCandidates; 229 std::vector<Layer *> m_reAnalysisCandidates;
229 int m_currentCandidate; 230 int m_currentCandidate;
230 bool m_candidatesVisible; 231 bool m_candidatesVisible;
232 Document::LayerCreationAsyncHandle m_currentAsyncHandle;
233 QMutex m_asyncMutex;
231 234
232 QString doAllAnalyses(bool withPitchTrack); 235 QString doAllAnalyses(bool withPitchTrack);
233 236
234 QString addVisualisations(); 237 QString addVisualisations();
235 QString addWaveform(); 238 QString addWaveform();
238 void discardPitchCandidates(); 241 void discardPitchCandidates();
239 242
240 void stackLayers(); 243 void stackLayers();
241 244
242 // Document::LayerCreationHandler method 245 // Document::LayerCreationHandler method
243 void layersCreated(std::vector<Layer *>, std::vector<Layer *>); 246 void layersCreated(Document::LayerCreationAsyncHandle,
247 std::vector<Layer *>, std::vector<Layer *>);
244 248
245 void saveState(Component c) const; 249 void saveState(Component c) const;
246 void loadState(Component c); 250 void loadState(Component c);
247 }; 251 };
248 252