X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=e2b74dae97898c93cb92184a76e5e2dbb2657b9a;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=56bf61dc8b7b96146ad4866bd1a4ef0b6dc36afb;hpb=91fac4c96dc6210dcc056da70dc608700d7eb570;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 56bf61dc8b..e2b74dae97 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -36,23 +36,23 @@ #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" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -84,7 +84,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( const string & nom, const string & nomparent ) - : AxisView (s) + : SessionHandlePtr (s) , TimeAxisView (s, e, &parent, canvas) , _route (r) , _control (c) @@ -101,7 +101,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( tipname += ": "; } tipname += nom; - ARDOUR_UI::instance()->set_tip(controls_ebox, tipname); + set_tooltip(controls_ebox, tipname); //plugin name and param name appear on 2 separate lines in the track header tipname = nomparent; @@ -110,7 +110,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( } 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())); CANVAS_DEBUG_NAME (_ghost_group, string_compose ("ghosts for auto %2/%1", _name, r->name())); @@ -142,15 +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::VectorIcon)); - hide_button.set_icon (ArdourButton::CloseCross); + hide_button.set_icon (ArdourIcon::CloseCross); hide_button.set_tweaks(ArdourButton::TrackHeader); auto_button.set_name ("route button"); @@ -161,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()) { @@ -172,14 +171,16 @@ 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 */ + /* repack the name label, which TimeAxisView has already attached to + * the controls_table + */ 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")); @@ -187,7 +188,6 @@ AutomationTimeAxisView::AutomationTimeAxisView ( /* add the buttons */ controls_table.set_border_width (1); - controls_table.remove (name_hbox); controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); controls_table.attach (name_label, 2, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0); controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); @@ -200,12 +200,12 @@ AutomationTimeAxisView::AutomationTimeAxisView ( // subscribe to route_active_changed, ... if (rtv && rtv->is_audio_track()) { blank0->set_name ("AudioTrackControlsBaseUnselected"); - } - else if (rtv && rtv->is_midi_track()) { + } else if (rtv && rtv->is_midi_track()) { blank0->set_name ("MidiTrackControlsBaseUnselected"); - } - else { + } else if (rtv) { blank0->set_name ("AudioBusControlsBaseUnselected"); + } else { + blank0->set_name ("UnknownControlsBaseUnselected"); } blank0->set_size_request (-1, -1); blank1->set_size_request (1, 0); @@ -269,7 +269,8 @@ AutomationTimeAxisView::AutomationTimeAxisView ( ) ); - line->set_line_color (ARDOUR_UI::config()->color ("processor automation line")); + line->set_line_color (UIConfiguration::instance().color ("processor automation line")); + line->set_fill (true); line->queue_reset (); add_line (line); } @@ -277,7 +278,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 () @@ -450,7 +451,7 @@ AutomationTimeAxisView::clear_clicked () } else if (_view) { _view->clear (); } - + set_automation_state ((AutoState) ARDOUR::Off); _editor.commit_reversible_command (); _session->set_dirty (); } @@ -619,7 +620,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. @@ -629,32 +630,35 @@ 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 -AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx) +AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (_line) { return paste_one (pos, ctx.count, ctx.times, selection, ctx.counts, ctx.greedy); @@ -782,11 +786,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() ); @@ -861,17 +865,17 @@ 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"); + XMLProperty const * prop = gui_node->property ("shown"); if (prop) { if (string_is_affirmative (prop->value())) { visible.insert (i->first); @@ -910,8 +914,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()); @@ -1035,3 +1039,21 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel } } } + +PresentationInfo const & +AutomationTimeAxisView::presentation_info () const +{ + return _route->presentation_info(); +} + +boost::shared_ptr +AutomationTimeAxisView::stripable () const +{ + return _route; +} + +Gdk::Color +AutomationTimeAxisView::color () const +{ + return gdk_color_from_rgb (_route->presentation_info().color()); +}