Mercurial > hg > sonic-visualiser
comparison main/main.cpp @ 1053:2f8018eb1573 3.0-integration
Merge from branch recording
author | Chris Cannam |
---|---|
date | Thu, 20 Aug 2015 13:15:19 +0100 |
parents | 4a8f87c175f7 691a8210e480 |
children | a1ce253dc90e |
comparison
equal
deleted
inserted
replaced
1042:100b3fd8e171 | 1053:2f8018eb1573 |
---|---|
333 StoreStartupLocale(); | 333 StoreStartupLocale(); |
334 | 334 |
335 // Permit size_t and PropertyName to be used as args in queued signal calls | 335 // Permit size_t and PropertyName to be used as args in queued signal calls |
336 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); | 336 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); |
337 | 337 |
338 MainWindow *gui = new MainWindow(audioOutput, oscSupport); | 338 MainWindow::SoundOptions options = MainWindow::WithEverything; |
339 if (!audioOutput) options = 0; | |
340 | |
341 MainWindow *gui = new MainWindow(options, oscSupport); | |
339 application.setMainWindow(gui); | 342 application.setMainWindow(gui); |
340 InteractiveFileFinder::setParentWidget(gui); | 343 InteractiveFileFinder::setParentWidget(gui); |
341 TransformUserConfigurator::setParentWidget(gui); | 344 TransformUserConfigurator::setParentWidget(gui); |
342 if (splash) { | 345 if (splash) { |
343 QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide())); | 346 QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide())); |