*/
#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 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<RegionView*> const &);
+ StripSilenceDialog (ARDOUR::Session*, std::list<RegionView*> const &);
~StripSilenceDialog ();
double threshold () const {
return _threshold.get_value ();
}
- void drop_rects ();
+ void drop_rects ();
+
+ void silences (ARDOUR::AudioIntervalMap&);
- void silences (ARDOUR::AudioIntervalMap&);
-
ARDOUR::framecnt_t minimum_length () const;
- ARDOUR::framecnt_t fade_length () const;
+ ARDOUR::framecnt_t fade_length () const;
private:
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 (ARDOUR::AudioIntervalResult const &);
void restart_thread ();
Gtk::SpinButton _threshold;
- AudioClock _minimum_length;
- AudioClock _fade_length;
+ AudioClock* _minimum_length;
+ AudioClock* _fade_length;
Gtk::ProgressBar _progress_bar;
- struct ViewInterval {
- RegionView* view;
- ARDOUR::AudioIntervalResult intervals;
+ Gtk::Button* cancel_button;
+ Gtk::Button* apply_button;
- ViewInterval (RegionView* rv) : view (rv) {}
- };
+ struct ViewInterval {
+ RegionView* view;
+ ARDOUR::AudioIntervalResult intervals;
- std::list<ViewInterval> views;
+ ViewInterval (RegionView* rv) : view (rv) {}
+ };
- PBD::ScopedConnection* _peaks_ready_connection;
+ std::list<ViewInterval> views;
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;
};