X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=806359e2ab36f2e7b05935accc919f8d2f054060;hb=e57c4d4c43c0d302c0b06128e0ba10c4683ee8fe;hp=12998ee7d6ce429bd7d6f0e6cca00daaf3649e0f;hpb=b3fe7cfc892f7d5978ad14eb81e9305fa9c14d13;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 12998ee7d6..806359e2ab 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -17,16 +17,21 @@ */ -#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_ui.h" #include "automation_time_axis.h" +#include "automation_streamview.h" +#include "route_time_axis.h" #include "automation_line.h" #include "public_editor.h" #include "simplerect.h" #include "selection.h" -#include "ghostregion.h" #include "rgb_macros.h" #include "automation_selectable.h" #include "point_selection.h" @@ -35,25 +40,36 @@ #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; +Pango::FontDescription* AutomationTimeAxisView::name_font = 0; bool AutomationTimeAxisView::have_name_font = false; - -AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr r, PublicEditor& e, TimeAxisView& rent, - ArdourCanvas::Canvas& canvas, const string & nom, - const string & state_name, const string & nomparent) - +const string AutomationTimeAxisView::state_node_name = "AutomationChild"; + + +/** \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), - TimeAxisView (s, e, &rent, canvas), - route (r), + 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), - _state_name (state_name), - height_button (_("h")), - clear_button (_("clear")), auto_button (X_("")) /* force addition of a label */ { if (!have_name_font) { @@ -62,41 +78,45 @@ 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_outline_color_rgba() = color_map[cAutomationTrackOutline]; + + _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() = color_map[cAutomationTrackFill]; - //base_rect->property_fill_color_rgba() = color_map[cEnteredControlPoint]; + _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->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 (bind ( + mem_fun (_editor, &PublicEditor::canvas_automation_track_event), + _base_rect, this)); + + // _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")); /* rearrange the name display */ @@ -113,7 +133,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrget_child_xml_node (_state_name); + 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 ( + ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()), + *this, + *_canvas_display, + _control->alist())); + + line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get()); + line->queue_reset (); + add_line (line); + } /* make sure labels etc. are correct */ automation_state_changed (); - ColorChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler)); + ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler)); } AutomationTimeAxisView::~AutomationTimeAxisView () { - in_destructor = true; - - for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - delete *i; - } } void @@ -204,19 +236,38 @@ 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 (_("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))); } automation_menu->popup (1, gtk_get_current_event_time()); } +void +AutomationTimeAxisView::set_automation_state (AutoState state) +{ + if (!ignore_state_request) { + _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); + } + + if (_control->list()) + _control->alist()->set_automation_state(state); +#endif + } + + if (_view) { + _view->set_automation_state (state); + } +} void AutomationTimeAxisView::automation_state_changed () @@ -225,12 +276,12 @@ AutomationTimeAxisView::automation_state_changed () /* update button label */ - if (lines.empty()) { + if (!_line) { state = Off; } else { - state = lines.front()->the_list().automation_state (); + state = _control->alist()->automation_state (); } - + switch (state & (Off|Play|Touch|Write)) { case Off: auto_button.set_label (_("Manual")); @@ -283,139 +334,135 @@ AutomationTimeAxisView::automation_state_changed () } void -AutomationTimeAxisView::height_clicked () +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); + mode_line_item->set_active(false); + } else { + mode_line_item->set_active(true); + mode_discrete_item->set_active(false); + } + } + + if (_line) { + _line->set_interpolation(style); + } +} + +void +AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style) { - popup_size_menu (0); + _control->list()->set_interpolation(style); + if (_line) { + _line->set_interpolation(style); + } } void AutomationTimeAxisView::clear_clicked () { _session.begin_reversible_command (_("clear automation")); - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->clear (); + if (_line) { + _line->clear (); } _session.commit_reversible_command (); } void -AutomationTimeAxisView::set_height (TrackHeight ht) +AutomationTimeAxisView::set_height (uint32_t h) { - uint32_t h = height_to_pixels (ht); - bool changed = (height != (uint32_t) h); - - bool changed_between_small_and_normal = ( (ht == Small || ht == Smaller) ^ (height_style == Small || height_style == Smaller) ); + 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) ); TimeAxisView* state_parent = get_parent_with_state (); - XMLNode* xml_node = state_parent->get_child_xml_node (_state_name); + assert(state_parent); + XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter()); - TimeAxisView::set_height (ht); - base_rect->property_y2() = h; - - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->set_height (h); - } - - for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->set_height (); + 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(); } - - switch (ht) { - case Largest: - xml_node->add_property ("track_height", "largest"); - break; - - case Large: - xml_node->add_property ("track_height", "large"); - break; - - case Larger: - xml_node->add_property ("track_height", "larger"); - break; - - case Normal: - xml_node->add_property ("track_height", "normal"); - break; - - case Smaller: - xml_node->add_property ("track_height", "smaller"); - break; - - case Small: - xml_node->add_property ("track_height", "small"); - break; + char buf[32]; + snprintf (buf, sizeof (buf), "%u", height); + 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; - switch (ht) { - case Largest: - case Large: - case Larger: - case Normal: - - controls_table.remove (name_hbox); - - 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); - } - 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: - case Small: - - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } + + if (h >= hNormal) { + controls_table.remove (name_hbox); + + 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); - 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; + } + hide_name_entry (); + show_name_label (); + name_hbox.show_all (); + + auto_button.show(); + hide_button.show_all(); + + } else if (h >= hSmall) { + 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); + controls_table.hide_all (); + hide_name_entry (); + show_name_label (); + name_hbox.show_all (); + + auto_button.hide(); + hide_button.hide(); } + } else if (h >= hNormal){ + 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 */ + _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } } void AutomationTimeAxisView::set_samples_per_unit (double spu) { - TimeAxisView::set_samples_per_unit (editor.get_current_zoom()); + TimeAxisView::set_samples_per_unit (spu); - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->reset (); - } + if (_line) + _line->reset (); + + if (_view) + _view->set_samples_per_unit (spu); } void @@ -454,73 +501,130 @@ AutomationTimeAxisView::build_display_menu () items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked))); items.push_back (SeparatorElem()); + /* state 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"), bind ( + 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"), bind ( + 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"), bind ( + 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"), bind ( + 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()) ) { + + 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))); + 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 + 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); + } + + items.push_back (MenuElem (_("Mode"), *auto_mode_menu)); + } /* make sure the automation menu state is correct */ automation_state_changed (); + interpolation_changed (); } -bool -AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) +void +AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, nframes_t when, double y) { - bool ret = false; + if (!_line) + return; - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - ret = cut_copy_clear_one ((**i), selection, op); - } + double x = 0; - return ret; + _canvas_display->w2i (x, y); + + /* compute vertical fractional position */ + + y = 1.0 - (y / height); + + /* map using line */ + + _line->view_to_model_coord (x, y); + + _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.set_dirty (); +} + + +bool +AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) +{ + return (_line ? cut_copy_clear_one (*_line, selection, op) : false); } bool AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& selection, CutCopyOp op) { - AutomationList* what_we_got = 0; - AutomationList& alist (line.the_list()); + boost::shared_ptr what_we_got; + boost::shared_ptr alist (line.the_list()); bool ret = false; - XMLNode &before = alist.get_state(); + XMLNode &before = alist->get_state(); 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, &before, &alist.get_state())); + 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; } 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 (selection.time.front().start, selection.time.front().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, &before, &alist.get_state())); - delete what_we_got; - what_we_got = 0; + 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())); ret = true; } break; @@ -528,9 +632,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; } } @@ -540,17 +646,15 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel void AutomationTimeAxisView::reset_objects (PointSelection& selection) { - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - reset_objects_one ((**i), selection); - } + reset_objects_one (*_line, selection); } void AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& selection) { - AutomationList& alist (line.the_list()); + boost::shared_ptr alist(line.the_list()); - _session.add_command (new MementoCommand(alist, &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) { @@ -558,30 +662,24 @@ AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& continue; } - alist.reset_range ((*i).start, (*i).end); + alist->reset_range ((*i).start, (*i).end); } } bool AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op) { - bool ret = false; - - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - ret = cut_copy_clear_objects_one ((**i), selection, op); - } - - return ret; + return cut_copy_clear_objects_one (*_line, selection, op); } bool AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointSelection& selection, CutCopyOp op) { - AutomationList* what_we_got = 0; - AutomationList& alist (line.the_list()); + boost::shared_ptr what_we_got; + boost::shared_ptr alist(line.the_list()); bool ret = false; - XMLNode &before = alist.get_state(); + XMLNode &before = alist->get_state(); for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { @@ -591,23 +689,21 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS 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, new XMLNode (before), &alist.get_state())); + 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; } break; case Copy: - if ((what_we_got = alist.copy ((*i).start, (*i).end)) != 0) { - editor.get_cut_buffer().add (what_we_got); + if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) { + _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, new XMLNode (before), &alist.get_state())); - delete what_we_got; - what_we_got = 0; + if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) { + _session.add_command (new MementoCommand(*alist.get(), new XMLNode (before), &alist->get_state())); ret = true; } break; @@ -618,9 +714,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; } } @@ -630,22 +728,16 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS bool AutomationTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth) { - bool ret = true; - - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - ret = paste_one (**i, pos, times, selection, nth); - } - - return ret; + return paste_one (*_line, pos, times, selection, nth); } bool AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float times, Selection& selection, size_t nth) { AutomationSelection::iterator p; - AutomationList& alist (line.the_list()); + 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; @@ -659,58 +751,36 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti 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, &before, &alist.get_state())); + XMLNode &before = alist->get_state(); + alist->paste (copy, pos, times); + _session.add_command (new MementoCommand(*alist.get(), &before, &alist->get_state())); return true; } -void -AutomationTimeAxisView::add_ghost (GhostRegion* gr) -{ - ghosts.push_back (gr); - gr->GoingAway.connect (mem_fun(*this, &AutomationTimeAxisView::remove_ghost)); -} - -void -AutomationTimeAxisView::remove_ghost (GhostRegion* gr) -{ - if (in_destructor) { - return; - } - - list::iterator i; - - for (i = ghosts.begin(); i != ghosts.end(); ++i) { - if ((*i) == gr) { - ghosts.erase (i); - break; - } - } -} - void AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list& results) { - if (!lines.empty() && touched (top, bot)) { + if (_line && touched (top, bot)) { double topfrac; 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. */ @@ -719,134 +789,100 @@ 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); } - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->get_selectables (start, end, botfrac, topfrac, results); - } + if (_line) + _line->get_selectables (start, end, botfrac, topfrac, results); } } void AutomationTimeAxisView::get_inverted_selectables (Selection& sel, list& result) { - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->get_inverted_selectables (sel, result); - } + if (_line) + _line->get_inverted_selectables (sel, result); } void AutomationTimeAxisView::set_selected_points (PointSelection& points) { - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->set_selected_points (points); - } + if (_line) + _line->set_selected_points (points); } void AutomationTimeAxisView::clear_lines () { - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - delete *i; - } - - lines.clear (); + _line.reset(); automation_connection.disconnect (); } void -AutomationTimeAxisView::add_line (AutomationLine& line) +AutomationTimeAxisView::add_line (boost::shared_ptr line) { - bool get = false; + assert(line); + assert(!_line); + assert(line->the_list() == _control->list()); - if (lines.empty()) { - /* first line is the Model for automation state */ - automation_connection = line.the_list().automation_state_changed.connect - (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed)); - get = true; - } + automation_connection = _control->alist()->automation_state_changed.connect + (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed)); - lines.push_back (&line); - line.set_height (height); + _line = line; + //_controller = AutomationController::create(_session, line->the_list(), _control); - if (get) { - /* pick up the current state */ - automation_state_changed (); - } -} + line->set_height (height); -void -AutomationTimeAxisView::show_all_control_points () -{ - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->show_all_control_points (); - } -} + /* pick up the current state */ + automation_state_changed (); -void -AutomationTimeAxisView::hide_all_but_selected_control_points () -{ - for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->hide_all_but_selected_control_points (); - } + line->show(); } void AutomationTimeAxisView::entered() { - show_all_control_points (); + if (_line) + _line->track_entered(); } void AutomationTimeAxisView::exited () { - hide_all_but_selected_control_points (); -} - -void -AutomationTimeAxisView::set_colors () { - - for( list::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) { - (*i)->set_colors(); - } - - for( vector::iterator i=lines.begin(); i != lines.end(); i++ ) { - (*i)->set_colors(); - } - + if (_line) + _line->track_exited(); } void -AutomationTimeAxisView::color_handler (ColorID id, uint32_t val) { - - switch (id) { - case cGhostTrackWave: - case cGhostTrackWaveClip: - case cGhostTrackZeroLine: - - case cControlPoint: - case cControlPointFill: - case cControlPointOutline: - case cAutomationLine: - set_colors (); - - break; - - default: - break; +AutomationTimeAxisView::color_handler () +{ + if (_line) { + _line->set_colors(); } } - - -void +int AutomationTimeAxisView::set_state (const XMLNode& node) { TimeAxisView::set_state (node); + + 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) { + hide(); + } + + return 0; } XMLNode* @@ -855,8 +891,34 @@ AutomationTimeAxisView::get_state_node () TimeAxisView* state_parent = get_parent_with_state (); if (state_parent) { - return state_parent->get_child_xml_node (_state_name); + return state_parent->get_automation_child_xml_node (_control->parameter()); } else { return 0; } } + +void +AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown) +{ + XMLNode* xml_node = get_state_node(); + if (xml_node) { + xml_node->add_property ("shown", editor_shown ? "yes" : "no"); + } +} + +guint32 +AutomationTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) +{ + update_extra_xml_shown (true); + + return TimeAxisView::show_at (y, nth, parent); +} + +void +AutomationTimeAxisView::hide () +{ + update_extra_xml_shown (false); + + TimeAxisView::hide (); +} +