Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-26 06:31:13 +01:00
Code Issues Releases Wiki Activity

Merge pull request #148 from RaphaelMarinier/optimize_audacity_idle_loops_no_autoreconf

Browse Source 
Reduced CPU usage of Audacity when idle.
This commit is contained in:
James Crook
2016-07-21 23:03:00 +01:00
committed by GitHub
parent cf2625a7bd 173652875d
commit 85e744b140
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/widgets/OverlayPanel.cpp
View File

@@ -37,11 +37,11 @@ void OverlayPanel::ClearOverlays()
mOverlays.clear();
}
void OverlayPanel::DrawOverlays(bool repaint, wxDC *pDC)
void OverlayPanel::DrawOverlays(bool repaint_all, wxDC *pDC)
{
size_t n_pairs = mOverlays.size();
std::vector< std::pair<wxRect, bool> > pairs;
std::vector< std::pair<wxRect, bool /*out of date?*/> > pairs;
pairs.reserve(n_pairs);
// Find out the rectangles and outdatedness for each overlay
@@ -53,12 +53,15 @@ void OverlayPanel::DrawOverlays(bool repaint, wxDC *pDC)
// If not, then whatever is outdated, and whatever will be damaged by
// undrawing.
// By redrawing only what needs it, we avoid flashing things like
// the cursor that are drawn with invert.
if (!repaint) {
// the cursor that are drawn with invert, and also avoid
// unnecessary work.
bool some_overlays_need_repainting = repaint_all;
if (!repaint_all) {
bool done;
do {
done = true;
for (size_t ii = 0; ii < n_pairs; ++ii) {
some_overlays_need_repainting |= pairs[ii].second;
for (size_t jj = ii + 1; jj < n_pairs; ++jj) {
if (pairs[ii].second != pairs[jj].second &&
pairs[ii].first.Intersects(pairs[jj].first)) {
@@ -70,6 +73,14 @@ void OverlayPanel::DrawOverlays(bool repaint, wxDC *pDC)
} while (!done);
}
if (!some_overlays_need_repainting) {
// This function (OverlayPanel::DrawOverlays()) is called at
// fairly high frequency through a timer in TrackPanel. In case
// there is nothing to do, we exit early because creating the
// wxClientDC below is expensive, at least on Linux.
return;
}
Maybe<wxClientDC> myDC;
auto &dc = pDC ? *pDC : (myDC.create(this), *myDC);
@@ -77,7 +88,7 @@ void OverlayPanel::DrawOverlays(bool repaint, wxDC *pDC)
bool done = true;
auto it2 = pairs.begin();
for (auto pOverlay : mOverlays) {
if (repaint || it2->second) {
if (repaint_all || it2->second) {
done = false;
pOverlay->Erase(dc, GetBackingDC());
}
@@ -88,7 +99,7 @@ void OverlayPanel::DrawOverlays(bool repaint, wxDC *pDC)
if (!done) {
it2 = pairs.begin();
for (auto pOverlay : mOverlays) {
if (repaint || it2->second) {
if (repaint_all || it2->second) {
// Guarantee a clean state of the dc each pass:
ADCChanger changer{ &dc };

13
src/widgets/OverlayPanel.h
View File

@@ -22,7 +22,7 @@ public:
// default as for wxPanel:
long style = wxTAB_TRAVERSAL | wxNO_BORDER);
// Register and unregister overlay objects.
// Registers and unregisters overlay objects.
// The sequence in which they were registered is the sequence in
// which they are painted.
// OverlayPanel is not responsible for their memory management.
@@ -31,9 +31,14 @@ public:
bool RemoveOverlay(Overlay *pOverlay);
void ClearOverlays();
// Erase and redraw things like the cursor, cheaply and directly to the
// client area, without full refresh.
void DrawOverlays(bool repaint, wxDC *pDC = nullptr);
// Erases and redraws to the client area the overlays that have
// been previously added with AddOverlay(). If "repaint_all" is
// true, all overlays will be erased and re-drawn. Otherwise, only
// the ones that are out-of-date, as well as the intersecting ones,
// will be erased and re-drawn.
// pDC can be null, in which case, DrawOverlays() will create a
// wxClientDC internally when necessary.
void DrawOverlays(bool repaint_all, wxDC *pDC = nullptr);
private:
std::vector<Overlay*> mOverlays;