Fix up progress bar on normalization.

git-svn-id: svn://localhost/ardour2/branches/3.0@7934 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 93cdbf2254bb9031f8dac656e4084b6773bf78ee..b03df00cec0b6b4d699c1d70ebd2325f986f37b6 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4839,7 +4839,6 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 
                        if (progress) {
                                progress->ascend ();
-                               progress->set_progress (float (n + 1) / N);
                        }
                }
 

diff --git a/libs/ardour/progress.cc b/libs/ardour/progress.cc
index 0679ce8a13069548d436ffeb3541db06163a6d45..d09309f7934313171e87ca617f1772db3b705d06 100644 (file)
--- a/libs/ardour/progress.cc
+++ b/libs/ardour/progress.cc
@@ -46,7 +46,9 @@ void
 ARDOUR::Progress::ascend ()
 {
        assert (!_stack.empty ());
+       float const a = _stack.back().allocation;
        _stack.pop_back ();
+       _stack.back().normalised += a;
 }
 
 /** Set the progress of the current task.