X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=379e8543b2182c54d609df7ca7e987ed1aa76646;hb=7f1784252882cd216a9912f57f66533cc06af8a5;hp=518f4ed41fa83c9f29b3e79a1937fbdb3e2ae4c1;hpb=1b657585572298d1a69a7b43e611f59b7e185df3;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 518f4ed41f..379e8543b2 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,60 +18,86 @@ */ #include -#include -#include -#include #include +#include +#include +#include + +#include "pbd/memento_command.h" +#include "pbd/stacktrace.h" + +#include "ardour/automation_control.h" +#include "ardour/event_type_map.h" +#include "ardour/route.h" +#include "ardour/session.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 "public_editor.h" #include "simplerect.h" #include "selection.h" #include "rgb_macros.h" -#include "automation_selectable.h" #include "point_selection.h" #include "canvas_impl.h" #include "utils.h" #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; -Pango::FontDescription* AutomationTimeAxisView::name_font = 0; +Pango::FontDescription AutomationTimeAxisView::name_font; bool AutomationTimeAxisView::have_name_font = false; -const string AutomationTimeAxisView::state_node_name = "AutomationChild"; - -AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr r, - boost::shared_ptr a, boost::shared_ptr c, - PublicEditor& e, TimeAxisView& parent, bool show_regions, - ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent) - - : AxisView (s), - TimeAxisView (s, e, &parent, canvas), - _route (r), - _control (c), - _automatable (a), - _controller(AutomationController::create(a, c->list(), c)), - _base_rect (0), - _view (show_regions ? new AutomationStreamView(*this) : NULL), - _name (nom), - height_button (_("h")), - clear_button (_("clear")), - auto_button (X_("")) /* force addition of a label */ + + +/** \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 r, + boost::shared_ptr a, + boost::shared_ptr c, + Evoral::Parameter p, + PublicEditor& e, + TimeAxisView& parent, + bool show_regions, + ArdourCanvas::Canvas& canvas, + const string & nom, + const string & nomparent + ) + : AxisView (s) + , TimeAxisView (s, e, &parent, canvas) + , _route (r) + , _control (c) + , _automatable (a) + , _parameter (p) + , _base_rect (0) + , _view (show_regions ? new AutomationStreamView (*this) : 0) + , _name (nom) + , auto_button (X_("")) /* force addition of a label */ + , _show_regions (show_regions) { if (!have_name_font) { name_font = get_font_for_style (X_("AutomationTrackName")); have_name_font = true; } + if (_automatable && _control) { + _controller = AutomationController::create (_automatable, _control->parameter(), _control); + } + automation_menu = 0; auto_off_item = 0; auto_touch_item = 0; @@ -82,136 +108,110 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrproperty_x1() = 0.0; _base_rect->property_y1() = 0.0; - _base_rect->property_x2() = editor.frame_to_pixel (max_frames); + /** gnomecanvas sometimes converts this value to int or adds 2 to it, so it must be + set correctly to avoid overflow. + */ + _base_rect->property_x2() = INT_MAX - 2; _base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get(); - + /* outline ends and bottom */ _base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); _base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackFill.get(); - + _base_rect->set_data ("trackview", this); - _base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event), - _base_rect, this)); + _base_rect->signal_event().connect (sigc::bind ( + sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), + _base_rect, this)); - _base_rect->lower_to_bottom(); + if (!a) { + _base_rect->lower_to_bottom(); + } hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); - height_button.set_name ("TrackSizeButton"); auto_button.set_name ("TrackVisualButton"); - clear_button.set_name ("TrackVisualButton"); hide_button.set_name ("TrackRemoveButton"); + auto_button.unset_flags (Gtk::CAN_FOCUS); + hide_button.unset_flags (Gtk::CAN_FOCUS); + controls_table.set_no_show_all(); - ARDOUR_UI::instance()->tooltips().set_tip(height_button, _("track height")); - ARDOUR_UI::instance()->tooltips().set_tip(auto_button, _("automation state")); - ARDOUR_UI::instance()->tooltips().set_tip(clear_button, _("clear track")); - ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("hide track")); + ARDOUR_UI::instance()->set_tip(auto_button, _("automation state")); + ARDOUR_UI::instance()->set_tip(hide_button, _("hide track")); + + string str = gui_property ("height"); + if (!str.empty()) { + set_height (atoi (str)); + } else { + set_height (preset_height (HeightNormal)); + } /* rearrange the name display */ + controls_table.remove (name_hbox); + controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0); + /* we never show these for automation tracks, so make life easier and remove them. */ hide_name_entry(); - /* move the name label over a bit */ - - string shortpname = _name; - bool shortened = false; - - int ignore_width; - shortpname = fit_to_pixels (_name, 60, *name_font, ignore_width, true); - - if (shortpname != _name ){ - shortened = true; - } - - name_label.set_text (shortpname); + name_label.set_text (_name); name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); + name_label.set_name (X_("TrackParameterName")); + name_label.set_ellipsize (Pango::ELLIPSIZE_END); - if (nomparent.length()) { - - /* limit the plug name string */ - - string pname = fit_to_pixels (nomparent, 60, *name_font, ignore_width, true); - if (pname != nomparent) { - shortened = true; - } - - plugname = new Label (pname); - plugname->set_name (X_("TrackPlugName")); - plugname->show(); - name_label.set_name (X_("TrackParameterName")); - controls_table.remove (name_hbox); - controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - plugname_packed = true; - controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } else { - plugname = 0; - plugname_packed = false; + string tipname = nomparent; + if (!tipname.empty()) { + tipname += ": "; } + tipname += _name; + ARDOUR_UI::instance()->set_tip(controls_ebox, tipname); - if (shortened) { - string tipname = nomparent; - if (!tipname.empty()) { - tipname += ": "; - } - tipname += _name; - ARDOUR_UI::instance()->tooltips().set_tip(controls_ebox, tipname); - } - /* add the buttons */ controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (height_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + controls_table.attach (auto_button, 6, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (auto_button, 5, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (clear_button, 5, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - - /* add bar controller */ - controls_table.attach (*_controller.get(), 0, 8, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + if (_controller) { + /* add bar controller */ + controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + } controls_table.show_all (); - height_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::height_clicked)); - clear_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::clear_clicked)); - hide_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::hide_clicked)); - auto_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::auto_clicked)); + hide_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked)); + auto_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::auto_clicked)); controls_base_selected_name = X_("AutomationTrackControlsBaseSelected"); controls_base_unselected_name = X_("AutomationTrackControlsBase"); controls_ebox.set_name (controls_base_unselected_name); - controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT); - - XMLNode* xml_node = get_parent_with_state()->get_automation_child_xml_node ( - _control->parameter()); - - if (xml_node) { - set_state (*xml_node); - } - /* 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 line(new AutomationLine ( - _control->parameter().to_string(), - *this, - *canvas_display, - _control->list())); + /* no regions, just a single line for the entire track (e.g. bus gain) */ + + assert (_control); + + boost::shared_ptr line ( + new AutomationLine ( + ARDOUR::EventTypeMap::instance().to_symbol(_parameter), + *this, + *_canvas_display, + _control->alist() + ) + ); line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get()); line->queue_reset (); @@ -221,11 +221,22 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrDropReferences.connect ( + _route_connections, invalidator (*this), ui_bind (&AutomationTimeAxisView::route_going_away, this), gui_context () + ); } AutomationTimeAxisView::~AutomationTimeAxisView () { + delete _view; +} + +void +AutomationTimeAxisView::route_going_away () +{ + _route.reset (); } void @@ -238,14 +249,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 (S_("Automation|Manual"), sigc::bind (sigc::mem_fun(*this, + &AutomationTimeAxisView::set_automation_state), (AutoState) Off))); + items.push_back (MenuElem (_("Play"), sigc::bind (sigc::mem_fun(*this, + &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); + items.push_back (MenuElem (_("Write"), sigc::bind (sigc::mem_fun(*this, + &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); + items.push_back (MenuElem (_("Touch"), sigc::bind (sigc::mem_fun(*this, + &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); } automation_menu->popup (1, gtk_get_current_event_time()); @@ -254,15 +265,21 @@ AutomationTimeAxisView::auto_clicked () 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 (ignore_state_request) { + return; + } + + if (_automatable) { + _automatable->set_parameter_automation_state (_parameter, state); + } - _control->list()->set_automation_state(state); + if (_view) { + _view->set_automation_state (state); + /* AutomationStreamViews don't signal when their automation state changes, so handle + our updates `manually'. + */ + automation_state_changed (); } } @@ -273,15 +290,18 @@ AutomationTimeAxisView::automation_state_changed () /* update button label */ - if (!_line) { - state = Off; + if (_view) { + state = _view->automation_state (); + } else if (_line) { + assert (_control); + state = _control->alist()->automation_state (); } else { - state = _control->list()->automation_state (); + state = Off; } switch (state & (Off|Play|Touch|Write)) { case Off: - auto_button.set_label (_("Manual")); + auto_button.set_label (S_("Automation|Manual")); if (auto_off_item) { ignore_state_request = true; auto_off_item->set_active (true); @@ -330,13 +350,12 @@ AutomationTimeAxisView::automation_state_changed () } } +/** The interpolation style of our AutomationList has changed, so update */ void -AutomationTimeAxisView::interpolation_changed () -{ - AutomationList::InterpolationStyle style = _control->list()->interpolation(); - +AutomationTimeAxisView::interpolation_changed (AutomationList::InterpolationStyle s) +{ if (mode_line_item && mode_discrete_item) { - if (style == AutomationList::Discrete) { + if (s == AutomationList::Discrete) { mode_discrete_item->set_active(true); mode_line_item->set_active(false); } else { @@ -344,147 +363,91 @@ AutomationTimeAxisView::interpolation_changed () mode_discrete_item->set_active(false); } } - - if (_line) - _line->set_interpolation(style); } +/** A menu item has been selected to change our interpolation mode */ void AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style) { - _control->list()->set_interpolation(style); - if (_line) - _line->set_interpolation(style); -} + /* Tell our view's list, if we have one, otherwise tell our own. + * Everything else will be signalled back from that. + */ -void -AutomationTimeAxisView::height_clicked () -{ - popup_size_menu (0); + if (_view) { + _view->set_interpolation (style); + } else { + assert (_control); + _control->list()->set_interpolation (style); + } } void AutomationTimeAxisView::clear_clicked () { - _session.begin_reversible_command (_("clear automation")); - if (_line) - _line->clear (); - _session.commit_reversible_command (); -} + assert (_line || _view); -void -AutomationTimeAxisView::set_height (TrackHeight ht) -{ - 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; + _session->begin_reversible_command (_("clear automation")); - TimeAxisView::set_height (ht); - _base_rect->property_y2() = h; - - if (_line) - _line->set_y_position_and_height (0, h); - - if (_view) { - _view->set_height(h); - _view->update_contents_y_position_and_height(); + if (_line) { + _line->clear (); + } else if (_view) { + _view->clear (); } - 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; + _session->commit_reversible_command (); + _session->set_dirty (); +} - case Larger: - xml_node->add_property ("track_height", "larger"); - break; +void +AutomationTimeAxisView::set_height (uint32_t h) +{ + 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) ); - case Normal: - xml_node->add_property ("track_height", "normal"); - break; + TimeAxisView::set_height (h); - case Smaller: - xml_node->add_property ("track_height", "smaller"); - break; + _base_rect->property_y2() = h; - case Small: - xml_node->add_property ("track_height", "small"); - break; + if (_line) { + _line->set_height(h); } - switch (ht) { - case Large: - case Larger: - case Largest: - _controller->show (); + if (_view) { + _view->set_height(h); + _view->update_contents_height(); + } - 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 (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - plugname_packed = true; - controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } else { - controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } + if (h >= preset_height (HeightNormal)) { 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: - - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - } - controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + } else if (h >= preset_height (HeightSmall)) { controls_table.hide_all (); 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 >= preset_height (HeightNormal)) { + cerr << "track grown, but neither changed_between_small_and_normal nor first_call_to_set_height set!" << endl; } if (changed) { - /* only emit the signal if the height really changed */ - _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + if (canvas_item_visible (_canvas_display) && _route) { + /* only emit the signal if the height really changed and we were visible */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + } } } @@ -493,22 +456,24 @@ AutomationTimeAxisView::set_samples_per_unit (double spu) { TimeAxisView::set_samples_per_unit (spu); - if (_line) + if (_line) { _line->reset (); - - if (_view) + } + + if (_view) { _view->set_samples_per_unit (spu); + } } - + void AutomationTimeAxisView::hide_clicked () { - // LAME fix for refreshing the hide button hide_button.set_sensitive(false); - set_marked_for_display (false); - hide (); - + RouteTimeAxisView* rtv = dynamic_cast(parent); + if (rtv) { + rtv->request_redraw (); + } hide_button.set_sensitive(true); } @@ -517,10 +482,6 @@ AutomationTimeAxisView::build_display_menu () { using namespace Menu_Helpers; - /* get the size menu ready */ - - build_size_menu (); - /* prepare it */ TimeAxisView::build_display_menu (); @@ -529,11 +490,9 @@ AutomationTimeAxisView::build_display_menu () MenuList& items = display_menu->items(); - items.push_back (MenuElem (_("Height"), *size_menu)); + items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked))); - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked))); + items.push_back (MenuElem (_("Clear"), sigc::mem_fun(*this, &AutomationTimeAxisView::clear_clicked))); items.push_back (SeparatorElem()); /* state menu */ @@ -541,45 +500,53 @@ AutomationTimeAxisView::build_display_menu () Menu* auto_state_menu = manage (new Menu); auto_state_menu->set_name ("ArdourContextMenu"); MenuList& as_items = auto_state_menu->items(); - - as_items.push_back (CheckMenuElem (_("Manual"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off))); + + as_items.push_back (CheckMenuElem (S_("Automation|Manual"), sigc::bind ( + sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Off))); auto_off_item = dynamic_cast(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Play"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); + as_items.push_back (CheckMenuElem (_("Play"), sigc::bind ( + sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Play))); auto_play_item = dynamic_cast(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Write"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); + as_items.push_back (CheckMenuElem (_("Write"), sigc::bind ( + sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Write))); auto_write_item = dynamic_cast(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Touch"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); + as_items.push_back (CheckMenuElem (_("Touch"), sigc::bind ( + sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Touch))); auto_touch_item = dynamic_cast(&as_items.back()); items.push_back (MenuElem (_("State"), *auto_state_menu)); - + /* mode menu */ - - if (_control->parameter().type() == MidiCCAutomation) { + + /* current interpolation state */ + AutomationList::InterpolationStyle const s = _view ? _view->interpolation() : _control->list()->interpolation (); + + if (EventTypeMap::instance().is_midi_parameter(_parameter)) { + Menu* auto_mode_menu = manage (new Menu); auto_mode_menu->set_name ("ArdourContextMenu"); MenuList& am_items = auto_mode_menu->items(); - + RadioMenuItem::Group group; - am_items.push_back (RadioMenuElem (group, _("Discrete"), bind ( - mem_fun(*this, &AutomationTimeAxisView::set_interpolation), - AutomationList::Discrete))); + am_items.push_back (RadioMenuElem (group, _("Discrete"), sigc::bind ( + sigc::mem_fun(*this, &AutomationTimeAxisView::set_interpolation), + AutomationList::Discrete))); mode_discrete_item = dynamic_cast(&am_items.back()); - //mode_discrete_item->set_active(_control->list()->interpolation() == AutomationList::Discrete); + mode_discrete_item->set_active (s == AutomationList::Discrete); - am_items.push_back (RadioMenuElem (group, _("Line"), bind ( - mem_fun(*this, &AutomationTimeAxisView::set_interpolation), - AutomationList::Linear))); + am_items.push_back (RadioMenuElem (group, _("Linear"), sigc::bind ( + sigc::mem_fun(*this, &AutomationTimeAxisView::set_interpolation), + AutomationList::Linear))); mode_line_item = dynamic_cast(&am_items.back()); - //mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear); + mode_line_item->set_active (s == AutomationList::Linear); items.push_back (MenuElem (_("Mode"), *auto_mode_menu)); } @@ -587,18 +554,19 @@ AutomationTimeAxisView::build_display_menu () /* make sure the automation menu state is correct */ automation_state_changed (); - interpolation_changed (); + interpolation_changed (s); } void -AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y) +AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y) { - if (!_line) + if (!_line) { return; + } double x = 0; - canvas_display->w2i (x, y); + _canvas_display->w2i (x, y); /* compute vertical fractional position */ @@ -606,74 +574,101 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent /* map using line */ - _line->view_to_model_y (y); + _line->view_to_model_coord (x, y); - _session.begin_reversible_command (_("add automation event")); - XMLNode& before = _control->list()->get_state(); + boost::shared_ptr list = _line->the_list (); - _control->list()->add (when, y); + _editor.snap_to_with_modifier (when, event); - XMLNode& after = _control->list()->get_state(); - _session.commit_reversible_command (new MementoCommand(*_control->list().get(), &before, &after)); + _session->begin_reversible_command (_("add automation event")); + XMLNode& before = list->get_state(); - _session.set_dirty (); -} + list->add (when, y); + XMLNode& after = list->get_state(); + _session->commit_reversible_command (new MementoCommand (*list, &before, &after)); + _session->set_dirty (); +} -bool +void AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) { - return cut_copy_clear_one (*_line, selection, op); + list > lines; + if (_line) { + lines.push_back (_line); + } else if (_view) { + lines = _view->get_lines (); + } + + for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + cut_copy_clear_one (**i, selection, op); + } } -bool +void AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op) { - AutomationList* what_we_got = 0; + boost::shared_ptr what_we_got; boost::shared_ptr alist (line.the_list()); - bool ret = false; XMLNode &before = alist->get_state(); + /* convert time selection to automation list model coordinates */ + const Evoral::TimeConverter& tc = line.time_converter (); + double const start = tc.from (selection.time.front().start - tc.origin_b ()); + double const end = tc.from (selection.time.front().end - tc.origin_b ()); + switch (op) { + case Delete: + if (alist->cut (start, end) != 0) { + _session->add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); + } + break; + case Cut: - if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) { - editor.get_cut_buffer().add (what_we_got); - _session.add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); - ret = true; + + if ((what_we_got = alist->cut (start, end)) != 0) { + _editor.get_cut_buffer().add (what_we_got); + _session->add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); } break; case Copy: - if ((what_we_got = alist->copy (selection.time.front().start, selection.time.front().end)) != 0) { - editor.get_cut_buffer().add (what_we_got); + if ((what_we_got = alist->copy (start, end)) != 0) { + _editor.get_cut_buffer().add (what_we_got); } break; case Clear: - if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) { - _session.add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); - delete what_we_got; - what_we_got = 0; - ret = true; + if ((what_we_got = alist->cut (start, end)) != 0) { + _session->add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); } break; } if (what_we_got) { for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) { - double foo = (*x)->value; - line.model_to_view_y (foo); - (*x)->value = foo; + double when = (*x)->when; + double val = (*x)->value; + line.model_to_view_coord (when, val); + (*x)->when = when; + (*x)->value = val; } } - - return ret; } void AutomationTimeAxisView::reset_objects (PointSelection& selection) { - reset_objects_one (*_line, selection); + list > lines; + if (_line) { + lines.push_back (_line); + } else if (_view) { + lines = _view->get_lines (); + } + + for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + reset_objects_one (**i, selection); + } } void @@ -681,59 +676,68 @@ AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& { boost::shared_ptr alist(line.the_list()); - _session.add_command (new MementoCommand(*alist.get(), &alist->get_state(), 0)); + _session->add_command (new MementoCommand(*alist.get(), &alist->get_state(), 0)); for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { - if (&(*i).track != this) { + if ((*i).track != this) { continue; } - + alist->reset_range ((*i).start, (*i).end); } } -bool +void AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op) { - return cut_copy_clear_objects_one (*_line, selection, op); + list > lines; + if (_line) { + lines.push_back (_line); + } else if (_view) { + lines = _view->get_lines (); + } + + for (list >::iterator i = lines.begin(); i != lines.end(); ++i) { + cut_copy_clear_objects_one (**i, selection, op); + } } -bool +void AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op) { - AutomationList* what_we_got = 0; + boost::shared_ptr what_we_got; boost::shared_ptr alist(line.the_list()); - bool ret = false; XMLNode &before = alist->get_state(); for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { - if (&(*i).track != this) { + if ((*i).track != this) { continue; } switch (op) { + case Delete: + if (alist->cut ((*i).start, (*i).end) != 0) { + _session->add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); + } + break; case Cut: if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) { - editor.get_cut_buffer().add (what_we_got); - _session.add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); - ret = true; + _editor.get_cut_buffer().add (what_we_got); + _session->add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); } break; case Copy: if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) { - editor.get_cut_buffer().add (what_we_got); + _editor.get_cut_buffer().add (what_we_got); } break; - + case Clear: if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) { - _session.add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); - delete what_we_got; - what_we_got = 0; - ret = true; + _session->add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); } break; } @@ -743,28 +747,46 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS if (what_we_got) { for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) { - double foo = (*x)->value; - line.model_to_view_y (foo); - (*x)->value = foo; + double when = (*x)->when; + double val = (*x)->value; + line.model_to_view_coord (when, val); + (*x)->when = when; + (*x)->value = val; } } - - return ret; } +/** Paste a selection. + * @param pos Position to paste to (session frames). + * @param times Number of times to paste. + * @param selection Selection to paste. + * @param nth Index of the AutomationList within the selection to paste from. + */ bool -AutomationTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth) +AutomationTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth) { - return paste_one (*_line, pos, times, selection, nth); + boost::shared_ptr line; + + if (_line) { + line = _line; + } else if (_view) { + line = _view->paste_line (pos); + } + + if (!line) { + return false; + } + + return paste_one (*line, pos, times, selection, nth); } bool -AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float times, Selection& selection, size_t nth) +AutomationTimeAxisView::paste_one (AutomationLine& line, framepos_t pos, float times, Selection& selection, size_t nth) { AutomationSelection::iterator p; boost::shared_ptr alist(line.the_list()); - - for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth); + + for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {} if (p == selection.lines.end()) { return false; @@ -774,38 +796,48 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti values from view coordinates to model coordinates, and we're not supposed to modify the points in the selection. */ - + AutomationList copy (**p); for (AutomationList::iterator x = copy.begin(); x != copy.end(); ++x) { - double foo = (*x)->value; - line.view_to_model_y (foo); - (*x)->value = foo; + double when = (*x)->when; + double val = (*x)->value; + line.view_to_model_coord (when, val); + (*x)->when = when; + (*x)->value = val; } + double const model_pos = line.time_converter().from (pos - line.time_converter().origin_b ()); + XMLNode &before = alist->get_state(); - alist->paste (copy, pos, times); - _session.add_command (new MementoCommand(*alist.get(), &before, &alist->get_state())); + alist->paste (copy, model_pos, times); + _session->add_command (new MementoCommand(*alist.get(), &before, &alist->get_state())); return true; } void -AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list& results) +AutomationTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list& results) { - if (_line && touched (top, bot)) { - double topfrac; - double botfrac; + if (!_line && !_view) { + return; + } + + if (touched (top, bot)) { /* remember: this is X Window - coordinate space starts in upper left and moves down. - y_position is the "origin" or "top" of the track. + _y_position is the "origin" or "top" of the track. */ - double mybot = y_position + height; + /* bottom of our track */ + double const mybot = _y_position + height; + + double topfrac; + double botfrac; - if (y_position >= top && mybot <= bot) { + if (_y_position >= top && mybot <= bot) { - /* y_position is below top, mybot is above bot, so we're fully + /* _y_position is below top, mybot is above bot, so we're fully covered vertically. */ @@ -814,36 +846,44 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double } else { - /* top and bot are within y_position .. mybot */ + /* top and bot are within _y_position .. mybot */ + + topfrac = 1.0 - ((top - _y_position) / height); + botfrac = 1.0 - ((bot - _y_position) / height); - topfrac = 1.0 - ((top - y_position) / height); - botfrac = 1.0 - ((bot - y_position) / height); } - if (_line) + if (_line) { _line->get_selectables (start, end, botfrac, topfrac, results); + } else if (_view) { + _view->get_selectables (start, end, botfrac, topfrac, results); + } } } void AutomationTimeAxisView::get_inverted_selectables (Selection& sel, list& result) { - if (_line) + if (_line) { _line->get_inverted_selectables (sel, result); + } } void AutomationTimeAxisView::set_selected_points (PointSelection& points) { - if (_line) + if (_line) { _line->set_selected_points (points); + } else if (_view) { + _view->set_selected_points (points); + } } void AutomationTimeAxisView::clear_lines () { _line.reset(); - automation_connection.disconnect (); + _list_connections.drop_connections (); } void @@ -851,15 +891,21 @@ AutomationTimeAxisView::add_line (boost::shared_ptr line) { assert(line); assert(!_line); - assert(line->the_list() == _control->list()); - - automation_connection = _control->list()->automation_state_changed.connect - (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed)); + if (_control) { + 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() + ); + } _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 (); @@ -870,99 +916,165 @@ AutomationTimeAxisView::add_line (boost::shared_ptr line) void AutomationTimeAxisView::entered() { - if (_line) + if (_line) { _line->track_entered(); + } } void AutomationTimeAxisView::exited () { - if (_line) + if (_line) { _line->track_exited(); + } } -/*void -AutomationTimeAxisView::set_colors () -{ - for (list::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) { - (*i)->set_colors(); - } - - if (_line) - _line->set_colors(); - }*/ - void -AutomationTimeAxisView::color_handler () +AutomationTimeAxisView::color_handler () { if (_line) { _line->set_colors(); } } +int +AutomationTimeAxisView::set_state_2X (const XMLNode& node, int /*version*/) +{ + if (node.name() == X_("gain") && _parameter == Evoral::Parameter (GainAutomation)) { + XMLProperty const * shown = node.property (X_("shown")); + if (shown) { + bool yn = string_is_affirmative (shown->value ()); + if (yn) { + _canvas_display->show (); /* FIXME: necessary? show_at? */ + } + set_gui_property ("visible", yn); + } else { + set_gui_property ("visible", false); + } + } + + return 0; +} + +int +AutomationTimeAxisView::set_state (const XMLNode&, int /*version*/) +{ + return 0; +} + void -AutomationTimeAxisView::set_state (const XMLNode& node) +AutomationTimeAxisView::what_has_visible_automation (const boost::shared_ptr& automatable, set& visible) { - TimeAxisView::set_state (node); - - XMLNodeList kids; - XMLNodeConstIterator iter; + /* this keeps "knowledge" of how we store visibility information + in XML private to this class. + */ - kids = node.children (); + assert (automatable); - for (iter = kids.begin(); iter != kids.end(); ++iter) { + Automatable::Controls& controls (automatable->controls()); + + for (Automatable::Controls::iterator i = controls.begin(); i != controls.end(); ++i) { - if ((*iter)->name() == state_node_name) { - XMLProperty* type = (*iter)->property("automation-id"); + boost::shared_ptr ac = boost::dynamic_pointer_cast (i->second); - if (type && type->value() == _control->parameter().to_string()) { - XMLProperty *shown = (*iter)->property("shown_editor"); - - if (shown && shown->value() == "yes") { - set_marked_for_display(true); - canvas_display->show(); /* FIXME: necessary? show_at? */ + if (ac) { + + const XMLNode* gui_node = ac->extra_xml ("GUI"); + + if (gui_node) { + const XMLProperty* prop = gui_node->property ("shown"); + if (prop) { + if (string_is_affirmative (prop->value())) { + visible.insert (i->first); + } } - break; } } } +} - if (!_marked_for_display) - hide(); + +/** @return true if this view has any automation data to display */ +bool +AutomationTimeAxisView::has_automation () const +{ + return ( (_line && _line->npoints() > 0) || (_view && _view->has_automation()) ); } -XMLNode* -AutomationTimeAxisView::get_state_node () +list > +AutomationTimeAxisView::lines () const { - TimeAxisView* state_parent = get_parent_with_state (); + list > lines; - if (state_parent) { - return state_parent->get_automation_child_xml_node (_control->parameter()); - } else { - return 0; + if (_line) { + lines.push_back (_line); + } else if (_view) { + lines = _view->get_lines (); } -} -void -AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown) -{ - XMLNode* xml_node = get_state_node(); - xml_node->add_property ("shown", editor_shown ? "yes" : "no"); + return lines; } -guint32 -AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) +string +AutomationTimeAxisView::state_id() const { - update_extra_xml_shown (true); - - return TimeAxisView::show_at (y, nth, parent); + if (_control) { + return string_compose ("automation %1", _control->id().to_s()); + } else { + assert (_parameter); + return string_compose ("automation %1 %2/%3/%4", + _route->id(), + _parameter.type(), + _parameter.id(), + (int) _parameter.channel()); + } } -void -AutomationTimeAxisView::hide () +/** Given a state id string, see if it is one generated by + * this class. If so, parse it into its components. + * @param state_id State ID string to parse. + * @param route_id Filled in with the route's ID if the state ID string is parsed. + * @param has_parameter Filled in with true if the state ID has a parameter, otherwise false. + * @param parameter Filled in with the state ID's parameter, if it has one. + * @return true if this is a state ID generated by this class, otherwise false. + */ + +bool +AutomationTimeAxisView::parse_state_id ( + string const & state_id, + PBD::ID & route_id, + bool & has_parameter, + Evoral::Parameter & parameter) { - update_extra_xml_shown (false); + stringstream s; + s << state_id; - TimeAxisView::hide (); -} + string a, b, c; + s >> a >> b >> c; + + if (a != X_("automation")) { + return false; + } + route_id = PBD::ID (b); + + if (c.empty ()) { + has_parameter = false; + return true; + } + + has_parameter = true; + + vector p; + boost::split (p, c, boost::is_any_of ("/")); + + assert (p.size() == 3); + + parameter = Evoral::Parameter ( + boost::lexical_cast (p[0]), + boost::lexical_cast (p[2]), + boost::lexical_cast (p[1]) + ); + + return true; +}