Remove unnecessary _have_transaction flag in TrimDrag. Fix undo when a trim of one...
[ardour.git] / gtk2_ardour / region_view.cc
index 76fa158f9db36c0f2d0c0b598a700aae1315090f..5163b65287589a45e463194ef16a976ab846dd57 100644 (file)
@@ -24,7 +24,6 @@
 #include <gtkmm.h>
 
 #include <gtkmm2ext/gtk_ui.h>
-#include "pbd/stacktrace.h"
 
 #include "ardour/playlist.h"
 #include "ardour/audioregion.h"
@@ -221,66 +220,131 @@ RegionView::~RegionView ()
 }
 
 void
-RegionView::set_silent_frames (const AudioIntervalResult& silences)
+RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold)
 {
         framecnt_t shortest = max_framecnt;
+        framecnt_t shortest_audible = 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) {
+        if (silences.empty()) {
+                return;
+        }
+
+        framepos_t start;
+        framepos_t end;
+        bool in_silence;
+        bool seen_audible = false;
+        AudioIntervalResult::const_iterator s;
+        uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get();
+
+        start = _region->start();
+        s = silences.begin();
+
+        if (s->first == start) {
+                /* segment starting at zero is silent */
+                end = s->second;
+                in_silence = true;
+        } else {
+                /* segment starting at zero is audible, and begins at the start of the region in the source */
+                end = s->first;
+                in_silence = false;
+        }
+
+        while (start < _region->start() + _region->length()) {
+
+                framecnt_t interval_duration = end - start;
+
+                if (interval_duration > 0) {
+                        if (in_silence) {
+                                
+                                ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group);
+                                _silent_frames.push_back (cr);
+                                
+                                /* coordinates for the rect are relative to the regionview origin */
+                                
+                                cr->property_x1() = trackview.editor().frame_to_pixel (s->first - _region->start());
+                                cr->property_x2() = trackview.editor().frame_to_pixel (s->second - _region->start());
+                                cr->property_y1() = 1;
+                                cr->property_y2() = _height - 2;
+                                cr->property_outline_pixels() = 0;
+                                cr->property_fill_color_rgba () = color;
+                                
+                                if (interval_duration < shortest) {
+                                        shortest = interval_duration;
+                                }
+                                
+                        } else if (interval_duration > 0) {
+                                seen_audible = true;
+                                if (interval_duration < shortest_audible) {
+                                        shortest_audible = interval_duration;
+                                }
+                        }
                         
+                        start = end;
+                        in_silence = !in_silence;
+                        ++s;
                         
-                        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;
+                        if (s == silences.end()) {
+                                end = _region->start() + _region->length();
+                        } else {
+                                end = s->first;
                         }
                 }
-                
-                _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;
+        }
 
-                /* 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;
 
-                double ms;
-                char const * sunits;
-                
-                ms = (float) shortest/_region->session().frame_rate();
-                
-                /* ms are now in seconds */
+        _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");
+        }
+
+       string text = string_compose (ngettext ("%1 silent segment", "%1 silent segments", silences.size()), silences.size())
+               + ", "
+               + string_compose (_("shortest = %1 %2"), ms, sunits);
 
-                if (ms >= 60.0) {
-                        sunits = _("minutes");
-                        ms /= 60.0;
-                } else if (ms < 1.0) {
-                        sunits = _("msecs");
-                        ms *= 1000.0;
+        if (seen_audible) {
+                /* ms are now in seconds */
+                double ma = 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 +362,11 @@ RegionView::drop_silent_frames ()
                delete *i;
        }
         _silent_frames.clear ();
+
         delete _silence_text;
         _silence_text = 0;
 }
 
-void
-RegionView::show_silent_frames ()
-{
-       for (list<ArdourCanvas::SimpleRect*>::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)
 {