fix redrawing of canvas with an optimized build
[ardour.git] / gtk2_ardour / audio_streamview.cc
index c7afa6e3bf5e087813ea45aca72bbd0b85111f3b..7b84219b750883553a5cc375bb6e329b91b79006 100644 (file)
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/audio_track.h"
-#include "ardour/source.h"
 #include "ardour/region_factory.h"
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
+#include "canvas/rectangle.h"
+
 #include "audio_streamview.h"
 #include "audio_region_view.h"
 #include "tape_region_view.h"
 #include "audio_time_axis.h"
-#include "canvas-waveview.h"
-#include "canvas-simplerect.h"
 #include "region_selection.h"
 #include "selection.h"
 #include "public_editor.h"
 #include "ardour_ui.h"
-#include "crossfade_view.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "utils.h"
@@ -61,30 +58,8 @@ using namespace Editing;
 AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
        : StreamView (tv)
 {
-       crossfades_visible = tv.session()->config.get_xfades_visible ();
        color_handler ();
        _amplitude_above_axis = 1.0;
-
-       Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::parameter_changed, this, _1), gui_context());
-}
-
-AudioStreamView::~AudioStreamView ()
-{
-       for (CrossfadeViewList::iterator xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
-               delete xi->second;
-       }
-}
-
-int
-AudioStreamView::set_samples_per_unit (gdouble spp)
-{
-       StreamView::set_samples_per_unit(spp);
-
-       for (CrossfadeViewList::iterator xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
-               xi->second->set_samples_per_unit (spp);
-       }
-
-       return 0;
 }
 
 int
@@ -123,19 +98,19 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
        case Normal:
                if (recording) {
                        region_view = new AudioRegionView (_canvas_group, _trackview, region,
-                                       _samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(
-                                                       TimeAxisViewItem::ShowFrame |
-                                                       TimeAxisViewItem::HideFrameRight |
-                                                       TimeAxisViewItem::HideFrameLeft |
-                                                       TimeAxisViewItem::HideFrameTB));
+                                                          _samples_per_pixel, region_color, recording, TimeAxisViewItem::Visibility(
+                                                                  TimeAxisViewItem::ShowFrame |
+                                                                  TimeAxisViewItem::HideFrameRight |
+                                                                  TimeAxisViewItem::HideFrameLeft |
+                                                                  TimeAxisViewItem::HideFrameTB));
                } else {
                        region_view = new AudioRegionView (_canvas_group, _trackview, region,
-                                       _samples_per_unit, region_color);
+                                       _samples_per_pixel, region_color);
                }
                break;
        case Destructive:
                region_view = new TapeAudioRegionView (_canvas_group, _trackview, region,
-                               _samples_per_unit, region_color);
+                               _samples_per_pixel, region_color);
                break;
        default:
                fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg;
@@ -155,10 +130,6 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
                region_view->set_sensitive (false);
        }
 
-       region_view->set_waveform_scale (Config->get_waveform_scale ());
-       region_view->set_waveform_shape (Config->get_waveform_shape ());
-       region_view->set_waveform_visible (Config->get_show_waveforms ());
-
        return region_view;
 }
 
@@ -209,163 +180,10 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
        return region_view;
 }
 
