add left/right side trim cursors and use them for region trimming, as appropriate

[ardour.git] / gtk2_ardour / automation_streamview.cc

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 731374eb2d59413382ae92351aba132df15d749c..fad14006b24b9ebc84a6c341367e4430c34f0897 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -54,14 +54,13 @@ using namespace Editing;
 
 AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
        : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()),
+                     new ArdourCanvas::Group(*tv.canvas_background()),
                      new ArdourCanvas::Group(*tv.canvas_display()))
        , _controller(tv.controller())
        , _automation_view(tv)
 {
        //canvas_rect->property_fill_color_rgba() = stream_base_color;
        canvas_rect->property_outline_color_rgba() = RGBA_BLACK;
-
-       use_rec_regions = tv.editor().show_waveforms_recording ();
 }
 
 AutomationStreamView::~AutomationStreamView ()
@@ -112,7 +111,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
                }
        }
 
-       region_view = new AutomationRegionView (canvas_group, _automation_view, region,
+       region_view = new AutomationRegionView (_canvas_group, _automation_view, region,
                        _controller->controllable()->parameter(), list,
                        _samples_per_unit, region_color);
 
@@ -129,7 +128,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
        display_region(region_view);
 
        /* catch regionview going away */
-       region->GoingAway.connect (*this, boost::bind (&AutomationStreamView::remove_region_view, this, boost::weak_ptr<Region>(region)));
+       region->DropReferences.connect (*this, invalidator (*this), boost::bind (&AutomationStreamView::remove_region_view, this, boost::weak_ptr<Region>(region)), gui_context());
 
        RegionViewAdded (region_view);
 
@@ -148,13 +147,14 @@ AutomationStreamView::set_automation_state (AutoState state)
        std::list<RegionView *>::iterator i;
        for (i = region_views.begin(); i != region_views.end(); ++i) {
                boost::shared_ptr<AutomationLine> line = ((AutomationRegionView*)(*i))->line();
-               if (line && line->the_list())
+               if (line && line->the_list()) {
                        line->the_list()->set_automation_state (state);
+               }
        }
 }
 
 void
-AutomationStreamView::redisplay_diskstream ()
+AutomationStreamView::redisplay_track ()
 {
        list<RegionView *>::iterator i, tmp;
 
@@ -166,7 +166,7 @@ AutomationStreamView::redisplay_diskstream ()
 
        // Add and display region views, and flag them as valid
        if (_trackview.is_track()) {
-               _trackview.get_diskstream()->playlist()->foreach_region (
+               _trackview.track()->playlist()->foreach_region (
                        sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view))
                        );
        }
@@ -182,29 +182,57 @@ AutomationStreamView::setup_rec_box ()
 }
 
 void
-AutomationStreamView::update_rec_regions (nframes_t /*start*/, nframes_t /*dur*/)
+AutomationStreamView::color_handler ()
 {
+       /*if (_trackview.is_midi_track()) {
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+       }
+
+       if (!_trackview.is_midi_track()) {
+               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
+       }*/
 }
 
-void
-AutomationStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur)
+AutoState
+AutomationStreamView::automation_state () const
 {
-       // this is called from the butler thread for now
+       /* XXX: bit of a hack: just return the state of our first RegionView */
 
-       ENSURE_GUI_THREAD (*this, &AutomationStreamView::rec_data_range_ready, start, dur)
+       if (region_views.empty()) {
+               return Off;
+       }
+
+       boost::shared_ptr<AutomationLine> line = ((AutomationRegionView*) region_views.front())->line ();
+       if (!line || !line->the_list()) {
+               return Off;
+       }
 
-       this->update_rec_regions (start, dur);
+       return line->the_list()->automation_state ();
 }
 
-void
-AutomationStreamView::color_handler ()
+bool
+AutomationStreamView::has_automation () const
 {
-       /*if (_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get();
+       list<RegionView*>::const_iterator i = region_views.begin ();
+       while (i != region_views.end()) {
+               AutomationRegionView* rv = static_cast<AutomationRegionView*> (*i);
+               if (rv->line() && rv->line()->npoints() > 0) {
+                       return true;
+               }
+               ++i;
        }
 
-       if (!_trackview.is_midi_track()) {
-               canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();;
-       }*/
+       return false;
 }
 
+void
+AutomationStreamView::set_interpolation (AutomationList::InterpolationStyle s)
+{
+       for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+               AutomationRegionView* arv = dynamic_cast<AutomationRegionView*> (*i);
+               assert (arv);
+               if (arv->line()) {
+                       arv->line()->set_interpolation (s);
+               }
+       }
+}