audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove non-UI functions in TrackPanelListener

This commit is contained in:
Paul Licameli 2019-01-25 15:53:09 -05:00
parent 485a9bbb58
commit 71adb89342
6 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MixerBoard.cpp
View File

@ -417,7 +417,7 @@ void MixerTrackCluster::HandleSliderGain(const bool bWantPushState /*= false*/)
// Update the TrackPanel correspondingly.
mProject->RefreshTPTrack(mTrack.get());
if (bWantPushState)
mProject->TP_PushState(_("Moved gain slider"), _("Gain"), UndoPush::CONSOLIDATE );
mProject->PushState(_("Moved gain slider"), _("Gain"), UndoPush::CONSOLIDATE );
}
#ifdef EXPERIMENTAL_MIDI_OUT
@ -430,7 +430,7 @@ void MixerTrackCluster::HandleSliderVelocity(const bool bWantPushState /*= false
// Update the TrackPanel correspondingly.
mProject->RefreshTPTrack(mTrack.get());
if (bWantPushState)
mProject->TP_PushState(_("Moved velocity slider"), _("Velocity"), UndoPush::CONSOLIDATE);
mProject->PushState(_("Moved velocity slider"), _("Velocity"), UndoPush::CONSOLIDATE);
}
#endif
@ -446,7 +446,7 @@ void MixerTrackCluster::HandleSliderPan(const bool bWantPushState /*= false*/)
mProject->RefreshTPTrack(mTrack.get());
if (bWantPushState)
mProject->TP_PushState(_("Moved pan slider"), _("Pan"), UndoPush::CONSOLIDATE );
mProject->PushState(_("Moved pan slider"), _("Pan"), UndoPush::CONSOLIDATE );
}
void MixerTrackCluster::ResetMeter(const bool bResetClipping)

18
src/Project.cpp
View File

@ -4826,11 +4826,6 @@ ControlToolBar *AudacityProject::GetControlToolBar()
NULL);
}
ToolsToolBar * AudacityProject::TP_GetToolsToolBar()
{
return GetToolsToolBar();
}
DeviceToolBar *AudacityProject::GetDeviceToolBar()
{
return (DeviceToolBar *)
@ -5059,19 +5054,6 @@ void AudacityProject::RefreshTPTrack(Track* pTrk, bool refreshbacking /*= true*/
}
// TrackPanel callback method
void AudacityProject::TP_PushState(const wxString &desc, const wxString &shortDesc,
UndoPush flags)
{
PushState(desc, shortDesc, flags);
}
// TrackPanel callback method
void AudacityProject::TP_ModifyState(bool bWantsAutoSave)
{
ModifyState(bWantsAutoSave);
}
// TrackPanel callback method
void AudacityProject::TP_ScrollLeft()
{

6
src/Project.h
View File

@ -473,12 +473,6 @@ public:
void TP_DisplaySelection() override;
void TP_DisplayStatusMessage(const wxString &msg) override;
ToolsToolBar * TP_GetToolsToolBar() override;
void TP_PushState(const wxString &longDesc, const wxString &shortDesc,
UndoPush flags) override;
void TP_ModifyState(bool bWantsAutoSave) override; // if true, writes auto-save file. Should set only if you really want the state change restored after
// a crash, as it can take many seconds for large (eg. 10 track-hours) projects
void TP_RedrawScrollbars() override;
void TP_ScrollLeft() override;
void TP_ScrollRight() override;

4
src/TrackPanel.cpp
View File

@ -523,7 +523,7 @@ void TrackPanel::OnPaint(wxPaintEvent & /* event */)
void TrackPanel::MakeParentModifyState(bool bWantsAutoSave)
{
mListener->TP_ModifyState(bWantsAutoSave);
GetProject()->ModifyState(bWantsAutoSave);
}
void TrackPanel::MakeParentRedrawScrollbars()
@ -1068,7 +1068,7 @@ void TrackPanel::DrawTracks(wxDC * dc)
// Don't draw a bottom margin here.
ToolsToolBar *pTtb = mListener->TP_GetToolsToolBar();
ToolsToolBar *pTtb = GetProject()->GetToolsToolBar();
bool bMultiToolDown = pTtb->IsDown(multiTool);
bool envelopeFlag = pTtb->IsDown(envelopeTool) || bMultiToolDown;
bool bigPointsFlag = pTtb->IsDown(drawTool) || bMultiToolDown;

6
src/TrackPanelListener.h
View File

@ -29,12 +29,6 @@ class AUDACITY_DLL_API TrackPanelListener /* not final */ {
virtual void TP_DisplaySelection() = 0;
virtual void TP_DisplayStatusMessage(const wxString &msg) = 0;
virtual ToolsToolBar * TP_GetToolsToolBar() = 0;
virtual void TP_PushState(const wxString &shortDesc, const wxString &longDesc,
UndoPush flags) = 0;
virtual void TP_ModifyState(bool bWantsAutoSave) = 0; // if true, writes auto-save file. Should set only if you really want the state change restored after
// a crash, as it can take many seconds for large (eg. 10 track-hours) projects
virtual void TP_RedrawScrollbars() = 0;
virtual void TP_ScrollLeft() = 0;
virtual void TP_ScrollRight() = 0;

4
src/import/ImportLOF.cpp
View File

@ -440,7 +440,7 @@ void LOFImportFileHandle::lofOpenFiles(wxString* ln)
}
// Amend the undo transaction made by import
mProject->TP_ModifyState(false);
mProject->ModifyState(false);
} // end of converting "offset" argument
else
{
@ -484,7 +484,7 @@ void LOFImportFileHandle::doDurationAndScrollOffset()
if (doSomething)
// Amend last undo state
mProject->TP_ModifyState(false);
mProject->ModifyState(false);
}
LOFImportFileHandle::~LOFImportFileHandle()