comparison framework/MainWindowBase.h @ 368:f1cab64363d7 warnfix_no_size_t

Merge from branch tony_integration
author Chris Cannam
date Wed, 18 Jun 2014 08:45:13 +0100
parents 0876ea394902 1f2a4ad79967
children 024226dd9f51
comparison
equal deleted inserted replaced
367:1e4fa2007e61 368:f1cab64363d7
109 virtual bool saveSessionFile(QString path); 109 virtual bool saveSessionFile(QString path);
110 virtual bool saveSessionTemplate(QString path); 110 virtual bool saveSessionTemplate(QString path);
111 111
112 /// Implementation of FrameTimer interface method 112 /// Implementation of FrameTimer interface method
113 virtual int getFrame() const; 113 virtual int getFrame() const;
114
115 void setDefaultFfwdRwdStep(RealTime step) {
116 m_defaultFfwdRwdStep = step;
117 }
114 118
115 signals: 119 signals:
116 // Used to toggle the availability of menu actions 120 // Used to toggle the availability of menu actions
117 void canAddPane(bool); 121 void canAddPane(bool);
118 void canDeleteCurrentPane(bool); 122 void canDeleteCurrentPane(bool);
150 void canSelectPreviousPane(bool); 154 void canSelectPreviousPane(bool);
151 void canSelectNextPane(bool); 155 void canSelectNextPane(bool);
152 void canSelectPreviousLayer(bool); 156 void canSelectPreviousLayer(bool);
153 void canSelectNextLayer(bool); 157 void canSelectNextLayer(bool);
154 void canSave(bool); 158 void canSave(bool);
159 void canSaveAs(bool);
155 void hideSplash(); 160 void hideSplash();
156 void sessionLoaded(); 161 void sessionLoaded();
157 void audioFileLoaded(); 162 void audioFileLoaded();
158 void replacedDocument(); 163 void replacedDocument();
159 void activity(QString); 164 void activity(QString);
328 333
329 int m_lastPlayStatusSec; 334 int m_lastPlayStatusSec;
330 mutable QString m_myStatusMessage; 335 mutable QString m_myStatusMessage;
331 336
332 bool m_initialDarkBackground; 337 bool m_initialDarkBackground;
338
339 RealTime m_defaultFfwdRwdStep;
333 340
334 WaveFileModel *getMainModel(); 341 WaveFileModel *getMainModel();
335 const WaveFileModel *getMainModel() const; 342 const WaveFileModel *getMainModel() const;
336 void createDocument(); 343 void createDocument();
337 344