Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-20 21:21:25 +01:00
Code Issues Releases Wiki Activity

Construct all toolbars with back-reference to the project...

Browse Source 
... and eliminate many uses of GetActiveProject
This commit is contained in:
Paul Licameli
2019-06-12 19:21:54 -04:00
parent 5751ddba4f
commit c6f24d864b
24 changed files with 149 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/toolbars/DeviceToolBar.cpp
View File

@@ -72,8 +72,8 @@ static int DeviceToolbarPrefsID()
}
//Standard contructor
DeviceToolBar::DeviceToolBar()
: ToolBar(DeviceBarID, _("Device"), wxT("Device"), true)
DeviceToolBar::DeviceToolBar( AudacityProject &project )
: ToolBar( project, DeviceBarID, _("Device"), wxT("Device"), true )
{
wxTheApp->Bind( EVT_RESCANNED_DEVICES,
&DeviceToolBar::OnRescannedDevices, this );
@@ -351,12 +351,8 @@ void DeviceToolBar::EnableDisableButtons()
// Here we should relinquish focus
if (audioStreamActive) {
wxWindow *focus = wxWindow::FindFocus();
if (focus == mHost || focus == mInput || focus == mOutput || focus == mInputChannels) {
AudacityProject *activeProject = GetActiveProject();
if (activeProject) {
TrackPanel::Get( *activeProject ).SetFocus();
}
}
if (focus == mHost || focus == mInput || focus == mOutput || focus == mInputChannels)
TrackPanel::Get( mProject ).SetFocus();
}
mHost->Enable(!audioStreamActive);
@@ -873,5 +869,6 @@ void DeviceToolBar::ShowComboDialog(wxChoice *combo, const wxString &title)
}
static RegisteredToolbarFactory factory{ DeviceBarID,
[](AudacityProject *){ return ToolBar::Holder{ safenew DeviceToolBar }; }
[]( AudacityProject &project ){
return ToolBar::Holder{ safenew DeviceToolBar{ project } }; }
};