-void
-AudioStreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
-{
-       ENSURE_GUI_THREAD (*this, &AudioStreamView::remove_region_view, weak_r);
-
-       boost::shared_ptr<Region> r (weak_r.lock());
-
-       if (!r) {
-               return;
-       }
-
-       if (!_trackview.session()->deletion_in_progress()) {
-
-               for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end();) {
-                       CrossfadeViewList::iterator tmp;
-
-                       tmp = i;
-                       ++tmp;
-
-                       boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(r);
-                       if (ar && i->second->crossfade->involves (ar)) {
-                               delete i->second;
-                               crossfade_views.erase (i);
-                       }
-
-                       i = tmp;
-               }
-       }
-
-       StreamView::remove_region_view(r);
-}
-
-void
-AudioStreamView::undisplay_track ()
-{
-       StreamView::undisplay_track ();
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               delete i->second;
-       }
-
-       crossfade_views.clear ();
-}
-
-void
-AudioStreamView::playlist_layered (boost::weak_ptr<Track> wtr)
-{
-       boost::shared_ptr<Track> tr (wtr.lock());
-
-       if (!tr) {
-               return;
-       }
-
-       StreamView::playlist_layered (wtr);
-
-       /* make sure xfades are on top and all the regionviews are stacked correctly. */
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               i->second->get_canvas_group()->raise_to_top();
-       }
-}
-
-void
-AudioStreamView::playlist_switched (boost::weak_ptr<Track> wtr)
-{
-       boost::shared_ptr<Track> tr (wtr.lock());
-
-       if (!tr) {
-               return;
-       }
-
-       playlist_connections.drop_connections ();
-
-       StreamView::playlist_switched (tr);
-
-       boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist> (tr->playlist());
-
-       if (apl) {
-               apl->NewCrossfade.connect (playlist_connections, invalidator (*this), ui_bind (&AudioStreamView::add_crossfade, this, _1), gui_context());
-       }
-}
-
-void
-AudioStreamView::add_crossfade (boost::weak_ptr<Crossfade> wc)
-{
-       boost::shared_ptr<Crossfade> crossfade (wc.lock());
-
-       if (!crossfade) {
-               return;
-       }
-
-       AudioRegionView* lview = 0;
-       AudioRegionView* rview = 0;
-
-       /* first see if we already have a CrossfadeView for this Crossfade */
-
-       CrossfadeViewList::iterator i = crossfade_views.find (crossfade);
-       if (i != crossfade_views.end()) {
-               if (!crossfades_visible) {
-                       i->second->hide();
-               } else {
-                       i->second->show ();
-               }
-               i->second->set_valid (true);
-               return;
-       }
-
-       /* create a new one */
-
-       for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
-
-               if (!lview && arv && (arv->region() == crossfade->out())) {
-                       lview = arv;
-               }
-               if (!rview && arv && (arv->region() == crossfade->in())) {
-                       rview = arv;
-               }
-       }
-
-       CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display (),
-                                              _trackview,
-                                               crossfade,
-                                              _samples_per_unit,
-                                              region_color,
-                                              *lview, *rview);
-       cv->set_valid (true);
-       crossfade->Invalidated.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context());
-       crossfade_views[cv->crossfade] = cv;
-       if (!crossfades_visible) {
-               cv->hide ();
-       }
-
-       update_content_height (cv);
-}
-
-void
-AudioStreamView::remove_crossfade (boost::shared_ptr<Region> r)
-{
-       ENSURE_GUI_THREAD (*this, &AudioStreamView::remove_crossfade, r)
-
-       boost::shared_ptr<Crossfade> xfade = boost::dynamic_pointer_cast<Crossfade> (r);
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if (i->second->crossfade == xfade) {
-                       delete i->second;
-                       crossfade_views.erase (i);
-                       break;
-               }
-       }
-}
-
 void
 AudioStreamView::redisplay_track ()
 {
        list<RegionView *>::iterator i;
-       CrossfadeViewList::iterator xi, tmpx;
 
        // Flag region views as invalid and disable drawing
        for (i = region_views.begin(); i != region_views.end(); ++i) {
@@ -373,79 +191,17 @@ AudioStreamView::redisplay_track ()
                (*i)->enable_display (false);
        }
 
-       // Flag crossfade views as invalid
-       for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
-               xi->second->set_valid (false);
-               if (xi->second->visible()) {
-                       xi->second->show ();
-               }
-       }
-
-       // Add and display region and crossfade views, and flag them as valid
-
+       // Add and display views, and flag them as valid
        if (_trackview.is_audio_track()) {
                _trackview.track()->playlist()->foreach_region(
                        sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view))
                        );
-
-               boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(
-                               _trackview.track()->playlist()
-                       );
-
-               if (apl) {
-                       apl->foreach_crossfade (sigc::mem_fun (*this, &AudioStreamView::add_crossfade));
-               }
-       }
-
-       // Remove invalid crossfade views
-       for (xi = crossfade_views.begin(); xi != crossfade_views.end();) {
-               tmpx = xi;
-               tmpx++;
-
-               if (!xi->second->valid()) {
-                       delete xi->second;
-                       crossfade_views.erase (xi);
-               }
-
-               xi = tmpx;
        }
 
        // Stack regions by layer, and remove invalid regions
        layer_regions();
 }
 
