Mercurial > hg > tony
changeset 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 | 590a6ec92360 |
| children | 4b021eaaea23 |
| files | main/MainWindow.cpp main/MainWindow.h main/main.cpp repoint-lock.json version.h |
| diffstat | 5 files changed, 20 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Mon Oct 14 14:56:17 2019 +0100 +++ b/main/MainWindow.cpp Wed Oct 16 16:03:47 2019 +0100 @@ -95,8 +95,11 @@ using std::vector; -MainWindow::MainWindow(SoundOptions options, bool withSonification, bool withSpectrogram) : - MainWindowBase(options, +MainWindow::MainWindow(AudioMode audioMode, + bool withSonification, + bool withSpectrogram) : + MainWindowBase(audioMode, + MainWindowBase::MIDI_NONE, int(PaneStack::Option::NoPropertyStacks) | int(PaneStack::Option::NoPaneAccessories)), m_overview(0),
--- a/main/MainWindow.h Mon Oct 14 14:56:17 2019 +0100 +++ b/main/MainWindow.h Wed Oct 16 16:03:47 2019 +0100 @@ -28,7 +28,9 @@ Q_OBJECT public: - MainWindow(SoundOptions options, bool withSonification = true, bool withSpectrogram = true); + MainWindow(AudioMode audioMode, + bool withSonification = true, + bool withSpectrogram = true); virtual ~MainWindow(); signals:
--- a/main/main.cpp Mon Oct 14 14:56:17 2019 +0100 +++ b/main/main.cpp Wed Oct 16 16:03:47 2019 +0100 @@ -282,10 +282,14 @@ qRegisterMetaType<size_t>("size_t"); qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); - MainWindow::SoundOptions options = MainWindow::WithEverything; - if (!audioOutput) options = 0; + MainWindow::AudioMode audioMode = + MainWindow::AUDIO_PLAYBACK_NOW_RECORD_LATER; + + if (!audioOutput) { + audioMode = MainWindow::AUDIO_NONE; + } - MainWindow *gui = new MainWindow(options, sonification, spectrogram); + MainWindow *gui = new MainWindow(audioMode, sonification, spectrogram); application.setMainWindow(gui); if (splash) { QObject::connect(gui, SIGNAL(hideSplash()), splash, SLOT(hide()));
--- a/repoint-lock.json Mon Oct 14 14:56:17 2019 +0100 +++ b/repoint-lock.json Wed Oct 16 16:03:47 2019 +0100 @@ -4,13 +4,13 @@ "pin": "0b6802e3b755" }, "svcore": { - "pin": "6eb3a76c74f7" + "pin": "c7e9e63c7bae" }, "svgui": { - "pin": "bfd8b22fd67c" + "pin": "2d4107270015" }, "svapp": { - "pin": "8e9702c0b9c7" + "pin": "fe268c16ae28" }, "checker": { "pin": "c8c17e51aab0" @@ -34,7 +34,7 @@ "pin": "8c4162878ae6" }, "bqaudiostream": { - "pin": "e3a6c41e042f" + "pin": "a0926b93e771" }, "bqthingfactory": { "pin": "7686116dcdd5"