X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=cb2a3b44ea85b374a609ecce1aeaaa17ed4ba816;hb=23b1944beac919e80225c50400d9b2ed973ed13c;hp=aa00aa570c46979125a92f87add591cb51e2786b;hpb=c9a053c47a7fbe0298acbb4d04d8af08db156111;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index aa00aa570c..cb2a3b44ea 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -36,21 +36,21 @@ #include "canvas/debug.h" -#include "ardour_ui.h" #include "automation_time_axis.h" #include "automation_streamview.h" -#include "global_signals.h" #include "gui_thread.h" #include "route_time_axis.h" #include "automation_line.h" #include "paste_context.h" #include "public_editor.h" #include "selection.h" +#include "tooltips.h" #include "rgb_macros.h" #include "point_selection.h" #include "control_point.h" #include "utils.h" #include "item_counts.h" +#include "ui_config.h" #include "i18n.h" @@ -91,11 +91,25 @@ AutomationTimeAxisView::AutomationTimeAxisView ( , _automatable (a) , _parameter (p) , _base_rect (new ArdourCanvas::Rectangle (_canvas_display)) - , _name (nom) , _view (show_regions ? new AutomationStreamView (*this) : 0) , auto_button (X_("")) /* force addition of a label */ , _show_regions (show_regions) { + //concatenate plugin name and param name into the tooltip + string tipname = nomparent; + if (!tipname.empty()) { + tipname += ": "; + } + tipname += nom; + set_tooltip(controls_ebox, tipname); + + //plugin name and param name appear on 2 separate lines in the track header + tipname = nomparent; + if (!tipname.empty()) { + tipname += "\n"; + } + tipname += nom; + _name = tipname; CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for auto %2/%1", _name, r->name())); CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for auto %2/%1", _name, r->name())); @@ -128,14 +142,14 @@ AutomationTimeAxisView::AutomationTimeAxisView ( CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name)); _base_rect->set_x1 (ArdourCanvas::COORD_MAX); _base_rect->set_outline (false); - _base_rect->set_fill_color (ARDOUR_UI::config()->color_mod (fill_color_name, "automation track fill")); + _base_rect->set_fill_color (UIConfiguration::instance().color_mod (fill_color_name, "automation track fill")); _base_rect->set_data ("trackview", this); _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this)); if (!a) { _base_rect->lower_to_bottom(); } - hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::CloseCross)); + hide_button.set_icon (ArdourIcon::CloseCross); hide_button.set_tweaks(ArdourButton::TrackHeader); auto_button.set_name ("route button"); @@ -146,8 +160,8 @@ AutomationTimeAxisView::AutomationTimeAxisView ( controls_table.set_no_show_all(); - ARDOUR_UI::instance()->set_tip(auto_button, _("automation state")); - ARDOUR_UI::instance()->set_tip(hide_button, _("hide track")); + set_tooltip(auto_button, _("automation state")); + set_tooltip(hide_button, _("hide track")); const string str = gui_property ("height"); if (!str.empty()) { @@ -157,26 +171,19 @@ AutomationTimeAxisView::AutomationTimeAxisView ( } //name label isn't editable on an automation track; remove the tooltip - ARDOUR_UI::instance()->set_tip (name_label, X_("")); + set_tooltip (name_label, X_("")); /* repack the name label */ if (name_label.get_parent()) { name_label.get_parent()->remove (name_label); } - + name_label.set_text (_name); name_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER); name_label.set_name (X_("TrackParameterName")); name_label.set_ellipsize (Pango::ELLIPSIZE_END); - string tipname = nomparent; - if (!tipname.empty()) { - tipname += ": "; - } - tipname += _name; - ARDOUR_UI::instance()->set_tip(controls_ebox, tipname); - /* add the buttons */ controls_table.set_border_width (1); controls_table.remove (name_hbox); @@ -261,7 +268,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( ) ); - line->set_line_color (ARDOUR_UI::config()->color ("processor automation line")); + line->set_line_color (UIConfiguration::instance().color ("processor automation line")); line->queue_reset (); add_line (line); } @@ -269,7 +276,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( /* make sure labels etc. are correct */ automation_state_changed (); - ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler)); _route->DropReferences.connect ( _route_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::route_going_away, this), gui_context () @@ -278,6 +285,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( AutomationTimeAxisView::~AutomationTimeAxisView () { + cleanup_gui_properties (); delete _view; } @@ -441,24 +449,24 @@ AutomationTimeAxisView::clear_clicked () } else if (_view) { _view->clear (); } - + set_automation_state ((AutoState) ARDOUR::Off); _editor.commit_reversible_command (); _session->set_dirty (); } void -AutomationTimeAxisView::set_height (uint32_t h) +AutomationTimeAxisView::set_height (uint32_t h, TrackHeightMode m) { bool const changed = (height != (uint32_t) h) || first_call_to_set_height; uint32_t const normal = preset_height (HeightNormal); bool const changed_between_small_and_normal = ( (height < normal && h >= normal) || (height >= normal || h < normal) ); - TimeAxisView::set_height (h); + TimeAxisView::set_height (h, m); _base_rect->set_y1 (h); if (_line) { - _line->set_height(h); + _line->set_height(h - 2.5); } if (_view) { @@ -610,7 +618,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, } boost::shared_ptr list = _line->the_list (); - + if (list->in_write_pass()) { /* do not allow the GUI to add automation events during an automation write pass. @@ -620,28 +628,31 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double x = 0; - _canvas_display->canvas_to_item (x, y); + _line->grab_item().canvas_to_item (x, y); /* compute vertical fractional position */ - y = 1.0 - (y / height); + y = 1.0 - (y / _line->height()); /* map using line */ _line->view_to_model_coord (x, y); - _editor.snap_to_with_modifier (when, event); - _editor.begin_reversible_command (_("add automation event")); XMLNode& before = list->get_state(); + std::list results; + if (list->editor_add (when, y, with_guard_points)) { + XMLNode& after = list->get_state(); + _editor.begin_reversible_command (_("add automation event")); + _session->add_command (new MementoCommand (*list.get (), &before, &after)); - list->add (when, y, with_guard_points); + _line->get_selectables (when, when, 0.0, 1.0, results); + _editor.get_selection ().set (results); - XMLNode& after = list->get_state(); - _session->add_command (new MementoCommand (*list, &before, &after)); - _editor.commit_reversible_command (); - _session->set_dirty (); + _editor.commit_reversible_command (); + _session->set_dirty (); + } } bool @@ -773,11 +784,11 @@ AutomationTimeAxisView::add_line (boost::shared_ptr line) { if (_control && line) { assert(line->the_list() == _control->list()); - + _control->alist()->automation_state_changed.connect ( _list_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::automation_state_changed, this), gui_context() ); - + _control->alist()->InterpolationChanged.connect ( _list_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::interpolation_changed, this, _1), gui_context() ); @@ -852,15 +863,15 @@ AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptrcontrols()); - + for (Automatable::Controls::iterator i = controls.begin(); i != controls.end(); ++i) { - + boost::shared_ptr ac = boost::dynamic_pointer_cast (i->second); if (ac && ac->alist()) { - + const XMLNode* gui_node = ac->extra_xml ("GUI"); - + if (gui_node) { const XMLProperty* prop = gui_node->property ("shown"); if (prop) { @@ -901,8 +912,8 @@ AutomationTimeAxisView::state_id() const if (_automatable != _route && _control) { return string_compose ("automation %1", _control->id().to_s()); } else if (_parameter) { - return string_compose ("automation %1 %2/%3/%4", - _route->id(), + return string_compose ("automation %1 %2/%3/%4", + _route->id(), _parameter.type(), _parameter.id(), (int) _parameter.channel());