-void
-AudioStreamView::set_show_waveforms (bool yn)
-{
-       for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv) {
-                       arv->set_waveform_visible (yn);
-               }
-       }
-}
-
-void
-AudioStreamView::set_waveform_shape (WaveformShape shape)
-{
-       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv)
-                       arv->set_waveform_shape (shape);
-       }
-}
-
-void
-AudioStreamView::set_waveform_scale (WaveformScale scale)
-{
-       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
-               if (arv) {
-                       arv->set_waveform_scale (scale);
-               }
-       }
-}
-
 void
 AudioStreamView::setup_rec_box ()
 {
@@ -473,7 +229,7 @@ AudioStreamView::setup_rec_box ()
                                                sources.push_back (src);
                                                src->PeakRangeReady.connect (rec_data_ready_connections,
                                                                             invalidator (*this),
-                                                                            ui_bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr<Source>(src)),
+                                                                            boost::bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr<Source>(src)),
                                                                             gui_context());
                                        }
                                }
@@ -507,20 +263,20 @@ AudioStreamView::setup_rec_box ()
 
                        at = _trackview.audio_track(); /* we know what it is already */
                        framepos_t const frame_pos = at->current_capture_start ();
-                       gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos);
-                       gdouble xend;
+                       gdouble xstart = _trackview.editor().sample_to_pixel (frame_pos);
+                       gdouble xend = xstart; /* keeps gcc optimized happy, really set in switch() below */
                        uint32_t fill_color;
 
                        switch (_trackview.audio_track()->mode()) {
                        case Normal:
                        case NonLayered:
                                xend = xstart;
-                               fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+                               fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
                                break;
 
                        case Destructive:
                                xend = xstart + 2;
-                               fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+                               fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
                                /* make the recording rect translucent to allow
                                   the user to see the peak data coming in, etc.
                                */
@@ -528,14 +284,14 @@ AudioStreamView::setup_rec_box ()
                                break;
                        }
 
-                       ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group);
-                       rec_rect->property_x1() = xstart;
-                       rec_rect->property_y1() = 1.0;
-                       rec_rect->property_x2() = xend;
-                       rec_rect->property_y2() = child_height ();
-                       rec_rect->property_outline_what() = 0x0;
-                       rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
-                       rec_rect->property_fill_color_rgba() = fill_color;
+                       ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
+                       rec_rect->set_x0 (xstart);
+                       rec_rect->set_y0 (1);
+                       rec_rect->set_x1 (xend);
+                       rec_rect->set_y1 (child_height ());
+                       rec_rect->set_outline_what (0);
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+                       rec_rect->set_fill_color (fill_color);
                        rec_rect->lower_to_bottom();
 
                        RecBoxInfo recbox;
@@ -600,14 +356,6 @@ AudioStreamView::setup_rec_box ()
        }
 }
 
-void
-AudioStreamView::foreach_crossfadeview (void (CrossfadeView::*pmf)(void))
-{
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               (i->second->*pmf) ();
-       }
-}
-
 void
 AudioStreamView::rec_peak_range_ready (framepos_t start, framecnt_t cnt, boost::weak_ptr<Source> weak_src)
 {
@@ -649,7 +397,7 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
 
                assert (n < rec_rects.size());
 
-               if (!canvas_item_visible (rec_rects[n].rectangle)) {
+               if (!rec_rects[n].rectangle->visible()) {
                        /* rect already hidden, this region is done */
                        iter = tmp;
                        continue;
@@ -686,9 +434,9 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
                                        check_record_layers (region, (region->position() - region->start() + start + cnt));
 
                                        /* also update rect */
-                                       ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
-                                       gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
-                                       rect->property_x2() = xend;
+                                       ArdourCanvas::Rectangle * rect = rec_rects[n].rectangle;
+                                       gdouble xend = _trackview.editor().sample_to_pixel (region->position() + region->length());
+                                       rect->set_x1 (xend);
                                }
 
                        } else {
@@ -744,38 +492,36 @@ AudioStreamView::hide_all_fades ()
        }
 }
 
