comparison main/MainWindow.cpp @ 2240:ca0ee1fe88c7 single-point

Support OSC script even with no OSC port
author Chris Cannam
date Thu, 28 Mar 2019 13:38:24 +0000
parents a4dde0f408e4
children e9c77a4c865e
comparison
equal deleted inserted replaced
2239:e870eb307901 2240:ca0ee1fe88c7
330 SVDEBUG << "MainWindow: Creating network permission tester" << endl; 330 SVDEBUG << "MainWindow: Creating network permission tester" << endl;
331 331
332 NetworkPermissionTester tester(withOSCSupport); 332 NetworkPermissionTester tester(withOSCSupport);
333 bool networkPermission = tester.havePermission(); 333 bool networkPermission = tester.havePermission();
334 if (networkPermission) { 334 if (networkPermission) {
335 if (withOSCSupport) {
336 SVDEBUG << "MainWindow: Creating OSC queue" << endl;
337 startOSCQueue();
338 }
339
340 SVDEBUG << "MainWindow: Starting transform population thread" << endl; 335 SVDEBUG << "MainWindow: Starting transform population thread" << endl;
341 TransformFactory::getInstance()->startPopulationThread(); 336 TransformFactory::getInstance()->startPopulationThread();
342 337
343 SVDEBUG << "MainWindow: Creating surveyer" << endl; 338 SVDEBUG << "MainWindow: Creating surveyer" << endl;
344 m_surveyer = new Surveyer 339 m_surveyer = new Surveyer
352 } else { 347 } else {
353 m_surveyer = nullptr; 348 m_surveyer = nullptr;
354 m_versionTester = nullptr; 349 m_versionTester = nullptr;
355 } 350 }
356 351
352 if (withOSCSupport && networkPermission) {
353 SVDEBUG << "MainWindow: Creating OSC queue with network port"
354 << endl;
355 startOSCQueue(true);
356 } else {
357 SVDEBUG << "MainWindow: Creating internal-only OSC queue without port"
358 << endl;
359 startOSCQueue(false);
360 }
361
357 /* 362 /*
358 QTimer::singleShot(500, this, SLOT(betaReleaseWarning())); 363 QTimer::singleShot(500, this, SLOT(betaReleaseWarning()));
359 */ 364 */
360 365
361 QString warning = PluginScan::getInstance()->getStartupFailureReport(); 366 QString warning = PluginScan::getInstance()->getStartupFailureReport();