Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-04 14:39:08 +02:00
Code Issues Releases Wiki Activity

TrackPanel subscribes directly to ODManager for events...

Browse Source 
... cutting middleman AudacityProject out
This commit is contained in:
Paul Licameli 2019-04-22 20:45:36 -04:00
parent 22f6ee789c
commit 9c75ebe7f7
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Project.cpp
View File

@ -1098,8 +1098,6 @@ BEGIN_EVENT_TABLE(AudacityProject, wxFrame)
EVT_COMMAND(wxID_ANY, EVT_OPEN_AUDIO_FILE, AudacityProject::OnOpenAudioFile) EVT_COMMAND(wxID_ANY, EVT_OPEN_AUDIO_FILE, AudacityProject::OnOpenAudioFile)
EVT_COMMAND(wxID_ANY, EVT_TOOLBAR_UPDATED, AudacityProject::OnToolBarUpdate) EVT_COMMAND(wxID_ANY, EVT_TOOLBAR_UPDATED, AudacityProject::OnToolBarUpdate)
//mchinen:multithreaded calls - may not be threadsafe with CommandEvent: may have to change. //mchinen:multithreaded calls - may not be threadsafe with CommandEvent: may have to change.
EVT_COMMAND(wxID_ANY, EVT_ODTASK_UPDATE, AudacityProject::OnODTaskUpdate)
EVT_COMMAND(wxID_ANY, EVT_ODTASK_COMPLETE, AudacityProject::OnODTaskComplete)
END_EVENT_TABLE() END_EVENT_TABLE()
AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id, AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
@ -2381,22 +2379,6 @@ void AudacityProject::OnToolBarUpdate(wxCommandEvent & event)
event.Skip(false); /* No need to propagate any further */ event.Skip(false); /* No need to propagate any further */
} }
///Handles the redrawing necessary for tasks as they partially update in the background.
void AudacityProject::OnODTaskUpdate(wxCommandEvent & WXUNUSED(event))
{
//todo: add track data to the event - check to see if the project contains it before redrawing.
if(mTrackPanel)
mTrackPanel->Refresh(false);
}
//redraws the task and does other book keeping after the task is complete.
void AudacityProject::OnODTaskComplete(wxCommandEvent & WXUNUSED(event))
{
if(mTrackPanel)
mTrackPanel->Refresh(false);
}
void AudacityProject::OnScroll(wxScrollEvent & WXUNUSED(event)) void AudacityProject::OnScroll(wxScrollEvent & WXUNUSED(event))
{ {
const wxInt64 offset = PixelWidthBeforeTime(0.0); const wxInt64 offset = PixelWidthBeforeTime(0.0);

2
src/Project.h
View File

@ -384,8 +384,6 @@ public:
void OnTimer(wxTimerEvent & event); void OnTimer(wxTimerEvent & event);
void OnToolBarUpdate(wxCommandEvent & event); void OnToolBarUpdate(wxCommandEvent & event);
void OnOpenAudioFile(wxCommandEvent & event); void OnOpenAudioFile(wxCommandEvent & event);
void OnODTaskUpdate(wxCommandEvent & event);
void OnODTaskComplete(wxCommandEvent & event);
void HandleResize(); void HandleResize();
void UpdateLayout(); void UpdateLayout();

14
src/TrackPanel.cpp
View File

@ -88,6 +88,9 @@ is time to refresh some aspect of the screen.
#include "NoteTrack.h" #include "NoteTrack.h"
#endif #endif
#include "ondemand/ODManager.h"
#include "ondemand/ODTask.h"
#include "toolbars/ControlToolBar.h" #include "toolbars/ControlToolBar.h"
#include "toolbars/ToolsToolBar.h" #include "toolbars/ToolsToolBar.h"
@ -180,6 +183,9 @@ BEGIN_EVENT_TABLE(TrackPanel, CellularPanel)
EVT_PAINT(TrackPanel::OnPaint) EVT_PAINT(TrackPanel::OnPaint)
EVT_TIMER(wxID_ANY, TrackPanel::OnTimer) EVT_TIMER(wxID_ANY, TrackPanel::OnTimer)
EVT_COMMAND(wxID_ANY, EVT_ODTASK_UPDATE, TrackPanel::OnODTask)
EVT_COMMAND(wxID_ANY, EVT_ODTASK_COMPLETE, TrackPanel::OnODTask)
END_EVENT_TABLE() END_EVENT_TABLE()
/// Makes a cursor from an XPM, uses CursorId as a fallback. /// Makes a cursor from an XPM, uses CursorId as a fallback.
@ -473,6 +479,14 @@ void TrackPanel::OnTimer(wxTimerEvent& )
mTimeCount = 0; mTimeCount = 0;
} }
///Handles the redrawing necessary for tasks as they partially update in the
///background, or finish.
void TrackPanel::OnODTask(wxCommandEvent & WXUNUSED(event))
{
//todo: add track data to the event - check to see if the project contains it before redrawing.
Refresh(false);
}
double TrackPanel::GetScreenEndTime() const double TrackPanel::GetScreenEndTime() const
{ {
int width; int width;

1
src/TrackPanel.h
View File

@ -280,6 +280,7 @@ class AUDACITY_DLL_API TrackPanel final
void OnIdle(wxIdleEvent & event); void OnIdle(wxIdleEvent & event);
void OnTimer(wxTimerEvent& event); void OnTimer(wxTimerEvent& event);
void OnODTask(wxCommandEvent &event);
int GetLeftOffset() const { return GetLabelWidth() + 1;} int GetLeftOffset() const { return GetLabelWidth() + 1;}