comparison main/main.cpp @ 1305:cf639a91f945 3.0-integration

Merge from branch piper
author Chris Cannam
date Fri, 28 Oct 2016 15:20:58 +0100
parents 7293bc5ee7f8
children e93ad534c1cb
comparison
equal deleted inserted replaced
1270:dbc14db16442 1305:cf639a91f945
275 SVSplash *splash = 0; 275 SVSplash *splash = 0;
276 276
277 QSettings settings; 277 QSettings settings;
278 278
279 settings.beginGroup("Preferences"); 279 settings.beginGroup("Preferences");
280 // Default to using Piper server; can change in preferences
281 if (!settings.contains("run-vamp-plugins-in-process")) {
282 cerr << "setting does not exist yet" << endl;
283 settings.setValue("run-vamp-plugins-in-process", false);
284 }
285 settings.endGroup();
286
287 settings.beginGroup("Preferences");
280 if (settings.value("show-splash", true).toBool()) { 288 if (settings.value("show-splash", true).toBool()) {
281 splash = new SVSplash(); 289 splash = new SVSplash();
282 splash->show(); 290 splash->show();
283 QTimer::singleShot(5000, splash, SLOT(hide())); 291 QTimer::singleShot(5000, splash, SLOT(hide()));
284 application.processEvents(); 292 application.processEvents();
346 if (!QFile(helperPath + helperSuffix).exists()) { 354 if (!QFile(helperPath + helperSuffix).exists()) {
347 cerr << "NOTE: helper not found at " << (helperPath + helperSuffix) 355 cerr << "NOTE: helper not found at " << (helperPath + helperSuffix)
348 << ", trying in my own directory" << endl; 356 << ", trying in my own directory" << endl;
349 helperPath = myDir + "/plugin-checker-helper"; 357 helperPath = myDir + "/plugin-checker-helper";
350 } 358 }
351 helperPath += helperSuffix;
352 if (!QFile(helperPath + helperSuffix).exists()) { 359 if (!QFile(helperPath + helperSuffix).exists()) {
353 cerr << "NOTE: helper not found at " << (helperPath + helperSuffix) 360 cerr << "NOTE: helper not found at " << (helperPath + helperSuffix)
354 << endl; 361 << endl;
355 } 362 }
363 helperPath += helperSuffix;
356 PluginScan::getInstance()->scan(helperPath); 364 PluginScan::getInstance()->scan(helperPath);
357 365
358 // Permit size_t and PropertyName to be used as args in queued signal calls 366 // Permit size_t and PropertyName to be used as args in queued signal calls
359 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); 367 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
360 368