comparison main/main.cpp @ 635:41e221cd740e

Update subrepos and adapt to new MainWindowBase API, ensuring that we don't get the recording permission dialog until we actually record
author Chris Cannam
date Wed, 16 Oct 2019 16:03:47 +0100
parents e06cbdc7301c
children de3d628e048e
comparison
equal deleted inserted replaced
634:590a6ec92360 635:41e221cd740e
280 280
281 // Permit size_t and PropertyName to be used as args in queued signal calls 281 // Permit size_t and PropertyName to be used as args in queued signal calls
282 qRegisterMetaType<size_t>("size_t"); 282 qRegisterMetaType<size_t>("size_t");
283 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); 283 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
284 284
285 MainWindow::SoundOptions options = MainWindow::WithEverything; 285 MainWindow::AudioMode audioMode =
286 if (!audioOutput) options = 0; 286 MainWindow::AUDIO_PLAYBACK_NOW_RECORD_LATER;
287 287
288 MainWindow *gui = new MainWindow(options, sonification, spectrogram); 288 if (!audioOutput) {
289 audioMode = MainWindow::AUDIO_NONE;
290 }
291
292 MainWindow *gui = new MainWindow(audioMode, sonification, spectrogram);
289 application.setMainWindow(gui); 293 application.setMainWindow(gui);
290 if (splash) { 294 if (splash) {
291 QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide())); 295 QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide()));
292 } 296 }
293 297