X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=a7114f8ff0ece3bea569cd8a5d4df8832b5cd600;hb=593b421180290f46f39efcb21ed8192b624bbc73;hp=07a47f274ea30f1de6763c4c16832b636bbe161d;hpb=d357eca668044badcb4bab318e2e74cfffa9a0b0;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 07a47f274e..a7114f8ff0 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,14 +18,17 @@ */ #include -#include -#include -#include #include +#include "pbd/memento_command.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 "gui_thread.h" #include "route_time_axis.h" #include "automation_line.h" #include "public_editor.h" @@ -39,6 +42,7 @@ #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -49,22 +53,25 @@ Pango::FontDescription* AutomationTimeAxisView::name_font = 0; bool AutomationTimeAxisView::have_name_font = false; const string AutomationTimeAxisView::state_node_name = "AutomationChild"; -AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr r, + +/** \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, PublicEditor& e, TimeAxisView& parent, bool show_regions, ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent) - - : AxisView (s), + : AxisView (s), 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")), auto_button (X_("")) /* force addition of a label */ { if (!have_name_font) { @@ -82,37 +89,39 @@ 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); + _base_rect->property_x2() = LONG_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")); /* rearrange the name display */ @@ -146,7 +155,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrset_name (X_("TrackPlugName")); plugname->show(); name_label.set_name (X_("TrackParameterName")); @@ -165,52 +174,45 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrtooltips().set_tip(controls_ebox, tipname); + ARDOUR_UI::instance()->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, 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); + 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); - } - + set_state (*xml_node, Stateful::loading_state_version); + } + /* 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().symbol(), + ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()), *this, - *canvas_display, + *_canvas_display, _control->alist())); line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get()); @@ -221,7 +223,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrset_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"), 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()); @@ -255,14 +257,26 @@ 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 (_automatable) { + _automatable->set_parameter_automation_state (_control->parameter(), state); + } +#if 0 + if (_route == _automatable) { // This is a time axis for route (not region) automation + _route->set_parameter_automation_state (_control->parameter(), state); } - _control->alist()->set_automation_state(state); + if (_control->list()) + _control->alist()->set_automation_state(state); +#endif + } + + 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,10 +287,12 @@ AutomationTimeAxisView::automation_state_changed () /* update button label */ - if (!_line) { - state = Off; - } else { + if (_line) { state = _control->alist()->automation_state (); + } else if (_view) { + state = _view->automation_state (); + } else { + state = Off; } switch (state & (Off|Play|Touch|Write)) { @@ -330,13 +346,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,67 +359,67 @@ 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); -} - -void -AutomationTimeAxisView::height_clicked () -{ - popup_size_menu (0); + /* Tell our view's list, if we have one, otherwise tell our own. + * Everything else will be signalled back from that. + */ + + if (_view) { + _view->set_interpolation (style); + } else { + _control->list()->set_interpolation (style); + } } void AutomationTimeAxisView::clear_clicked () { - _session.begin_reversible_command (_("clear automation")); - if (_line) + if (_line) { + _session->begin_reversible_command (_("clear automation")); _line->clear (); - _session.commit_reversible_command (); + } } void AutomationTimeAxisView::set_height (uint32_t h) { - bool changed = (height != (uint32_t) h) || first_call_to_set_height; - bool changed_between_small_and_normal = ( (h == hSmall || h == hSmaller) ^ (height == hSmall || height == hSmaller) ); + 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* state_parent = get_parent_with_state (); - assert(state_parent); XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter()); TimeAxisView::set_height (h); _base_rect->property_y2() = h; - + if (_line) - _line->set_y_position_and_height (0, h); - + _line->set_height(h); + if (_view) { _view->set_height(h); - _view->update_contents_y_position_and_height(); + _view->update_contents_height(); } char buf[32]; snprintf (buf, sizeof (buf), "%u", height); - xml_node->add_property ("height", buf); + if (xml_node) { + xml_node->add_property ("height", buf); + } if (changed_between_small_and_normal || first_call_to_set_height) { first_call_to_set_height = false; - if (h >= hNormal) { + if (h >= preset_height (HeightNormal)) { controls_table.remove (name_hbox); - + if (plugname) { if (plugname_packed) { controls_table.remove (*plugname); @@ -419,13 +434,11 @@ AutomationTimeAxisView::set_height (uint32_t h) hide_name_entry (); show_name_label (); name_hbox.show_all (); - + auto_button.show(); - height_button.show(); - clear_button.show(); hide_button.show_all(); - } else if (h >= hSmall) { + } else if (h >= preset_height (HeightSmall)) { controls_table.remove (name_hbox); if (plugname) { if (plugname_packed) { @@ -438,22 +451,19 @@ AutomationTimeAxisView::set_height (uint32_t h) hide_name_entry (); show_name_label (); name_hbox.show_all (); - + auto_button.hide(); - height_button.hide(); - clear_button.hide(); hide_button.hide(); } - } else if (h >= hNormal){ - auto_button.show(); - height_button.show(); - clear_button.show(); - hide_button.show_all(); + } 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 ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + if (canvas_item_visible (_canvas_display)) { + /* only emit the signal if the height really changed and we were visible */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + } } } @@ -464,20 +474,20 @@ AutomationTimeAxisView::set_samples_per_unit (double spu) if (_line) _line->reset (); - + 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 (); - + hide_button.set_sensitive(true); } @@ -486,10 +496,6 @@ AutomationTimeAxisView::build_display_menu () { using namespace Menu_Helpers; - /* get the size menu ready */ - - build_size_menu (); - /* prepare it */ TimeAxisView::build_display_menu (); @@ -498,11 +504,9 @@ AutomationTimeAxisView::build_display_menu () MenuList& items = display_menu->items(); - items.push_back (MenuElem (_("Height"), *size_menu)); - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked))); + items.push_back (MenuElem (_("Hide"), sigc::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 */ @@ -510,45 +514,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 (_("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(_control->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)); } @@ -556,18 +568,18 @@ 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 (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, nframes_t when, double y) { if (!_line) return; double x = 0; - canvas_display->w2i (x, y); + _canvas_display->w2i (x, y); /* compute vertical fractional position */ @@ -575,20 +587,19 @@ 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")); + _session->begin_reversible_command (_("add automation event")); XMLNode& before = _control->alist()->get_state(); _control->alist()->add (when, y); XMLNode& after = _control->alist()->get_state(); - _session.commit_reversible_command (new MementoCommand(*_control->alist(), &before, &after)); + _session->commit_reversible_command (new MementoCommand(*_control->alist(), &before, &after)); - _session.set_dirty (); + _session->set_dirty (); } - bool AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) { @@ -607,20 +618,20 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel switch (op) { 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())); + _editor.get_cut_buffer().add (what_we_got); + _session->add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); ret = true; } 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); + _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())); + _session->add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); ret = true; } break; @@ -628,9 +639,11 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel 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; } } @@ -648,14 +661,14 @@ 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); } } @@ -677,27 +690,27 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { - if (&(*i).track != this) { + if ((*i).track != this) { continue; } switch (op) { 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())); + _editor.get_cut_buffer().add (what_we_got); + _session->add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); ret = true; } 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())); + _session->add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); ret = true; } break; @@ -708,9 +721,11 @@ 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; } } @@ -728,8 +743,8 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti { 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; @@ -739,18 +754,20 @@ 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; } XMLNode &before = alist->get_state(); alist->paste (copy, pos, times); - _session.add_command (new MementoCommand(*alist.get(), &before, &alist->get_state())); + _session->add_command (new MementoCommand(*alist.get(), &before, &alist->get_state())); return true; } @@ -763,14 +780,14 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double double botfrac; /* 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; + double mybot = _y_position + height; - 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. */ @@ -779,10 +796,10 @@ 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) @@ -800,15 +817,16 @@ AutomationTimeAxisView::get_inverted_selectables (Selection& sel, listset_selected_points (points); + } } void AutomationTimeAxisView::clear_lines () { _line.reset(); - automation_connection.disconnect (); + _list_connections.drop_connections (); } void @@ -818,13 +836,18 @@ AutomationTimeAxisView::add_line (boost::shared_ptr line) assert(!_line); assert(line->the_list() == _control->list()); - automation_connection = _control->alist()->automation_state_changed.connect - (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed)); + _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 (); @@ -846,19 +869,8 @@ AutomationTimeAxisView::exited () _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(); @@ -866,34 +878,24 @@ AutomationTimeAxisView::color_handler () } int -AutomationTimeAxisView::set_state (const XMLNode& node) +AutomationTimeAxisView::set_state (const XMLNode& node, int version) { - return TimeAxisView::set_state (node); - - XMLNodeList kids; - XMLNodeConstIterator iter; - - kids = node.children (); - - for (iter = kids.begin(); iter != kids.end(); ++iter) { - - if ((*iter)->name() == state_node_name) { - XMLProperty* type = (*iter)->property("automation-id"); - - if (type && type->value() == _control->parameter().symbol()) { - XMLProperty *shown = (*iter)->property("shown_editor"); + TimeAxisView::set_state (node, version); - if (shown && shown->value() == "yes") { - set_marked_for_display(true); - canvas_display->show(); /* FIXME: necessary? show_at? */ - } - break; - } + XMLProperty const * type = node.property ("automation-id"); + if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_control->parameter())) { + XMLProperty const * shown = node.property ("shown"); + if (shown && shown->value () == "yes") { + set_marked_for_display (true); + _canvas_display->show (); /* FIXME: necessary? show_at? */ } } - if (!_marked_for_display) + if (!_marked_for_display) { hide(); + } + + return 0; } XMLNode* @@ -921,7 +923,7 @@ guint32 AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { update_extra_xml_shown (true); - + return TimeAxisView::show_at (y, nth, parent); } @@ -933,3 +935,21 @@ AutomationTimeAxisView::hide () TimeAxisView::hide (); } +bool +AutomationTimeAxisView::set_visibility (bool yn) +{ + bool changed = TimeAxisView::set_visibility (yn); + + if (changed) { + get_state_node()->add_property ("shown", yn ? X_("yes") : X_("no")); + } + + return changed; +} + +/** @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()) ); +}