Mercurial > hg > tony
comparison src/MainWindow.cpp @ 277:2c19b0537bd2
Merge from default branch in all subrepos (after tony_integration merge in SV)
| author | Chris Cannam |
|---|---|
| date | Wed, 14 May 2014 10:02:33 +0100 |
| parents | a895c7177841 |
| children | 2a18f846dd6c |
comparison
equal
deleted
inserted
replaced
| 276:cacf3fdf8208 | 277:2c19b0537bd2 |
|---|---|
| 87 | 87 |
| 88 using std::vector; | 88 using std::vector; |
| 89 | 89 |
| 90 | 90 |
| 91 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : | 91 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : |
| 92 MainWindowBase(withAudioOutput, withOSCSupport, false), | 92 MainWindowBase(withAudioOutput, false), |
| 93 m_overview(0), | 93 m_overview(0), |
| 94 m_mainMenusCreated(false), | 94 m_mainMenusCreated(false), |
| 95 m_playbackMenu(0), | 95 m_playbackMenu(0), |
| 96 m_recentFilesMenu(0), | 96 m_recentFilesMenu(0), |
| 97 m_rightButtonMenu(0), | 97 m_rightButtonMenu(0), |