X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=1debfd6a07679fbbde5df444f6c9e26aefec41e1;hb=89d6f40e33933b12a40079e391a96856bfa79e2a;hp=76fa158f9db36c0f2d0c0b598a700aae1315090f;hpb=f17661208686f7237efc902c61028462af75a240;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 76fa158f9d..1debfd6a07 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -24,7 +24,6 @@ #include #include -#include "pbd/stacktrace.h" #include "ardour/playlist.h" #include "ardour/audioregion.h" @@ -221,66 +220,104 @@ RegionView::~RegionView () } void -RegionView::set_silent_frames (const AudioIntervalResult& silences) +RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold) { framecnt_t shortest = max_framecnt; /* remove old silent frames */ drop_silent_frames (); - if (!silences.empty()) { - uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get(); - - for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { - - - ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group); - _silent_frames.push_back (cr); - cr->property_x1() = trackview.editor().frame_to_pixel ((*i).first); - cr->property_y1() = 1; - cr->property_y2() = _height - 2; - cr->property_outline_pixels() = 0; - cr->property_fill_color_rgba () = color; - cr->property_x2() = trackview.editor().frame_to_pixel ((*i).first + (*i).second); - - if ((*i).second < shortest) { - shortest= (*i).second; - } - } - - _silence_text = new ArdourCanvas::NoEventText (*group); - _silence_text->property_font_desc() = *(get_font_for_style (N_("VerboseCanvasCusor"))); - _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get(); - _silence_text->property_anchor() = ANCHOR_NW; + if (silences.empty()) { + return; + } - /* both positions are relative to the RV start */ - - _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first) + 10.0; - _silence_text->property_y() = 20.0; + uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get(); - double ms; - char const * sunits; - - ms = (float) shortest/_region->session().frame_rate(); + for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { + + ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group); + _silent_frames.push_back (cr); + + /* coordinates for the rect are relative to the regionview origin */ - /* ms are now in seconds */ + cr->property_x1() = trackview.editor().frame_to_pixel (i->first - _region->start()); + cr->property_x2() = trackview.editor().frame_to_pixel (i->second - _region->start()); + cr->property_y1() = 1; + cr->property_y2() = _height - 2; + cr->property_outline_pixels() = 0; + cr->property_fill_color_rgba () = color; + + shortest = min (shortest, i->second - i->first); + } + + /* Find shortest audible segment */ + framecnt_t shortest_audible = max_framecnt; + + framecnt_t s = _region->start(); + for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { + framecnt_t const dur = i->first - s; + if (dur > 0) { + shortest_audible = min (shortest_audible, dur); + } + + s = i->second; + } + + framecnt_t const dur = _region->start() + _region->length() - 1 - s; + if (dur > 0) { + shortest_audible = min (shortest_audible, dur); + } + + _silence_text = new ArdourCanvas::NoEventText (*group); + _silence_text->property_font_desc() = *(get_font_for_style (N_("SilenceText"))); + _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get(); + _silence_text->property_anchor() = ANCHOR_NW; + + /* both positions are relative to the region start offset in source */ + + _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0; + _silence_text->property_y() = 20.0; + + double ms = (float) shortest/_region->session().frame_rate(); + + /* ms are now in seconds */ + + char const * sunits; + + if (ms >= 60.0) { + sunits = _("minutes"); + ms /= 60.0; + } else if (ms < 1.0) { + sunits = _("msecs"); + ms *= 1000.0; + } else { + sunits = _("secs"); + } - if (ms >= 60.0) { - sunits = _("minutes"); - ms /= 60.0; - } else if (ms < 1.0) { - sunits = _("msecs"); - ms *= 1000.0; + string text = string_compose (ngettext ("%1 silent segment", "%1 silent segments", silences.size()), silences.size()) + + ", " + + string_compose (_("shortest = %1 %2"), ms, sunits); + + if (shortest_audible != max_framepos) { + /* ms are now in seconds */ + double ma = (float) shortest_audible / _region->session().frame_rate(); + char const * aunits; + + if (ma >= 60.0) { + aunits = _("minutes"); + ma /= 60.0; + } else if (ma < 1.0) { + aunits = _("msecs"); + ma *= 1000.0; } else { - sunits = _("secs"); + aunits = _("secs"); } + text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits); + } - - _silence_text->property_text() = string_compose (_("%1 silent segments, shortest = %2 %3"), - silences.size(), ms, sunits).c_str(); - } -} + _silence_text->property_text() = text.c_str (); +} void RegionView::hide_silent_frames () @@ -298,19 +335,11 @@ RegionView::drop_silent_frames () delete *i; } _silent_frames.clear (); + delete _silence_text; _silence_text = 0; } -void -RegionView::show_silent_frames () -{ - for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { - (*i)->show (); - } - _silence_text->show (); -} - gint RegionView::_lock_toggle (ArdourCanvas::Item*, GdkEvent* ev, void* arg) { @@ -912,3 +941,4 @@ RegionView::trim_contents (framepos_t frame_delta, bool left_direction, bool swa _region->trim_start ((framepos_t) (new_bound * speed), this); region_changed (PropertyChange (ARDOUR::Properties::start)); } +