comparison src/MainWindow.cpp @ 279:28437904bd38

merge
author matthiasm
date Wed, 21 May 2014 18:34:42 +0100
parents 2c19b0537bd2
children 2a18f846dd6c
comparison
equal deleted inserted replaced
278:c01dd6ee127c 279:28437904bd38
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),