#include "gui_thread.h"
#include "strip_silence_dialog.h"
#include "canvas_impl.h"
+#include "simpleline.h"
#include "waveview.h"
#include "simplerect.h"
#include "rgb_macros.h"
#include "i18n.h"
+#include "logmeter.h"
using namespace ARDOUR;
using namespace std;
StripSilenceDialog* StripSilenceDialog::current = 0;
/** Construct Strip silence dialog box */
-StripSilenceDialog::StripSilenceDialog (Session* s,
std::list<boost::shared_ptr<ARDOUR::AudioRegion> > const & regions)
+StripSilenceDialog::StripSilenceDialog (Session* s, list<boost::shared_ptr<ARDOUR::AudioRegion> > const & regions)
: ArdourDialog (_("Strip Silence"))
, _minimum_length (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false)
, _fade_length (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false)
thread_waiting = new Glib::Cond;
thread_run = new Glib::Cond;
}
-
- for (std::list<boost::shared_ptr<ARDOUR::AudioRegion> >::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-
- Wave w;
- w.region = *i;
- _waves.push_back (w);
-
- }
Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox);
- hbox->set_spacing (16);
+
+ Gtk::Table* table = Gtk::manage (new Gtk::Table (3, 3));
+ table->set_spacings (6);
- Gtk::Table* table = Gtk::manage (new Gtk::Table (4, 3));
- table->set_spacings (4);
+ int n = 0;
- Gtk::Label* l = Gtk::manage (new Gtk::Label (_("Threshold:")));
- l->set_alignment (1, 0.5);
+ table->attach (*Gtk::manage (new Gtk::Label (_("Threshold"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
+ table->attach (_threshold, 1, 2, n, n + 1, Gtk::FILL);
+ table->attach (*Gtk::manage (new Gtk::Label (_("dbFS"))), 2, 3, n, n + 1, Gtk::FILL);
+ ++n;
- hbox->pack_start (*l, false, false);
- hbox->pack_start (_threshold, true, true);
-
_threshold.set_digits (1);
_threshold.set_increments (1, 10);
_threshold.set_range (-120, 0);
_threshold.set_value (-60);
- l = Gtk::manage (new Gtk::Label (_("dBFS")));
- l->set_alignment (0, 0.5);
-
- hbox->pack_start (*l, false, false);
-
- l = Gtk::manage (new Gtk::Label (_("Minimum length:")));
- l->set_alignment (1, 0.5);
-
- hbox->pack_start (*l, false, false);
- hbox->pack_start (_minimum_length, true, true);
-
+ table->attach (*Gtk::manage (new Gtk::Label (_("Minimum length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
+ table->attach (_minimum_length, 1, 2, n, n + 1, Gtk::FILL);
+ ++n;
+
_minimum_length.set_session (s);
_minimum_length.set_mode (AudioClock::Frames);
_minimum_length.set (1000, true);
- l = Gtk::manage (new Gtk::Label (_("Fade length:")));
- l->set_alignment (1, 0.5);
-
- hbox->pack_start (*l, false, false);
- hbox->pack_start (_fade_length, true, true);
+ table->attach (*Gtk::manage (new Gtk::Label (_("Fade length"), 1, 0.5)), 0, 1, n, n + 1, Gtk::FILL);
+ table->attach (_fade_length, 1, 2, n, n + 1, Gtk::FILL);
+ ++n;
_fade_length.set_session (s);
_fade_length.set_mode (AudioClock::Frames);
_fade_length.set (64, true);
- _segment_count_label.set_text (_("Silent segments: none"));
+ hbox->pack_start (*table);
+
+ table = Gtk::manage (new Gtk::Table (3, 2));
+ table->set_spacings (6);
+
+ n = 0;
+
+ table->attach (*Gtk::manage (new Gtk::Label (_("Silent segments:"), 1, 0.5)), 3, 4, n, n + 1, Gtk::FILL);
+ table->attach (_segment_count_label, 5, 6, n, n + 1, Gtk::FILL);
+ _segment_count_label.set_alignment (0, 0.5);
+ ++n;
+
+ table->attach (*Gtk::manage (new Gtk::Label (_("Shortest silence:"), 1, 0.5)), 3, 4, n, n + 1, Gtk::FILL);
+ table->attach (_shortest_silence_label, 5, 6, n, n + 1, Gtk::FILL);
+ _shortest_silence_label.set_alignment (0, 0.5);
+ ++n;
+
+ table->attach (*Gtk::manage (new Gtk::Label (_("Shortest audible:"), 1, 0.5)), 3, 4, n, n + 1, Gtk::FILL);
+ table->attach (_shortest_audible_label, 5, 6, n, n + 1, Gtk::FILL);
+ _shortest_audible_label.set_alignment (0, 0.5);
+ ++n;
+
+ hbox->pack_start (*table);
+
+ /* dummy label for padding */
+ hbox->pack_start (*Gtk::manage (new Gtk::Label ("")), true, true);
get_vbox()->pack_start (*hbox, false, false);
-
add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_OK);
_canvas = new CanvasAA ();
_canvas->signal_size_allocate().connect (sigc::mem_fun (*this, &StripSilenceDialog::canvas_allocation));
- _canvas->set_size_request (_wave_width, _wave_height * _waves.size ());
+ _canvas->set_size_request (_wave_width, _wave_height * regions.size());
+
+ for (list<boost::shared_ptr<ARDOUR::AudioRegion> >::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+ Wave* w = new Wave (_canvas->root(), *i);
+ _waves.push_back (w);
+ }
get_vbox()->pack_start (*_canvas, true, true);
- get_vbox()->pack_start (_segment_count_label, false, false);
show_all ();
- _threshold.get_adjustment()->signal_value_changed().connect (sigc::mem_fun (*this, &StripSilenceDialog::maybe_start_silence_detection));
+ _threshold.get_adjustment()->signal_value_changed().connect (sigc::mem_fun (*this, &StripSilenceDialog::threshold_changed));
_minimum_length.ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::maybe_start_silence_detection));
create_waves ();
update_silence_rects ();
+ update_threshold_line ();
+
+ maybe_start_silence_detection ();
}
StripSilenceDialog::~StripSilenceDialog ()
{
- for (std::list<Wave>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
- delete i->view;
- for (std::list<SimpleRect*>::iterator j = i->silence_rects.begin(); j != i->silence_rects.end(); ++j) {
- delete *j;
- }
+ for (list<Wave*>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
+ delete *i;
}
+ _waves.clear ();
+
delete _peaks_ready_connection;
-
delete _canvas;
}
delete _peaks_ready_connection;
_peaks_ready_connection = 0;
- for (std::list<Wave>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
- if (i->region->audio_source(0)->peaks_ready (boost::bind (&StripSilenceDialog::peaks_ready, this), &_peaks_ready_connection, gui_context())) {
- i->view = new WaveView (*(_canvas->root()));
- i->view->property_data_src() = static_cast<gpointer>(i->region.get());
- i->view->property_cache() = WaveView::create_cache ();
- i->view->property_cache_updater() = true;
- i->view->property_channel() = 0;
- i->view->property_length_function() = (void *) region_length_from_c;
- i->view->property_sourcefile_length_function() = (void *) sourcefile_length_from_c;
- i->view->property_peak_function() = (void *) region_read_peaks_from_c;
- i->view->property_x() = 0;
- i->view->property_y() = n * _wave_height;
- i->view->property_height() = _wave_height;
- i->view->property_samples_per_unit() = i->samples_per_unit;
- i->view->property_region_start() = i->region->start();
- i->view->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
- i->view->property_fill_color() = ARDOUR_UI::config()->canvasvar_WaveFormFill.get();
+ for (list<Wave*>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
+ if ((*i)->region->audio_source(0)->peaks_ready (boost::bind (&StripSilenceDialog::peaks_ready, this), &_peaks_ready_connection, gui_context())) {
+ (*i)->view = new WaveView (*(_canvas->root()));
+ (*i)->view->property_data_src() = static_cast<gpointer>((*i)->region.get());
+ (*i)->view->property_cache() = WaveView::create_cache ();
+ (*i)->view->property_cache_updater() = true;
+ (*i)->view->property_channel() = 0;
+ (*i)->view->property_length_function() = (void *) region_length_from_c;
+ (*i)->view->property_sourcefile_length_function() = (void *) sourcefile_length_from_c;
+ (*i)->view->property_peak_function() = (void *) region_read_peaks_from_c;
+ (*i)->view->property_x() = 0;
+ (*i)->view->property_y() = n * _wave_height;
+ (*i)->view->property_height() = _wave_height;
+ (*i)->view->property_samples_per_unit() = (*i)->samples_per_unit;
+ (*i)->view->property_region_start() = (*i)->region->start();
+ (*i)->view->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get();
+ (*i)->view->property_fill_color() = ARDOUR_UI::config()->canvasvar_WaveFormFill.get();
+ (*i)->view->property_logscaled() = true;
+ (*i)->view->property_rectified() = true;
}
++n;
_wave_width = alloc.get_width ();
_wave_height = alloc.get_height ();
- for (std::list<Wave>::iterator i = _waves.begin(); i != _waves.end(); ++i, ++n) {
- i->samples_per_unit = ((double) i->region->length() / _wave_width);
+ for (list<Wave*>::iterator i = _waves.begin(); i != _waves.end(); ++i, ++n) {
+ (*i)->samples_per_unit = ((double) (*i)->region->length() / _wave_width);
- if (i->view) {
- i->view->property_y() = n * _wave_height;
- i->view->property_samples_per_unit() = i->samples_per_unit;
- i->view->property_height() = _wave_height;
+ if ((*i)->view) {
+ (*i)->view->property_y() = n * _wave_height;
+ (*i)->view->property_samples_per_unit() = (*i)->samples_per_unit;
+ (*i)->view->property_height() = _wave_height;
}
}
- redraw_silence_rects ();
+ resize_silence_rects ();
+ update_threshold_line ();
}
void
-StripSilenceDialog::redraw_silence_rects ()
+StripSilenceDialog::resize_silence_rects ()
{
int n = 0;
- for (std::list<Wave>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
+ for (list<Wave*>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
- std::list<std::pair<frameoffset_t, framecnt_t> >::const_iterator j;
- std::list<SimpleRect*>::iterator r;
+ list<pair<frameoffset_t, framecnt_t> >::const_iterator j;
+ list<SimpleRect*>::iterator r;
- for (j = i->silence.begin(), r = i->silence_rects.begin();
- j != i->silence.end() && r != i->silence_rects.end(); ++j, ++r) {
- (*r)->property_x1() = j->first / i->samples_per_unit;
- (*r)->property_x2() = j->second / i->samples_per_unit;
+ for (j = (*i)->silence.begin(), r = (*i)->silence_rects.begin();
+ j != (*i)->silence.end() && r != (*i)->silence_rects.end(); ++j, ++r) {
+ (*r)->property_x1() = j->first / (*i)->samples_per_unit;
+ (*r)->property_x2() = j->second / (*i)->samples_per_unit;
(*r)->property_y1() = n * _wave_height;
(*r)->property_y2() = (n + 1) * _wave_height;
(*r)->property_outline_pixels() = 0;
}
}
+void
+StripSilenceDialog::update_threshold_line ()
+{
+ int n = 0;
+
+ for (list<Wave*>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
+ (*i)->threshold_line->property_x1() = 0;
+ (*i)->threshold_line->property_x2() = _wave_width;
+
+ double const y = alt_log_meter (_threshold.get_value());
+
+ cout << "thresh " << _threshold.get_value() << " alt log " << alt_log_meter (_threshold.get_value()) << "\n";
+
+ (*i)->threshold_line->property_y1() = (n + 1 - y) * _wave_height;
+ (*i)->threshold_line->property_y2() = (n + 1 - y) * _wave_height;
+ }
+
+ ++n;
+}
+
void
StripSilenceDialog::update_silence_rects ()
{
uint32_t max_segments = 0;
uint32_t sc;
- for (std::list<Wave>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
- for (std::list<SimpleRect*>::iterator j = i->silence_rects.begin(); j != i->silence_rects.end(); ++j) {
+ for (list<Wave*>::iterator i = _waves.begin(); i != _waves.end(); ++i) {
+ for (list<SimpleRect*>::iterator j = (*i)->silence_rects.begin(); j != (*i)->silence_rects.end(); ++j) {
delete *j;
}
- i->silence_rects.clear ();
+ (*i)->silence_rects.clear ();
sc = 0;
- for (std::list<std::pair<frameoffset_t, framecnt_t> >::const_iterator j = i->silence.begin(); j != i->silence.end(); ++j) {
+ for (list<pair<frameoffset_t, framecnt_t> >::const_iterator j = (*i)->silence.begin(); j != (*i)->silence.end(); ++j) {
SimpleRect* r = new SimpleRect (*(_canvas->root()));
- r->property_x1() = j->first / i->samples_per_unit;
- r->property_x2() = j->second / i->samples_per_unit;
+ r->property_x1() = j->first / (*i)->samples_per_unit;
+ r->property_x2() = j->second / (*i)->samples_per_unit;
r->property_y1() = n * _wave_height;
r->property_y2() = (n + 1) * _wave_height;
r->property_outline_pixels() = 0;
r->property_fill_color_rgba() = RGBA_TO_UINT (128, 128, 128, 128);
- i->silence_rects.push_back (r);
+ (*i)->silence_rects.push_back (r);
sc++;
}
ma = (float) min_audible/_session->frame_rate();
ms = (float) min_silence/_session->frame_rate();
- if (min_audible > _session->frame_rate()) {
- aunits = _("secs");
- ma /= 1000.0;
+ if (min_audible < _session->frame_rate()) {
+ aunits = _("ms");
+ ma *= 1000.0;
} else {
- aunits = _("msecs");
+ aunits = _("s");
}
- if (min_silence > _session->frame_rate()) {
- sunits = _("secs");
- ms /= 1000.0;
+ if (min_silence < _session->frame_rate()) {
+ sunits = _("ms");
+ ms *= 1000.0;
} else {
- sunits = _("msecs");
+ sunits = _("s");
}
- _segment_count_label.set_text (string_compose (_("Silent segments: %1\nShortest silence %2 %3 Shortest audible %4 %5"),
- max_segments, ms, sunits, ma, aunits));
+ _segment_count_label.set_text (string_compose ("%1", max_segments));
+ if (max_segments > 0) {
+ _shortest_silence_label.set_text (string_compose ("%1 %2", ms, sunits));
+ _shortest_audible_label.set_text (string_compose ("%1 %2", ma, aunits));
+ } else {
+ _shortest_silence_label.set_text ("");
+ _shortest_audible_label.set_text ("");
+ }
} else {
_segment_count_label.set_text (_("Full silence"));
+ _shortest_silence_label.set_text ("");
+ _shortest_audible_label.set_text ("");
}
}
StripSilenceDialog* ssd = current;
run_lock.unlock ();
- for (std::list<Wave>::iterator i = ssd->_waves.begin(); i != ssd->_waves.end(); ++i) {
- i->silence = i->region->find_silence (dB_to_coefficient (ssd->threshold ()), ssd->minimum_length (), ssd->itt);
- ssd->update_stats (i->silence);
+ for (list<Wave*>::iterator i = ssd->_waves.begin(); i != ssd->_waves.end(); ++i) {
+ (*i)->silence = (*i)->region->find_silence (dB_to_coefficient (ssd->threshold ()), ssd->minimum_length (), ssd->itt);
+ ssd->update_stats ((*i)->silence);
}
if (!ssd->itt.cancel) {
return 0;
}
+void
+StripSilenceDialog::threshold_changed ()
+{
+ update_threshold_line ();
+ maybe_start_silence_detection ();
+}
+
void
StripSilenceDialog::maybe_start_silence_detection ()
{
nframes_t
StripSilenceDialog::minimum_length () const
{
- return _minimum_length.current_duration (_waves.front().region->position());
+ return _minimum_length.current_duration (_waves.front()->region->position());
}
nframes_t
StripSilenceDialog::fade_length () const
{
- return _minimum_length.current_duration (_waves.front().region->position());
+ return _minimum_length.current_duration (_waves.front()->region->position());
+}
+
+StripSilenceDialog::Wave::Wave (Group* g, boost::shared_ptr<AudioRegion> r)
+ : region (r), view (0), samples_per_unit (1)
+{
+ threshold_line = new ArdourCanvas::SimpleLine (*g);
+ threshold_line->property_color_rgba() = RGBA_TO_UINT (0, 0, 0, 128);
+}
+
+StripSilenceDialog::Wave::~Wave ()
+{
+ delete view;
+ delete threshold_line;
+ for (list<SimpleRect*>::iterator i = silence_rects.begin(); i != silence_rects.end(); ++i) {
+ delete *i;
+ }
}
projects / ardour.git / commitdiff