X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstrip_silence_dialog.cc;h=2fb4b5923f9cd122a96f321fed20f6f03a52467a;hb=fd9ba531bb9db001fea5105f0d374923ca9e6db4;hp=6872e164556dc558834d95c7617ef104de3f2689;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index 6872e16455..2fb4b5923f 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -17,186 +17,277 @@ */ +#include + #include #include #include + #include "ardour/audioregion.h" -#include "ardour/audiosource.h" #include "ardour/dB.h" #include "ardour_ui.h" + +#include "audio_clock.h" +#include "gui_thread.h" #include "strip_silence_dialog.h" #include "canvas_impl.h" +#include "region_view.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; +using namespace ArdourCanvas; /** Construct Strip silence dialog box */ -StripSilenceDialog::StripSilenceDialog (std::list > const & regions) - : ArdourDialog (_("Strip Silence")), _wave_width (640), _wave_height (64) +StripSilenceDialog::StripSilenceDialog (Session* s, list const & v) + : ArdourDialog (_("Strip Silence")) + , ProgressReporter () + , _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) { - for (std::list >::const_iterator i = regions.begin(); i != regions.end(); ++i) { + set_session (s); - Wave w; - w.region = *i; - w.view = 0; - w.samples_per_unit = 1; - _waves.push_back (w); - - } + for (list::const_iterator r = v.begin(); r != v.end(); ++r) { + views.push_back (ViewInterval (*r)); + } Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox); - hbox->set_spacing (16); - Gtk::Table* table = Gtk::manage (new Gtk::Table (4, 3)); - table->set_spacings (4); + Gtk::Table* table = Gtk::manage (new Gtk::Table (3, 3)); + table->set_spacings (6); + + int n = 0; + + 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; - Gtk::Label* l = Gtk::manage (new Gtk::Label (_("Threshold:"))); - l->set_alignment (1, 0.5); - table->attach (*l, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL); _threshold.set_digits (1); _threshold.set_increments (1, 10); _threshold.set_range (-120, 0); _threshold.set_value (-60); - table->attach (_threshold, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL); - l = Gtk::manage (new Gtk::Label (_("dBFS"))); - l->set_alignment (0, 0.5); - table->attach (*l, 2, 3, 0, 1, Gtk::FILL, Gtk::FILL); - - l = Gtk::manage (new Gtk::Label (_("Minimum length:"))); - l->set_alignment (1, 0.5); - table->attach (*l, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL); - _minimum_length.set_digits (0); - _minimum_length.set_increments (1, 10); - _minimum_length.set_range (0, 65536); - _minimum_length.set_value (256); - table->attach (_minimum_length, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL); - l = Gtk::manage (new Gtk::Label (_("samples"))); - table->attach (*l, 2, 3, 1, 2, Gtk::FILL, Gtk::FILL); - - l = Gtk::manage (new Gtk::Label (_("Fade length:"))); - l->set_alignment (1, 0.5); - table->attach (*l, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL); - _fade_length.set_digits (0); - _fade_length.set_increments (1, 10); - _fade_length.set_range (0, 1024); - _fade_length.set_value (64); - table->attach (_fade_length, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL); - l = Gtk::manage (new Gtk::Label (_("samples"))); - table->attach (*l, 2, 3, 2, 3, Gtk::FILL, Gtk::FILL); - - hbox->pack_start (*table, false, false); - - Gtk::VBox* v = Gtk::manage (new Gtk::VBox); - Gtk::Button* b = Gtk::manage (new Gtk::Button (_("Update display"))); - b->signal_clicked().connect (sigc::mem_fun (*this, &StripSilenceDialog::update_silence_rects)); - v->pack_start (*b, false, false); - hbox->pack_start (*v, false, false); - - get_vbox()->add (*hbox); + _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); + ++n; + + _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); + ++n; + + _fade_length->set_session (s); + _fade_length->set_mode (AudioClock::Frames); + _fade_length->set (64, true); + + hbox->pack_start (*table); + + get_vbox()->pack_start (*hbox, false, false); add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_OK); + set_default_response (Gtk::RESPONSE_OK); - _canvas = new ArdourCanvas::CanvasAA (); - _canvas->signal_size_allocate().connect (sigc::mem_fun (*this, &StripSilenceDialog::canvas_allocation)); - _canvas->set_size_request (_wave_width, _wave_height * _waves.size ()); - - get_vbox()->pack_start (*_canvas, true, true); + get_vbox()->pack_start (_progress_bar, true, true, 12); show_all (); - create_waves (); + _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)); + 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, boost::bind (&StripSilenceDialog::update, this), gui_context ()); + _thread_should_finish = false; + pthread_create (&_thread, 0, StripSilenceDialog::_detection_thread_work, this); } StripSilenceDialog::~StripSilenceDialog () { - for (std::list::iterator i = _waves.begin(); i != _waves.end(); ++i) { - delete i->view; - for (std::list::iterator j = i->silence_rects.begin(); j != i->silence_rects.end(); ++j) { - delete *j; - } - } + _destroying = true; + + /* Terminate our thread */ + + _lock.lock (); + _interthread_info.cancel = true; + _thread_should_finish = true; + _lock.unlock (); + + _run_cond.signal (); + pthread_join (_thread, 0); - delete _canvas; + delete _minimum_length; + delete _fade_length; + + delete _peaks_ready_connection; } void -StripSilenceDialog::create_waves () +StripSilenceDialog::silences (AudioIntervalMap& m) { + for (list::iterator v = views.begin(); v != views.end(); ++v) { + pair,AudioIntervalResult> newpair (v->view->region(), v->intervals); + m.insert (newpair); + } +} + +void +StripSilenceDialog::drop_rects () +{ + for (list::iterator v = views.begin(); v != views.end(); ++v) { + v->view->drop_silent_frames (); + } +} + +void +StripSilenceDialog::update_threshold_line () +{ +#if 0 int n = 0; - for (std::list::iterator i = _waves.begin(); i != _waves.end(); ++i) { - if (i->region->audio_source(0)->peaks_ready (sigc::mem_fun (*this, &StripSilenceDialog::peaks_ready), _peaks_ready_connection)) { - i->view = new WaveView (*(_canvas->root())); - i->view->property_data_src() = static_cast(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(); - } + /* Don't need to lock here as we're not reading the _waves silence details */ + + 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()); - ++n; + (*i)->threshold_line->property_y1() = (n + 1 - y) * _wave_height; + (*i)->threshold_line->property_y2() = (n + 1 - y) * _wave_height; } + + ++n; +#endif } void -StripSilenceDialog::peaks_ready () +StripSilenceDialog::update () { - _peaks_ready_connection.disconnect (); - create_waves (); + update_threshold_line (); + update_silence_rects (); } void -StripSilenceDialog::canvas_allocation (Gtk::Allocation& alloc) +StripSilenceDialog::update_silence_rects () { - _canvas->set_scroll_region (0.0, 0.0, alloc.get_width(), alloc.get_height()); - _wave_width = alloc.get_width (); + /* Lock so that we don't contend with the detection thread for access to the silence regions */ + Glib::Threads::Mutex::Lock lm (_lock); + double const y = _threshold.get_value(); - for (std::list::iterator i = _waves.begin(); i != _waves.end(); ++i) { - i->samples_per_unit = ((double) i->region->length() / _wave_width); + for (list::iterator v = views.begin(); v != views.end(); ++v) { + v->view->set_silent_frames (v->intervals, y); } } -void -StripSilenceDialog::update_silence_rects () +void * +StripSilenceDialog::_detection_thread_work (void* arg) { - int n = 0; + StripSilenceDialog* d = reinterpret_cast (arg); + return d->detection_thread_work (); +} - for (std::list::iterator i = _waves.begin(); i != _waves.end(); ++i) { - for (std::list::iterator j = i->silence_rects.begin(); j != i->silence_rects.end(); ++j) { - delete *j; - } +/** Body of our silence detection thread */ +void * +StripSilenceDialog::detection_thread_work () +{ + ARDOUR_UI::instance()->register_thread ("gui", pthread_self(), "silence", 32); - i->silence_rects.clear (); + /* Hold this lock when we are doing work */ + _lock.lock (); - std::list > const silence = - i->region->find_silence (dB_to_coefficient (threshold ()), minimum_length ()); + while (1) { + for (list::iterator i = views.begin(); i != views.end(); ++i) { + boost::shared_ptr ar = boost::dynamic_pointer_cast ((*i).view->region()); - for (std::list >::const_iterator j = silence.begin(); j != silence.end(); ++j) { + if (ar) { + i->intervals = ar->find_silence (dB_to_coefficient (threshold ()), minimum_length (), _interthread_info); + } - ArdourCanvas::SimpleRect* r = new ArdourCanvas::SimpleRect (*(_canvas->root())); - 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); + if (_interthread_info.cancel) { + break; + } + } + if (!_interthread_info.cancel) { + Completed (); /* EMIT SIGNAL */ } - ++n; + /* Our work is done; sleep until there is more to do. + * The lock is released while we are waiting. + */ + _run_cond.wait (_lock); + + if (_thread_should_finish) { + _lock.unlock (); + return 0; + } + } + + return 0; +} + +void +StripSilenceDialog::restart_thread () +{ + if (_destroying) { + /* I don't know how this happens, but it seems to be possible for this + method to be called after our destructor has finished executing. + If this happens, bad things follow; _lock cannot be locked and + Ardour hangs. So if we are destroying, just bail early. + */ + return; } + + /* Cancel any current run */ + _interthread_info.cancel = true; + + /* Block until the thread waits() */ + _lock.lock (); + /* Reset the flag */ + _interthread_info.cancel = false; + _lock.unlock (); + + /* And re-awake the thread */ + _run_cond.signal (); +} + +void +StripSilenceDialog::threshold_changed () +{ + update_threshold_line (); + restart_thread (); +} + +framecnt_t +StripSilenceDialog::minimum_length () const +{ + return _minimum_length->current_duration (views.front().view->region()->position()); +} + +framecnt_t +StripSilenceDialog::fade_length () const +{ + return _fade_length->current_duration (views.front().view->region()->position()); +} + +void +StripSilenceDialog::update_progress_gui (float p) +{ + _progress_bar.set_fraction (p); }