fix for bad sync with other JACK transport-aware clients (thanks to torben for discov...
[ardour.git] / gtk2_ardour / automation_time_axis.cc
index f14e70b52e6e03ebc28df5d00836948a224435f1..f2144131ad86a548bd65d78256d16f0a0e60d24e 100644 (file)
 
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
+#include "automation_streamview.h"
 #include "route_time_axis.h"
 #include "automation_line.h"
 #include "public_editor.h"
 #include "simplerect.h"
 #include "selection.h"
-#include "ghostregion.h"
 #include "rgb_macros.h"
 #include "automation_selectable.h"
 #include "point_selection.h"
@@ -49,18 +49,23 @@ Pango::FontDescription* AutomationTimeAxisView::name_font = 0;
 bool AutomationTimeAxisView::have_name_font = false;
 const string AutomationTimeAxisView::state_node_name = "AutomationChild";
 
+/** \a a the automatable object this time axis is to display data for.
+ * For route/track automation (e.g. gain) pass the route for both \r and \a.
+ * For route child (e.g. plugin) automation, pass the child for \a.
+ * For region automation (e.g. MIDI CC), pass null for \a.
+ */
 AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r,
                boost::shared_ptr<Automatable> a, boost::shared_ptr<AutomationControl> c,
-               PublicEditor& e, TimeAxisView& rent, 
+               PublicEditor& e, TimeAxisView& parent, bool show_regions,
                ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent)
-
        : AxisView (s), 
-         TimeAxisView (s, e, &rent, canvas),
+         TimeAxisView (s, e, &parent, canvas),
          _route (r),
          _control (c),
          _automatable (a),
-         _controller(AutomationController::create(a, c->list(), c)),
+         _controller(AutomationController::create(a, c->parameter(), c)),
          _base_rect (0),
+         _view (show_regions ? new AutomationStreamView(*this) : NULL),
          _name (nom),
          height_button (_("h")),
          clear_button (_("clear")),
@@ -72,7 +77,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
        }
 
        automation_menu = 0;
-       in_destructor = false;
        auto_off_item = 0;
        auto_touch_item = 0;
        auto_write_item = 0;
@@ -98,6 +102,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
        _base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event),
                                                 _base_rect, this));
 
+       _base_rect->lower_to_bottom();
+
        hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
 
        height_button.set_name ("TrackSizeButton");
@@ -196,15 +202,25 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
                set_state (*xml_node);
        } 
                
-       boost::shared_ptr<AutomationLine> line(new AutomationLine (
-                               _control->parameter().to_string(),
-                               *this,
-                               *canvas_display,
-                               _control->list()));
-               
-       line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
-       line->queue_reset ();
-       add_line (line);
+       /* ask for notifications of any new RegionViews */
+       if (show_regions) {
+
+               assert(_view);
+               _view->attach ();
+       
+       /* no regions, just a single line for the entire track (e.g. bus gain) */
+       } else {
+       
+               boost::shared_ptr<AutomationLine> line(new AutomationLine (
+                                       ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()),
+                                       *this,
+                                       *canvas_display,
+                                       _control->alist()));
+
+               line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
+               line->queue_reset ();
+               add_line (line);
+       }
 
        /* make sure labels etc. are correct */
 
@@ -214,11 +230,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
 {
-       in_destructor = true;
-
-       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-               delete *i;
-       }
 }
 
 void
@@ -231,14 +242,14 @@ AutomationTimeAxisView::auto_clicked ()
                automation_menu->set_name ("ArdourContextMenu");
                MenuList& items (automation_menu->items());
 
