X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=9163b10dc1bea5e952d791c03069b596dbc91767;hb=9c4f5ac000ad91b55e4cf91317b7a89f6239870e;hp=a210468901c9ac9a1343ed20928959f47ea0dd03;hpb=4297071b3f7360b17d81ef9cf36b8d75d46d2818;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index a210468901..9163b10dc1 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 @@ -23,10 +23,12 @@ #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" @@ -57,47 +59,21 @@ const string AutomationTimeAxisView::state_node_name = "AutomationChild"; * 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, TimeAxisViewPtr parent, bool show_regions, - ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent) - : AxisView (s), - TimeAxisView (s, e, parent, canvas), +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->parameter(), c)), _base_rect (0), + _view (show_regions ? new AutomationStreamView(*this) : NULL), _name (nom), auto_button (X_("")) /* force addition of a label */ { - -} - -AutomationTimeAxisViewPtr -AutomationTimeAxisView::create (Session& s, boost::shared_ptr r, - boost::shared_ptr a, boost::shared_ptr c, - PublicEditor& e, TimeAxisViewPtr parent, bool show_regions, - ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent) -{ - AutomationTimeAxisViewPtr v (new AutomationTimeAxisView (s, r, a, c, e, parent, show_regions, canvas, nom, nomparent)); - v->init (s, r, a, c, e, parent, show_regions, canvas, nom, nomparent); - return v; -} - - -void -AutomationTimeAxisView::init (Session& s, boost::shared_ptr r, - boost::shared_ptr a, boost::shared_ptr c, - PublicEditor& e, TimeAxisViewPtr parent, bool show_regions, - ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent) -{ - if (show_regions) { - _view = new AutomationStreamView (boost::dynamic_pointer_cast (shared_from_this())); - } else { - _view = 0; - } - if (!have_name_font) { name_font = get_font_for_style (X_("AutomationTrackName")); have_name_font = true; @@ -113,30 +89,26 @@ AutomationTimeAxisView::init (Session& s, boost::shared_ptr r, ignore_state_request = false; first_call_to_set_height = true; - + _base_rect = new SimpleRect(*_canvas_display); _base_rect->property_x1() = 0.0; _base_rect->property_y1() = 0.0; _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, - boost::weak_ptr ( - boost::dynamic_pointer_cast (shared_from_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"))))); @@ -148,8 +120,8 @@ AutomationTimeAxisView::init (Session& s, boost::shared_ptr r, controls_table.set_no_show_all(); - ARDOUR_UI::instance()->tooltips().set_tip(auto_button, _("automation state")); - 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 */ @@ -183,7 +155,7 @@ AutomationTimeAxisView::init (Session& s, boost::shared_ptr r, shortened = true; } - plugname = new Label (pname); + plugname = new Label (pname); plugname->set_name (X_("TrackPlugName")); plugname->show(); name_label.set_name (X_("TrackParameterName")); @@ -202,21 +174,21 @@ AutomationTimeAxisView::init (Session& s, boost::shared_ptr r, tipname += ": "; } tipname += _name; - ARDOUR_UI::instance()->tooltips().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 (auto_button, 5, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - + /* add bar controller */ controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.show_all (); - 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"); @@ -226,20 +198,20 @@ AutomationTimeAxisView::init (Session& s, boost::shared_ptr r, _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 ( ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()), - boost::dynamic_pointer_cast (shared_from_this ()), + *this, *_canvas_display, _control->alist())); @@ -251,7 +223,7 @@ AutomationTimeAxisView::init (Session& s, boost::shared_ptr r, /* make sure labels etc. are correct */ automation_state_changed (); - ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler)); + ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler)); } AutomationTimeAxisView::~AutomationTimeAxisView () @@ -268,13 +240,13 @@ AutomationTimeAxisView::auto_clicked () automation_menu->set_name ("ArdourContextMenu"); MenuList& items (automation_menu->items()); - items.push_back (MenuElem (_("Manual"), bind (mem_fun(*this, + items.push_back (MenuElem (_("Manual"), sigc::bind (sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off))); - items.push_back (MenuElem (_("Play"), bind (mem_fun(*this, + items.push_back (MenuElem (_("Play"), sigc::bind (sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); - items.push_back (MenuElem (_("Write"), bind (mem_fun(*this, + items.push_back (MenuElem (_("Write"), sigc::bind (sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); - items.push_back (MenuElem (_("Touch"), bind (mem_fun(*this, + items.push_back (MenuElem (_("Touch"), sigc::bind (sigc::mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); } @@ -285,7 +257,9 @@ void AutomationTimeAxisView::set_automation_state (AutoState state) { if (!ignore_state_request) { - _automatable->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); @@ -298,6 +272,11 @@ AutomationTimeAxisView::set_automation_state (AutoState 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 (); } } @@ -308,12 +287,14 @@ 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)) { case Off: auto_button.set_label (_("Manual")); @@ -367,9 +348,9 @@ AutomationTimeAxisView::automation_state_changed () void AutomationTimeAxisView::interpolation_changed () -{ +{ AutomationList::InterpolationStyle style = _control->list()->interpolation(); - + if (mode_line_item && mode_discrete_item) { if (style == AutomationList::Discrete) { mode_discrete_item->set_active(true); @@ -379,10 +360,14 @@ AutomationTimeAxisView::interpolation_changed () mode_discrete_item->set_active(false); } } - + if (_line) { _line->set_interpolation(style); } + + if (_view) { + _view->set_interpolation (style); + } } void @@ -392,36 +377,37 @@ AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle st if (_line) { _line->set_interpolation(style); } + if (_view) { + _view->set_interpolation (style); + } } void AutomationTimeAxisView::clear_clicked () { - _session.begin_reversible_command (_("clear automation")); 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 = ( - (height < hNormal && h >= hNormal) - || (height >= hNormal || h < hNormal) ); + 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) ); - TimeAxisViewPtr state_parent = get_parent_with_state (); + 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_height(h); - + if (_view) { _view->set_height(h); _view->update_contents_height(); @@ -437,9 +423,9 @@ AutomationTimeAxisView::set_height (uint32_t h) 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); @@ -454,11 +440,11 @@ AutomationTimeAxisView::set_height (uint32_t h) hide_name_entry (); show_name_label (); name_hbox.show_all (); - + auto_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) { @@ -471,17 +457,19 @@ AutomationTimeAxisView::set_height (uint32_t h) hide_name_entry (); show_name_label (); name_hbox.show_all (); - + auto_button.hide(); hide_button.hide(); } - } else if (h >= hNormal){ + } 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 */ + } } } @@ -492,20 +480,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); } @@ -514,10 +502,6 @@ AutomationTimeAxisView::build_display_menu () { using namespace Menu_Helpers; - /* get the size menu ready */ - - build_size_menu (); - /* prepare it */ TimeAxisView::build_display_menu (); @@ -526,11 +510,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 */ @@ -538,51 +520,52 @@ 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), + + 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), + 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), + 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), + 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 ( EventTypeMap::instance().is_midi_parameter(_control->parameter()) ) { - + 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); - // For discrete types we dont allow the linear option since it makes no sense for those Controls + 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()); + + // Set default interpolation type to linear if this isn't a (usually) discrete controller if (EventTypeMap::instance().interpolation_of(_control->parameter()) == Evoral::ControlList::Linear) { - am_items.push_back (RadioMenuElem (group, _("Line"), bind ( - 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); } @@ -596,7 +579,7 @@ AutomationTimeAxisView::build_display_menu () } 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; @@ -613,18 +596,17 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent _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) { @@ -644,7 +626,7 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel 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())); + _session->add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); ret = true; } break; @@ -656,7 +638,7 @@ 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(*alist.get(), &before, &alist->get_state())); + _session->add_command(new MementoCommand(*alist.get(), &before, &alist->get_state())); ret = true; } break; @@ -686,14 +668,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 != shared_from_this ()) { + if ((*i).track != this) { continue; } - + alist->reset_range ((*i).start, (*i).end); } } @@ -715,7 +697,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { - if (i->track != shared_from_this ()) { + if ((*i).track != this) { continue; } @@ -723,7 +705,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS 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())); + _session->add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); ret = true; } break; @@ -732,10 +714,10 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS _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; @@ -768,7 +750,7 @@ 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) {} if (p == selection.lines.end()) { @@ -779,7 +761,7 @@ 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) { @@ -792,7 +774,7 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti 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; } @@ -842,8 +824,9 @@ AutomationTimeAxisView::get_inverted_selectables (Selection& sel, listset_selected_points (points); + } } void @@ -860,8 +843,7 @@ 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 (automation_connection, invalidator (*this), boost::bind (&AutomationTimeAxisView::automation_state_changed, this), gui_context()); _line = line; //_controller = AutomationController::create(_session, line->the_list(), _control); @@ -889,7 +871,7 @@ AutomationTimeAxisView::exited () } void -AutomationTimeAxisView::color_handler () +AutomationTimeAxisView::color_handler () { if (_line) { _line->set_colors(); @@ -897,9 +879,9 @@ AutomationTimeAxisView::color_handler () } int -AutomationTimeAxisView::set_state (const XMLNode& node) +AutomationTimeAxisView::set_state (const XMLNode& node, int version) { - TimeAxisView::set_state (node); + TimeAxisView::set_state (node, version); XMLProperty const * type = node.property ("automation-id"); if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_control->parameter())) { @@ -909,7 +891,7 @@ AutomationTimeAxisView::set_state (const XMLNode& node) _canvas_display->show (); /* FIXME: necessary? show_at? */ } } - + if (!_marked_for_display) { hide(); } @@ -920,7 +902,7 @@ AutomationTimeAxisView::set_state (const XMLNode& node) XMLNode* AutomationTimeAxisView::get_state_node () { - TimeAxisViewPtr state_parent = get_parent_with_state (); + TimeAxisView* state_parent = get_parent_with_state (); if (state_parent) { return state_parent->get_automation_child_xml_node (_control->parameter()); @@ -942,7 +924,7 @@ guint32 AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { update_extra_xml_shown (true); - + return TimeAxisView::show_at (y, nth, parent); } @@ -954,3 +936,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()) ); +}