diff main/main.cpp @ 1053:2f8018eb1573 3.0-integration

Merge from branch recording

--- a/main/main.cpp	Wed Aug 05 17:47:12 2015 +0100
+++ b/main/main.cpp	Thu Aug 20 13:15:19 2015 +0100
@@ -335,7 +335,10 @@
     // Permit size_t and PropertyName to be used as args in queued signal calls
     qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
 
-    MainWindow *gui = new MainWindow(audioOutput, oscSupport);
+    MainWindow::SoundOptions options = MainWindow::WithEverything;
+    if (!audioOutput) options = 0;
+    
+    MainWindow *gui = new MainWindow(options, oscSupport);
     application.setMainWindow(gui);
     InteractiveFileFinder::setParentWidget(gui);
     TransformUserConfigurator::setParentWidget(gui);