-               items.push_back (MenuElem (_("Manual"), 
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
-               items.push_back (MenuElem (_("Play"),
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
-               items.push_back (MenuElem (_("Write"),
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
-               items.push_back (MenuElem (_("Touch"),
-                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+               items.push_back (MenuElem (_("Manual"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+               items.push_back (MenuElem (_("Play"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+               items.push_back (MenuElem (_("Write"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+               items.push_back (MenuElem (_("Touch"), bind (mem_fun(*this,
+                               &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
        }
 
        automation_menu->popup (1, gtk_get_current_event_time());
@@ -248,15 +259,15 @@ void
 AutomationTimeAxisView::set_automation_state (AutoState state)
 {
        if (!ignore_state_request) {
-               if (_route == _automatable) { // FIXME: ew
-                       _route->set_parameter_automation_state (
-                                       _control->parameter(),
-                                       state);
+               if (_route == _automatable) { // This is a time axis for route (not region) automation
+                       _route->set_parameter_automation_state (_control->parameter(), state);
                }
 
-               _control->list()->set_automation_state(state);
-
+               if (_control->list())
+                       _control->alist()->set_automation_state(state);
        }
+       if (_view)
+               _view->set_automation_state (state);
 }
 
 void
@@ -269,9 +280,9 @@ AutomationTimeAxisView::automation_state_changed ()
        if (!_line) {
                state = Off;
        } else {
-               state = _control->list()->automation_state ();
+               state = _control->alist()->automation_state ();
        }
-
+       
        switch (state & (Off|Play|Touch|Write)) {
        case Off:
                auto_button.set_label (_("Manual"));
@@ -338,14 +349,16 @@ AutomationTimeAxisView::interpolation_changed ()
                }
        }
        
-       _line->set_interpolation(style);
+       if (_line)
+               _line->set_interpolation(style);
 }
 
 void
 AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style)
 {
        _control->list()->set_interpolation(style);
-       _line->set_interpolation(style);
+       if (_line)
+               _line->set_interpolation(style);
 }
 
 void
@@ -358,73 +371,44 @@ void
 AutomationTimeAxisView::clear_clicked ()
 {
        _session.begin_reversible_command (_("clear automation"));
-       _line->clear ();
+       if (_line)
+               _line->clear ();
        _session.commit_reversible_command ();
 }
 
 void
-AutomationTimeAxisView::set_height (TrackHeight ht)
+AutomationTimeAxisView::set_height (uint32_t h)
 {
-       uint32_t h = height_to_pixels (ht);
        bool changed = (height != (uint32_t) h) || first_call_to_set_height;
-       
-       if (first_call_to_set_height)
-               first_call_to_set_height = false;
-
-       TimeAxisView::set_height (ht);
-       _base_rect->property_y2() = h;
-
-       if (_line)
-               _line->set_y_position_and_height (0, h);
-
-       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
-               (*i)->set_height ();
-       }
+       bool changed_between_small_and_normal = ( (h == hSmall || h == hSmaller) ^ (height == hSmall || height == hSmaller) );
 
        TimeAxisView* state_parent = get_parent_with_state ();
-       assert(state_parent);
-
-       XMLNode* xml_node = state_parent->get_automation_child_xml_node(_control->parameter());
-       assert(xml_node);
-
-       switch (ht) {
-       case Largest:
-               xml_node->add_property ("track_height", "largest");
-               break;
-
-       case Large:
-               xml_node->add_property ("track_height", "large");
-               break;
-
-       case Larger:
-               xml_node->add_property ("track_height", "larger");
-               break;
 
-       case Normal:
-               xml_node->add_property ("track_height", "normal");
-               break;
-
-       case Smaller:
-               xml_node->add_property ("track_height", "smaller");
-               break;
+       assert(state_parent);
+       XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter());
 
-       case Small:
-               xml_node->add_property ("track_height", "small");
-               break;
+       TimeAxisView::set_height (h);
+       _base_rect->property_y2() = h;
+       
+       if (_line)
+               _line->set_height(h);
+       
+       if (_view) {
+               _view->set_height(h);
+               _view->update_contents_height();
        }
 
-       switch (ht) {
-               case Large:
-               case Larger:
-               case Largest:
-                       _controller->show ();
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       xml_node->add_property ("height", buf);
 
-               case Normal:
-                       if (ht == Normal)
-                               _controller->hide();
+       if (changed_between_small_and_normal || first_call_to_set_height) {
 
-                       controls_table.remove (name_hbox);
+               first_call_to_set_height = false;
 
+               if (h >= hNormal) {
+                       controls_table.remove (name_hbox);
+                       
                        if (plugname) {
                                if (plugname_packed) {
                                        controls_table.remove (*plugname);
@@ -439,18 +423,13 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
                        hide_name_entry ();
                        show_name_label ();
                        name_hbox.show_all ();
-
+                       
                        auto_button.show();
                        height_button.show();
                        clear_button.show();
                        hide_button.show_all();
-                       break;
-
-               case Smaller:
-                       _controller->hide();
-
-               case Small:
 
+               } else if (h >= hSmall) {
                        controls_table.remove (name_hbox);
                        if (plugname) {
                                if (plugname_packed) {
@@ -463,26 +442,35 @@ AutomationTimeAxisView::set_height (TrackHeight ht)
                        hide_name_entry ();
                        show_name_label ();
                        name_hbox.show_all ();
-
+                       
                        auto_button.hide();
                        height_button.hide();
                        clear_button.hide();
                        hide_button.hide();
-                       break;
+               }
+       } else  if (h >= hNormal){
+                       auto_button.show();
+                       height_button.show();
+                       clear_button.show();
+                       hide_button.show_all();
        }
 
        if (changed) {
                /* only emit the signal if the height really changed */
-               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+               _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
        }
 }
 
 void
 AutomationTimeAxisView::set_samples_per_unit (double spu)
 {
-       TimeAxisView::set_samples_per_unit (editor.get_current_zoom());
+       TimeAxisView::set_samples_per_unit (spu);
 
-       _line->reset ();
+       if (_line)
+               _line->reset ();
+       
+       if (_view)
+               _view->set_samples_per_unit (spu);
 }
  
 void
@@ -578,6 +566,9 @@ AutomationTimeAxisView::build_display_menu ()
 void
 AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y)
 {
+       if (!_line)
+               return;
+
        double x = 0;
 
        canvas_display->w2i (x, y);
@@ -591,12 +582,12 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent
        _line->view_to_model_y (y);
 
        _session.begin_reversible_command (_("add automation event"));
-       XMLNode& before = _control->list()->get_state();
+       XMLNode& before = _control->alist()->get_state();
 
-       _control->list()->add (when, y);
+       _control->alist()->add (when, y);
 
-       XMLNode& after = _control->list()->get_state();
-       _session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->list().get(), &before, &after));
+       XMLNode& after = _control->alist()->get_state();
+       _session.commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
 
        _session.set_dirty ();
 }
@@ -605,13 +596,13 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent
 bool
 AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
-       return cut_copy_clear_one (*_line, selection, op);
+       return (_line ? cut_copy_clear_one (*_line, selection, op) : false);
 }
 
 bool
 AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op)
 {
-       AutomationList* what_we_got = 0;
+       boost::shared_ptr<Evoral::ControlList> what_we_got;
        boost::shared_ptr<AutomationList> alist (line.the_list());
        bool ret = false;
 
@@ -634,8 +625,6 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
        case Clear:
                if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
                        _session.add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
-                       delete what_we_got;
-                       what_we_got = 0;
                        ret = true;
                }
                break;
@@ -684,7 +673,7 @@ AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCo
 bool
 AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op)
 {
-       AutomationList* what_we_got = 0;
+       boost::shared_ptr<Evoral::ControlList> what_we_got;
        boost::shared_ptr<AutomationList> alist(line.the_list());
        bool ret = false;
 
@@ -713,8 +702,6 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
                case Clear:
                        if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
                                _session.add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
-                               delete what_we_got;
-                               what_we_got = 0;
                                ret = true;
                        }
                        break;
@@ -772,30 +759,6 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti
        return true;
 }
 
-void
-AutomationTimeAxisView::add_ghost (GhostRegion* gr)
-{
-       ghosts.push_back (gr);
-       gr->GoingAway.connect (mem_fun(*this, &AutomationTimeAxisView::remove_ghost));
-}
-
-void
-AutomationTimeAxisView::remove_ghost (GhostRegion* gr)
-{
-       if (in_destructor) {
-               return;
-       }
-
-       list<GhostRegion*>::iterator i;
-
-       for (i = ghosts.begin(); i != ghosts.end(); ++i) {
-               if ((*i) == gr) {
-                       ghosts.erase (i);
-                       break;
-               }
-       }
-}
-
 void
 AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
 {
@@ -826,20 +789,23 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double
                        botfrac = 1.0 - ((bot - y_position) / height);
                }
 
-               _line->get_selectables (start, end, botfrac, topfrac, results);
+               if (_line)
+                       _line->get_selectables (start, end, botfrac, topfrac, results);
        }
 }
 
 void
 AutomationTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& result)
 {
-       _line->get_inverted_selectables (sel, result);
+       if (_line)
+               _line->get_inverted_selectables (sel, result);
 }
 
 void
 AutomationTimeAxisView::set_selected_points (PointSelection& points)
 {
-       _line->set_selected_points (points);
+       if (_line)
+               _line->set_selected_points (points);
 }
 
 void
@@ -856,13 +822,13 @@ AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
        assert(!_line);
        assert(line->the_list() == _control->list());
 
-       automation_connection = _control->list()->automation_state_changed.connect
+       automation_connection = _control->alist()->automation_state_changed.connect
                (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
 
        _line = line;
        //_controller = AutomationController::create(_session, line->the_list(), _control);
 
-       line->set_y_position_and_height (0, height);
+       line->set_height (height);
 
        /* pick up the current state */
        automation_state_changed ();
@@ -873,32 +839,37 @@ AutomationTimeAxisView::add_line (boost::shared_ptr<AutomationLine> line)
 void
 AutomationTimeAxisView::entered()
 {
-       _line->track_entered();
+       if (_line)
+               _line->track_entered();
 }
 
 void
 AutomationTimeAxisView::exited ()
 {
-       _line->track_exited();
+       if (_line)
+               _line->track_exited();
 }
 
-void
+/*void
 AutomationTimeAxisView::set_colors ()
 {
     for (list<GhostRegion*>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) {
                (*i)->set_colors();
     }
     
-       _line->set_colors();
-}
+       if (_line)
+               _line->set_colors();
+               }*/
 
 void
 AutomationTimeAxisView::color_handler () 
 {
-       set_colors ();
+       if (_line) {
+               _line->set_colors();
+       }
 }
 
-void
+int
 AutomationTimeAxisView::set_state (const XMLNode& node)
 {
        TimeAxisView::set_state (node);
@@ -913,8 +884,8 @@ AutomationTimeAxisView::set_state (const XMLNode& node)
                if ((*iter)->name() == state_node_name) {
                        XMLProperty* type = (*iter)->property("automation-id");
 
-                       if (type && type->value() == _control->parameter().to_string()) {
-                               XMLProperty *shown = (*iter)->property("shown_editor");
+                       if (type && type->value() == ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter())) {
+                               XMLProperty *shown = (*iter)->property("shown-editor");
 
                                if (shown && shown->value() == "yes") {
                                        set_marked_for_display(true);
@@ -927,6 +898,8 @@ AutomationTimeAxisView::set_state (const XMLNode& node)
 
        if (!_marked_for_display)
                hide();
+
+       return 0;
 }
 
 XMLNode*
@@ -945,7 +918,9 @@ void
 AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown)
 {
        XMLNode* xml_node = get_state_node();
-       xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+       if (xml_node) {
+               xml_node->add_property ("shown", editor_shown ? "yes" : "no");
+       }
 }
 
 guint32