X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=518f4ed41fa83c9f29b3e79a1937fbdb3e2ae4c1;hb=1b657585572298d1a69a7b43e611f59b7e185df3;hp=a499c9896067a36196bfd678efd03eabfc045a98;hpb=4c000c13eecf4cb3d63be304fc0056ddaa35bb21;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index a499c98960..518f4ed41f 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -25,11 +25,12 @@ #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" @@ -44,18 +45,24 @@ 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; +const string AutomationTimeAxisView::state_node_name = "AutomationChild"; -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) +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->list(), 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 */ @@ -66,28 +73,32 @@ 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() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get(); + _base_rect = new SimpleRect(*canvas_display); + _base_rect->property_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() = 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->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredControlPoint.get(); + _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"))))); @@ -117,7 +128,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 ( + _control->parameter().to_string(), + *this, + *canvas_display, + _control->list())); + + line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get()); + line->queue_reset (); + add_line (line); + } /* make sure labels etc. are correct */ @@ -191,11 +226,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - delete *i; - } } void @@ -225,11 +255,14 @@ void AutomationTimeAxisView::set_automation_state (AutoState state) { if (!ignore_state_request) { - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - route->set_parameter_automation_state ( - i->second->controllable()->list()->param_id(), + if (_route == _automatable) { // FIXME: ew + _route->set_parameter_automation_state ( + _control->parameter(), state); } + + _control->list()->set_automation_state(state); + } } @@ -240,10 +273,10 @@ AutomationTimeAxisView::automation_state_changed () /* update button label */ - if (lines.empty()) { + if (!_line) { state = Off; } else { - state = lines.front().first->the_list()->automation_state (); + state = _control->list()->automation_state (); } switch (state & (Off|Play|Touch|Write)) { @@ -297,6 +330,33 @@ 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); + 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) +{ + _control->list()->set_interpolation(style); + if (_line) + _line->set_interpolation(style); +} + void AutomationTimeAxisView::height_clicked () { @@ -307,9 +367,8 @@ void AutomationTimeAxisView::clear_clicked () { _session.begin_reversible_command (_("clear automation")); - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->clear (); - } + if (_line) + _line->clear (); _session.commit_reversible_command (); } @@ -317,24 +376,27 @@ void AutomationTimeAxisView::set_height (TrackHeight ht) { 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) ); - - TimeAxisView* state_parent = get_parent_with_state (); - XMLNode* xml_node = state_parent->get_child_xml_node (_state_name); + bool changed = (height != (uint32_t) h) || first_call_to_set_height; + + if (first_call_to_set_height) + first_call_to_set_height = false; TimeAxisView::set_height (ht); - base_rect->property_y2() = h; - - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->set_y_position_and_height (0, h); + _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(); } - for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->set_height (); - } + 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: @@ -362,83 +424,80 @@ AutomationTimeAxisView::set_height (TrackHeight ht) break; } - //if (changed_between_small_and_normal || first_call_to_set_height) { - first_call_to_set_height = false; - unsigned control_cnt = 0; - switch (ht) { - case Largest: - case Large: - case Larger: - - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->second->show (); - controls_table.attach (*i->second.get(), 0, 8, 2 + control_cnt, 3 + control_cnt, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - ++control_cnt; - } + switch (ht) { + case Large: + case Larger: + case Largest: + _controller->show (); - case Normal: + case Normal: + if (ht == Normal) + _controller->hide(); - controls_table.remove (name_hbox); + 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); + if (plugname) { + if (plugname_packed) { + controls_table.remove (*plugname); + plugname_packed = false; } - hide_name_entry (); - show_name_label (); - name_hbox.show_all (); - - auto_button.show(); - height_button.show(); - clear_button.show(); - hide_button.show_all(); - break; + 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: + _controller->hide(); - case Smaller: - case Small: + case Small: - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } + 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(); - height_button.hide(); - clear_button.hide(); - hide_button.hide(); - break; - } - //} + } + 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; + } if (changed) { /* only emit the signal if the height really changed */ - route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (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 (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->reset (); - } + if (_line) + _line->reset (); + + if (_view) + _view->set_samples_per_unit (spu); } void @@ -477,6 +536,8 @@ 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(); @@ -498,22 +559,71 @@ AutomationTimeAxisView::build_display_menu () auto_touch_item = dynamic_cast(&as_items.back()); items.push_back (MenuElem (_("State"), *auto_state_menu)); + + /* mode menu */ + + if (_control->parameter().type() == MidiCCAutomation) { + 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); + + 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 (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - ret = cut_copy_clear_one (*i->first, 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_y (y); + + _session.begin_reversible_command (_("add automation event")); + XMLNode& before = _control->list()->get_state(); + + _control->list()->add (when, y); + + XMLNode& after = _control->list()->get_state(); + _session.commit_reversible_command (new MementoCommand(*_control->list().get(), &before, &after)); + + _session.set_dirty (); +} + + +bool +AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) +{ + return cut_copy_clear_one (*_line, selection, op); } bool @@ -563,9 +673,7 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel void AutomationTimeAxisView::reset_objects (PointSelection& selection) { - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - reset_objects_one (*i->first, selection); - } + reset_objects_one (*_line, selection); } void @@ -588,13 +696,7 @@ AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& bool AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op) { - bool ret = false; - - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - ret = cut_copy_clear_objects_one (*i->first, selection, op); - } - - return ret; + return cut_copy_clear_objects_one (*_line, selection, op); } bool @@ -653,13 +755,7 @@ 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 (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - ret = paste_one (*i->first, pos, times, selection, nth); - } - - return ret; + return paste_one (*_line, pos, times, selection, nth); } bool @@ -694,34 +790,10 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti 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; @@ -748,114 +820,115 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double botfrac = 1.0 - ((bot - y_position) / height); } - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->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 (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->get_inverted_selectables (sel, result); - } + if (_line) + _line->get_inverted_selectables (sel, result); } void AutomationTimeAxisView::set_selected_points (PointSelection& points) { - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->set_selected_points (points); - } + if (_line) + _line->set_selected_points (points); } void AutomationTimeAxisView::clear_lines () { - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) - delete i->first; - - 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->list()->automation_state_changed.connect + (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed)); - lines.push_back (std::make_pair(&line, - AutomationController::create(_session, line.the_list(), - route->control(line.the_list()->param_id())))); + _line = line; + //_controller = AutomationController::create(_session, line->the_list(), _control); - line.set_y_position_and_height (0, height); - - if (get) { - /* pick up the current state */ - automation_state_changed (); - } - - line.show(); -} + line->set_y_position_and_height (0, height); -void -AutomationTimeAxisView::show_all_control_points () -{ - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->show_all_control_points (); - } -} + /* pick up the current state */ + automation_state_changed (); -void -AutomationTimeAxisView::hide_all_but_selected_control_points () -{ - for (Lines::iterator i = lines.begin(); i != lines.end(); ++i) { - i->first->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 (); + if (_line) + _line->track_exited(); } -void +/*void AutomationTimeAxisView::set_colors () { for (list::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) { (*i)->set_colors(); } - for (Lines::iterator i=lines.begin(); i != lines.end(); i++ ) { - i->first->set_colors(); - } -} + if (_line) + _line->set_colors(); + }*/ void AutomationTimeAxisView::color_handler () { - set_colors (); + if (_line) { + _line->set_colors(); + } } void AutomationTimeAxisView::set_state (const XMLNode& node) { 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().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? */ + } + break; + } + } + } + + if (!_marked_for_display) + hide(); } XMLNode* @@ -864,8 +937,32 @@ 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(); + 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 (); +} +