Mercurial > hg > sonic-visualiser
comparison main/MainWindow.cpp @ 686:7f7fba33b7de
Add network permission to prefs; make OSC support one of the things that depends on it
author | Chris Cannam |
---|---|
date | Thu, 12 Dec 2013 15:20:42 +0000 |
parents | 17fbb120222b |
children | 959f01137742 049a9418cc27 |
comparison
equal
deleted
inserted
replaced
683:e84a1c6fb35a | 686:7f7fba33b7de |
---|---|
126 using std::map; | 126 using std::map; |
127 using std::set; | 127 using std::set; |
128 | 128 |
129 | 129 |
130 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : | 130 MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : |
131 MainWindowBase(withAudioOutput, withOSCSupport, true), | 131 MainWindowBase(withAudioOutput, true), |
132 m_overview(0), | 132 m_overview(0), |
133 m_mainMenusCreated(false), | 133 m_mainMenusCreated(false), |
134 m_paneMenu(0), | 134 m_paneMenu(0), |
135 m_layerMenu(0), | 135 m_layerMenu(0), |
136 m_transformsMenu(0), | 136 m_transformsMenu(0), |
300 this, SLOT(midiEventsAvailable())); | 300 this, SLOT(midiEventsAvailable())); |
301 | 301 |
302 NetworkPermissionTester tester; | 302 NetworkPermissionTester tester; |
303 bool networkPermission = tester.havePermission(); | 303 bool networkPermission = tester.havePermission(); |
304 if (networkPermission) { | 304 if (networkPermission) { |
305 if (withOSCSupport) { | |
306 startOSCQueue(); | |
307 } | |
305 TransformFactory::getInstance()->startPopulationThread(); | 308 TransformFactory::getInstance()->startPopulationThread(); |
306 m_surveyer = new Surveyer | 309 m_surveyer = new Surveyer |
307 ("sonicvisualiser.org", "survey23-present.txt", "survey23.php"); | 310 ("sonicvisualiser.org", "survey23-present.txt", "survey23.php"); |
308 m_versionTester = new VersionTester | 311 m_versionTester = new VersionTester |
309 ("sonicvisualiser.org", "latest-version.txt", SV_VERSION); | 312 ("sonicvisualiser.org", "latest-version.txt", SV_VERSION); |