Mercurial > hg > tony
comparison src/main.cpp @ 474:7665cc683dd1 2.0-integration
Merge through to branch for Tony 2.0
author | Chris Cannam |
---|---|
date | Thu, 20 Aug 2015 14:54:21 +0100 |
parents | 60779173dddf |
children | fce075d2952f |
comparison
equal
deleted
inserted
replaced
473:ceecc71eeb20 | 474:7665cc683dd1 |
---|---|
241 | 241 |
242 // Permit size_t and PropertyName to be used as args in queued signal calls | 242 // Permit size_t and PropertyName to be used as args in queued signal calls |
243 qRegisterMetaType<size_t>("size_t"); | 243 qRegisterMetaType<size_t>("size_t"); |
244 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); | 244 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); |
245 | 245 |
246 MainWindow *gui = new MainWindow(audioOutput, sonification, spectrogram); | 246 MainWindow::SoundOptions options = MainWindow::WithEverything; |
247 if (!audioOutput) options = 0; | |
248 | |
249 MainWindow *gui = new MainWindow(options, sonification, spectrogram); | |
247 application.setMainWindow(gui); | 250 application.setMainWindow(gui); |
248 if (splash) { | 251 if (splash) { |
249 QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide())); | 252 QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide())); |
250 } | 253 } |
251 | 254 |