From a2885a430bbb69a72f901d227cacce979f121020 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Sep 2010 00:58:25 +0000 Subject: Add progress bar to strip silence dialogue. Fixes #3103. git-svn-id: svn://localhost/ardour2/branches/3.0@7809 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/filter.h | 3 ++- libs/ardour/ardour/midi_stretch.h | 2 +- libs/ardour/ardour/rb_effect.h | 2 +- libs/ardour/ardour/region.h | 3 ++- libs/ardour/ardour/reverse.h | 2 +- libs/ardour/ardour/strip_silence.h | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/filter.h b/libs/ardour/ardour/filter.h index 697e19539e..9d69a513ac 100644 --- a/libs/ardour/ardour/filter.h +++ b/libs/ardour/ardour/filter.h @@ -28,13 +28,14 @@ namespace ARDOUR { class Region; class Session; +class Progress; class Filter { public: virtual ~Filter() {} - virtual int run (boost::shared_ptr) = 0; + virtual int run (boost::shared_ptr, Progress* progress = 0) = 0; std::vector > results; protected: diff --git a/libs/ardour/ardour/midi_stretch.h b/libs/ardour/ardour/midi_stretch.h index 9dbfbca2bd..90c75bbc18 100644 --- a/libs/ardour/ardour/midi_stretch.h +++ b/libs/ardour/ardour/midi_stretch.h @@ -29,7 +29,7 @@ class MidiStretch : public Filter { MidiStretch (ARDOUR::Session&, TimeFXRequest&); ~MidiStretch (); - int run (boost::shared_ptr); + int run (boost::shared_ptr, Progress* progress = 0); private: TimeFXRequest& _request; diff --git a/libs/ardour/ardour/rb_effect.h b/libs/ardour/ardour/rb_effect.h index e4b1c00034..84c9bce53c 100644 --- a/libs/ardour/ardour/rb_effect.h +++ b/libs/ardour/ardour/rb_effect.h @@ -31,7 +31,7 @@ class RBEffect : public Filter { RBEffect (ARDOUR::Session&, TimeFXRequest&); ~RBEffect (); - int run (boost::shared_ptr); + int run (boost::shared_ptr, Progress* progress = 0); private: TimeFXRequest& tsr; diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index b78699d906..0ae325d124 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -68,6 +68,7 @@ namespace Properties { class Playlist; class Filter; class ExportSpecification; +class Progress; enum RegionEditState { EditChangesNothing = 0, @@ -205,7 +206,7 @@ class Region void set_locked (bool yn); void set_position_locked (bool yn); - int apply (Filter&); + int apply (Filter &, Progress* progress = 0); virtual uint64_t read_data_count() const { return _read_data_count; } diff --git a/libs/ardour/ardour/reverse.h b/libs/ardour/ardour/reverse.h index 0831e8184b..edc72ce707 100644 --- a/libs/ardour/ardour/reverse.h +++ b/libs/ardour/ardour/reverse.h @@ -29,7 +29,7 @@ class Reverse : public Filter { Reverse (ARDOUR::Session&); ~Reverse (); - int run (boost::shared_ptr); + int run (boost::shared_ptr, Progress *); }; } /* namespace */ diff --git a/libs/ardour/ardour/strip_silence.h b/libs/ardour/ardour/strip_silence.h index 217f6b3d8a..e77aa7111c 100644 --- a/libs/ardour/ardour/strip_silence.h +++ b/libs/ardour/ardour/strip_silence.h @@ -27,7 +27,7 @@ class StripSilence : public Filter { public: StripSilence (Session &, double, nframes_t, nframes_t); - int run (boost::shared_ptr); + int run (boost::shared_ptr, Progress* progress = 0); private: double _threshold; ///< silence threshold, in dBFS -- cgit v1.2.3