-void
-AudioStreamView::show_all_xfades ()
+/** Hide xfades for regions that overlap ar.
+ *  @return Pair of lists; first is the AudioRegionViews that start xfades were hidden for,
+ *  second is the AudioRegionViews that end xfades were hidden for.
+ */
+pair<list<AudioRegionView*>, list<AudioRegionView*> >
+AudioStreamView::hide_xfades_with (boost::shared_ptr<AudioRegion> ar)
 {
-       foreach_crossfadeview (&CrossfadeView::show);
-       crossfades_visible = true;
-}
-
-void
-AudioStreamView::hide_all_xfades ()
-{
-       foreach_crossfadeview (&CrossfadeView::hide);
-       crossfades_visible = false;
-}
-
-void
-AudioStreamView::hide_xfades_involving (AudioRegionView& rv)
-{
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if (i->second->crossfade->involves (rv.audio_region())) {
-                       i->second->fake_hide ();
+       list<AudioRegionView*> start_hidden;
+       list<AudioRegionView*> end_hidden;
+       
+       for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+               AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
+               if (arv) {
+                       switch (arv->region()->coverage (ar->position(), ar->last_frame())) {
+                       case Evoral::OverlapNone:
+                               break;
+                       default:
+                               if (arv->start_xfade_visible ()) {
+                                       start_hidden.push_back (arv);
+                               }
+                               if (arv->end_xfade_visible ()) {
+                                       end_hidden.push_back (arv);
+                               }
+                               arv->hide_xfades ();
+                               break;
+                       }
                }
        }
-}
 
-void
-AudioStreamView::reveal_xfades_involving (AudioRegionView& rv)
-{
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               if (i->second->crossfade->involves (rv.audio_region()) && i->second->visible()) {
-                       i->second->show ();
-               }
-       }
+       return make_pair (start_hidden, end_hidden);
 }
 
 void
@@ -783,77 +529,15 @@ AudioStreamView::color_handler ()
 {
        //case cAudioTrackBase:
        if (_trackview.is_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get();
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioTrackBase());
        }
 
        //case cAudioBusBase:
        if (!_trackview.is_track()) {
                if (Profile->get_sae() && _trackview.route()->is_master()) {
-                       canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioMasterBusBase.get();
-               } else {
-                       canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioBusBase.get();
-               }
-       }
-}
-
-void
-AudioStreamView::update_contents_height ()
-{
-       StreamView::update_contents_height ();
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               update_content_height (i->second);
-       }
-}
-
-void
-AudioStreamView::update_content_height (CrossfadeView* cv)
-{
-       switch (_layer_display) {
-       case Overlaid:
-               cv->set_y (0);
-               cv->set_heights (height, height);
-               break;
-
-       case Stacked:
-       case Expanded:
-               layer_t const inl = cv->crossfade->in()->layer ();
-               layer_t const outl = cv->crossfade->out()->layer ();
-
-               layer_t const high = max (inl, outl);
-               layer_t const low = min (inl, outl);
-
-               const double h = child_height ();
-
-               if (_layer_display == Stacked) {
-                       cv->set_y ((_layers - high - 1) * h);
-                       cv->set_heights ((high - low + 1) * h, h);
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioMasterBusBase());
                } else {
-                       cv->set_y (((_layers - high) * 2 - 1) * h);
-                       cv->set_heights (((high - low) * 2 + 1) * h, h);
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioBusBase());
                }
        }
 }
-
-void
-AudioStreamView::parameter_changed (string const & p)
-{
-       if (p == "show-waveforms") {
-               set_show_waveforms (Config->get_show_waveforms ());
-       } else if (p == "waveform-scale") {
-               set_waveform_scale (Config->get_waveform_scale ());
-       } else if (p == "waveform-shape") {
-               set_waveform_shape (Config->get_waveform_shape ());
-       }
-}
-
-void
-AudioStreamView::horizontal_position_changed ()
-{
-       /* we only `draw' the bit of the curve that is visible, so we need to update here */
-
-       for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-               i->second->horizontal_position_changed ();
-       }
-}
-