Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-27 17:48:38 +02:00
Code Issues Releases Wiki Activity

Fix 9c75ebe, which caused TrackPanel not to get the message

Browse Source
This commit is contained in:
Paul Licameli 2019-05-21 20:22:28 -04:00
parent ad0580c3de
commit 441763cabd
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/TrackPanel.cpp
View File

@ -185,8 +185,6 @@ BEGIN_EVENT_TABLE(TrackPanel, CellularPanel)
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.
@ -317,6 +315,9 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
&TrackPanel::OnPlayback, &TrackPanel::OnPlayback,
this); this);
GetProject()->Bind(EVT_ODTASK_UPDATE, &TrackPanel::OnODTask, this);
GetProject()->Bind(EVT_ODTASK_COMPLETE, &TrackPanel::OnODTask, this);
UpdatePrefs(); UpdatePrefs();
} }

2
src/ondemand/ODManager.cpp
View File

@ -145,7 +145,7 @@ pfodman ODManager::Instance = &(ODManager::InstanceFirstTime);
//libsndfile is not threadsafe - this deals with it //libsndfile is not threadsafe - this deals with it
static ODLock sLibSndFileMutex; static ODLock sLibSndFileMutex;
DEFINE_EVENT_TYPE(EVT_ODTASK_UPDATE) wxDEFINE_EVENT(EVT_ODTASK_UPDATE, wxCommandEvent);
//using this with wxStringArray::Sort will give you a list that //using this with wxStringArray::Sort will give you a list that
//is alphabetical, without depending on case. If you use the //is alphabetical, without depending on case. If you use the

3
src/ondemand/ODManager.h
View File

@ -30,7 +30,8 @@ number of threads.
#include <time.h> #include <time.h>
#endif //__WXMAC__ #endif //__WXMAC__
DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_ODTASK_UPDATE, -1) wxDECLARE_EXPORTED_EVENT(AUDACITY_DLL_API,
EVT_ODTASK_UPDATE, wxCommandEvent);
///wxstring compare function for sorting case, which is needed to load correctly. ///wxstring compare function for sorting case, which is needed to load correctly.
int CompareNoCaseFileName(const wxString& first, const wxString& second); int CompareNoCaseFileName(const wxString& first, const wxString& second);

2
src/ondemand/ODTask.cpp
View File

@ -29,7 +29,7 @@ in a background thread.
//#include "../Profiler.h" //#include "../Profiler.h"
DEFINE_EVENT_TYPE(EVT_ODTASK_COMPLETE) wxDEFINE_EVENT(EVT_ODTASK_COMPLETE, wxCommandEvent);
/// Constructs an ODTask /// Constructs an ODTask
ODTask::ODTask() ODTask::ODTask()

3
src/ondemand/ODTask.h
View File

@ -32,7 +32,8 @@ class Track;
class WaveTrack; class WaveTrack;
DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_ODTASK_COMPLETE, -1) wxDECLARE_EXPORTED_EVENT(AUDACITY_DLL_API,
EVT_ODTASK_COMPLETE, wxCommandEvent);
/// A class representing a modular task to be used with the On-Demand structures. /// A class representing a modular task to be used with the On-Demand structures.
class ODTask /* not final */ class ODTask /* not final */