*/
#include <gtkmm/spinbutton.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "ardour/types.h"
#include "ardour_dialog.h"
-#include "canvas.h"
#include "progress_reporter.h"
namespace ARDOUR {
- class AudioRegion;
- class Session;
+ class Session;
}
+class AudioClock;
+class RegionView;
+
/// Dialog box to set options for the `strip silence' filter
class StripSilenceDialog : public ArdourDialog, public ProgressReporter
{
public:
- StripSilenceDialog (ARDOUR::Session*, std::list<boost::shared_ptr<ARDOUR::AudioRegion> > const &);
+ StripSilenceDialog (ARDOUR::Session*, std::list<RegionView*> const &);
~StripSilenceDialog ();
double threshold () const {
return _threshold.get_value ();
}
- nframes_t minimum_length () const;
- nframes_t fade_length () const;
+ void drop_rects ();
+
+ void silences (ARDOUR::AudioIntervalMap&);
+
+ ARDOUR::framecnt_t minimum_length () const;
+ ARDOUR::framecnt_t fade_length () const;
private:
- typedef std::list<std::pair<ARDOUR::frameoffset_t,ARDOUR::framecnt_t> > SilenceResult;
-
void create_waves ();
- void peaks_ready ();
void canvas_allocation (Gtk::Allocation &);
void update_silence_rects ();
- void resize_silence_rects ();
+ void resize_silence_rects ();
void update ();
void update_threshold_line ();
- void update_stats (SilenceResult const &);
+ void update_stats (ARDOUR::AudioIntervalResult const &);
void threshold_changed ();
void update_progress_gui (float);
void restart_thread ();
Gtk::SpinButton _threshold;
- AudioClock _minimum_length;
- AudioClock _fade_length;
- Gtk::Label _segment_count_label;
- Gtk::Label _shortest_silence_label;
- Gtk::Label _shortest_audible_label;
+ AudioClock* _minimum_length;
+ AudioClock* _fade_length;
Gtk::ProgressBar _progress_bar;
- struct Wave {
- boost::shared_ptr<ARDOUR::AudioRegion> region;
- ArdourCanvas::WaveView* view;
- std::list<ArdourCanvas::SimpleRect*> silence_rects;
- ArdourCanvas::SimpleLine* threshold_line;
- double samples_per_unit;
- SilenceResult silence;
-
- Wave (ArdourCanvas::Group *, boost::shared_ptr<ARDOUR::AudioRegion>);
- ~Wave ();
- };
+ Gtk::Button* cancel_button;
+ Gtk::Button* apply_button;
- ArdourCanvas::Canvas* _canvas;
- std::list<Wave*> _waves;
- int _wave_width;
- int _wave_height;
+ struct ViewInterval {
+ RegionView* view;
+ ARDOUR::AudioIntervalResult intervals;
- ARDOUR::framecnt_t max_audible;
- ARDOUR::framecnt_t min_audible;
- ARDOUR::framecnt_t max_silence;
- ARDOUR::framecnt_t min_silence;
+ ViewInterval (RegionView* rv) : view (rv) {}
+ };
+
+ std::list<ViewInterval> views;
- PBD::ScopedConnection* _peaks_ready_connection;
+ bool _destroying;
pthread_t _thread; ///< thread to compute silence in the background
static void * _detection_thread_work (void *);
void * detection_thread_work ();
- Glib::Mutex _lock; ///< lock held while the thread is doing work
- Glib::Cond _run_cond; ///< condition to wake the thread
+ Glib::Threads::Mutex _lock; ///< lock held while the thread is doing work
+ Glib::Threads::Cond _run_cond; ///< condition to wake the thread
bool _thread_should_finish; ///< true if the thread should terminate
PBD::Signal0<void> Completed; ///< emitted when a silence detection has completed
PBD::ScopedConnection _completed_connection;
ARDOUR::InterThreadInfo _interthread_info;
+
+ sigc::connection progress_idle_connection;
+ bool idle_update_progress(); ///< GUI-thread progress updates of background silence computation
+ int analysis_progress_cur;
+ int analysis_progress_max;
};