X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.cc;h=2fb4b5923f9cd122a96f321fed20f6f03a52467a;hb=159b8face74f8ba8da5e1e4225aed0c384ac9dc2;hp=3e62e4247a9ee17fd910597d332f29c2cae0803f;hpb=0a62044c2c51b38c900ed75d4037e6093901f387;p=ardour.git diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index 3e62e4247a..2fb4b5923f 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -22,13 +22,12 @@ #include #include #include -#include "ardour/audioregion.h" -#include "ardour/audiosource.h" +#include "ardour/audioregion.h" #include "ardour/dB.h" #include "ardour_ui.h" -#include "ardour/session.h" +#include "audio_clock.h" #include "gui_thread.h" #include "strip_silence_dialog.h" #include "canvas_impl.h" @@ -48,8 +47,8 @@ using namespace ArdourCanvas; StripSilenceDialog::StripSilenceDialog (Session* s, list const & v) : ArdourDialog (_("Strip Silence")) , ProgressReporter () - , _minimum_length (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false) - , _fade_length (X_("silence duration"), true, "SilenceDurationClock", true, false, true, false) + , _minimum_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false)) + , _fade_length (new AudioClock (X_("silence duration"), true, "", true, false, true, false)) , _peaks_ready_connection (0) , _destroying (false) { @@ -60,7 +59,7 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list const & v) } Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox); - + Gtk::Table* table = Gtk::manage (new Gtk::Table (3, 3)); table->set_spacings (6); @@ -70,27 +69,28 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list const & v) 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; - + _threshold.set_digits (1); _threshold.set_increments (1, 10); _threshold.set_range (-120, 0); _threshold.set_value (-60); + _threshold.set_activates_default (); 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); + 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); + + _minimum_length->set_session (s); + _minimum_length->set_mode (AudioClock::Frames); + _minimum_length->set (1000, 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); + 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); + _fade_length->set_session (s); + _fade_length->set_mode (AudioClock::Frames); + _fade_length->set (64, true); hbox->pack_start (*table); @@ -98,19 +98,20 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list const & v) add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_OK); + set_default_response (Gtk::RESPONSE_OK); get_vbox()->pack_start (_progress_bar, true, true, 12); show_all (); _threshold.get_adjustment()->signal_value_changed().connect (sigc::mem_fun (*this, &StripSilenceDialog::threshold_changed)); - _minimum_length.ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::restart_thread)); + _minimum_length->ValueChanged.connect (sigc::mem_fun (*this, &StripSilenceDialog::restart_thread)); update_silence_rects (); update_threshold_line (); /* Create a thread which runs while the dialogue is open to compute the silence regions */ - Completed.connect (_completed_connection, MISSING_INVALIDATOR, ui_bind (&StripSilenceDialog::update, this), gui_context ()); + Completed.connect (_completed_connection, MISSING_INVALIDATOR, boost::bind (&StripSilenceDialog::update, this), gui_context ()); _thread_should_finish = false; pthread_create (&_thread, 0, StripSilenceDialog::_detection_thread_work, this); } @@ -119,9 +120,9 @@ StripSilenceDialog::StripSilenceDialog (Session* s, list const & v) StripSilenceDialog::~StripSilenceDialog () { _destroying = true; - + /* Terminate our thread */ - + _lock.lock (); _interthread_info.cancel = true; _thread_should_finish = true; @@ -129,28 +130,27 @@ StripSilenceDialog::~StripSilenceDialog () _run_cond.signal (); pthread_join (_thread, 0); - + + delete _minimum_length; + delete _fade_length; + delete _peaks_ready_connection; } -AudioIntervalMap -StripSilenceDialog::silences () +void +StripSilenceDialog::silences (AudioIntervalMap& m) { - AudioIntervalMap m; - for (list::iterator v = views.begin(); v != views.end(); ++v) { - pair,AudioIntervalResult> newpair ((*v).view->region(), (*v).intervals); + pair,AudioIntervalResult> newpair (v->view->region(), v->intervals); m.insert (newpair); } - - return m; } void StripSilenceDialog::drop_rects () { for (list::iterator v = views.begin(); v != views.end(); ++v) { - (*v).view->drop_silent_frames (); + v->view->drop_silent_frames (); } } @@ -165,7 +165,7 @@ StripSilenceDialog::update_threshold_line () for (list::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()); (*i)->threshold_line->property_y1() = (n + 1 - y) * _wave_height; @@ -187,9 +187,11 @@ void StripSilenceDialog::update_silence_rects () { /* Lock so that we don't contend with the detection thread for access to the silence regions */ - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); + double const y = _threshold.get_value(); + for (list::iterator v = views.begin(); v != views.end(); ++v) { - (*v).view->set_silent_frames ((*v).intervals); + v->view->set_silent_frames (v->intervals, y); } } @@ -208,13 +210,13 @@ StripSilenceDialog::detection_thread_work () /* Hold this lock when we are doing work */ _lock.lock (); - + while (1) { for (list::iterator i = views.begin(); i != views.end(); ++i) { boost::shared_ptr ar = boost::dynamic_pointer_cast ((*i).view->region()); if (ar) { - (*i).intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), _interthread_info); + i->intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), _interthread_info); } if (_interthread_info.cancel) { @@ -251,7 +253,7 @@ StripSilenceDialog::restart_thread () */ return; } - + /* Cancel any current run */ _interthread_info.cancel = true; @@ -275,15 +277,15 @@ StripSilenceDialog::threshold_changed () framecnt_t StripSilenceDialog::minimum_length () const { - return _minimum_length.current_duration (views.front().view->region()->position()); + return _minimum_length->current_duration (views.front().view->region()->position()); } framecnt_t StripSilenceDialog::fade_length () const { - return _minimum_length.current_duration (views.front().view->region()->position()); + return _fade_length->current_duration (views.front().view->region()->position()); } - + void StripSilenceDialog::update_progress_gui (float p) {