projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show cursor in Cut mode on button press at cutting position
[ardour.git]
/
gtk2_ardour
/
strip_silence_dialog.h
diff --git
a/gtk2_ardour/strip_silence_dialog.h
b/gtk2_ardour/strip_silence_dialog.h
index 8b2e43ac6470a31dc3b65274b9ff7f09545486ed..7445b723277586767b28bff38bf3820839fed10d 100644
(file)
--- a/
gtk2_ardour/strip_silence_dialog.h
+++ b/
gtk2_ardour/strip_silence_dialog.h
@@
-25,7
+25,7
@@
#include "progress_reporter.h"
namespace ARDOUR {
#include "progress_reporter.h"
namespace ARDOUR {
-
class Session;
+ class Session;
}
class AudioClock;
}
class AudioClock;
@@
-35,26
+35,25
@@
class RegionView;
class StripSilenceDialog : public ArdourDialog, public ProgressReporter
{
public:
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 ();
}
~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 minimum_length () const;
-
ARDOUR::framecnt_t fade_length () const;
+ ARDOUR::framecnt_t fade_length () const;
private:
void create_waves ();
private:
void create_waves ();
- void peaks_ready ();
void canvas_allocation (Gtk::Allocation &);
void update_silence_rects ();
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 update ();
void update_threshold_line ();
void update_stats (ARDOUR::AudioIntervalResult const &);
@@
-64,19
+63,20
@@
private:
Gtk::SpinButton _threshold;
AudioClock* _minimum_length;
Gtk::SpinButton _threshold;
AudioClock* _minimum_length;
-
AudioClock* _fade_length;
+ AudioClock* _fade_length;
Gtk::ProgressBar _progress_bar;
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;
bool _destroying;
@@
-89,4
+89,9
@@
private:
PBD::Signal0<void> Completed; ///< emitted when a silence detection has completed
PBD::ScopedConnection _completed_connection;
ARDOUR::InterThreadInfo _interthread_info;
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;
};
};