Mercurial > hg > sonic-visualiser
changeset 1045:691a8210e480 recording
Start stubbing in audio record
| author | Chris Cannam |
|---|---|
| date | Tue, 18 Aug 2015 14:04:47 +0100 |
| parents | be5b29ce283b |
| children | ecb0615e0ea0 |
| files | .hgsubstate main/MainWindow.cpp main/MainWindow.h main/main.cpp |
| diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Aug 17 16:19:01 2015 +0100 +++ b/.hgsubstate Tue Aug 18 14:04:47 2015 +0100 @@ -3,6 +3,6 @@ 94b6ebd5e8ab897e5b294fd77b4113e8d6d78b13 bqvec d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds -fdce8a452b19b639c3408b741bfe9a035e345cca svapp +f93820d36cb010ac454c453f25b42118ff486264 svapp 020277bfafcb99d636a13830dc72c237cf072b0c svcore 7dcd035176851a9f13539d852ccec828a37d2863 svgui
--- a/main/MainWindow.cpp Mon Aug 17 16:19:01 2015 +0100 +++ b/main/MainWindow.cpp Tue Aug 18 14:04:47 2015 +0100 @@ -130,8 +130,8 @@ using std::set; -MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : - MainWindowBase(withAudioOutput, true), +MainWindow::MainWindow(SoundOptions options, bool withOSCSupport) : + MainWindowBase(options), m_overview(0), m_mainMenusCreated(false), m_paneMenu(0),
--- a/main/MainWindow.h Mon Aug 17 16:19:01 2015 +0100 +++ b/main/MainWindow.h Tue Aug 18 14:04:47 2015 +0100 @@ -32,8 +32,7 @@ Q_OBJECT public: - MainWindow(bool withAudioOutput = true, - bool withOSCSupport = true); + MainWindow(SoundOptions options, bool withOSCSupport = true); virtual ~MainWindow(); signals:
--- a/main/main.cpp Mon Aug 17 16:19:01 2015 +0100 +++ b/main/main.cpp Tue Aug 18 14:04:47 2015 +0100 @@ -223,7 +223,6 @@ protected: MainWindow *m_mainWindow; bool event(QEvent *); - }; int @@ -345,7 +344,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);