From f6cfa0597e7ed36c5132329e236237cfd3602ddd Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Thu, 19 Mar 2020 22:04:09 -0500 Subject: [PATCH] Bug 1366 - Using the sliders in Mixer Toolbar in a Project-2 alters levels in on-going recording (or playback) in Project-1 --- src/toolbars/MixerToolBar.cpp | 15 ++++++++++++++- src/toolbars/MixerToolBar.h | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/toolbars/MixerToolBar.cpp b/src/toolbars/MixerToolBar.cpp index e25d66eb1..10540c7db 100644 --- a/src/toolbars/MixerToolBar.cpp +++ b/src/toolbars/MixerToolBar.cpp @@ -127,6 +127,20 @@ void MixerToolBar::Populate() // Add a little space Add(2, -1); + + wxTheApp->Bind(EVT_AUDIOIO_CAPTURE, + &MixerToolBar::OnAudioCapture, + this); +} + +void MixerToolBar::OnAudioCapture(wxCommandEvent & event) +{ + AudacityProject *p = &mProject; + if (event.GetEventObject() != p) + { + mInputSlider->Enable(!event.GetInt()); + mOutputSlider->Enable(!event.GetInt()); + } } //Also from SelectionBar; @@ -213,7 +227,6 @@ void MixerToolBar::UpdateControls() // Show or hide the input slider based on whether it works auto gAudioIO = AudioIO::Get(); - mInputSlider->Enable(gAudioIO->InputMixerWorks()); gAudioIO->GetMixer(&inputSource, &inputVolume, &playbackVolume); diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h index 5e663a55e..75844ad1e 100644 --- a/src/toolbars/MixerToolBar.h +++ b/src/toolbars/MixerToolBar.h @@ -46,6 +46,8 @@ class MixerToolBar final : public ToolBar { void OnSlider(wxCommandEvent & event); + void OnAudioCapture(wxCommandEvent & event); + void ShowOutputGainDialog(); void ShowInputGainDialog();