#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"
* 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<Route> r,
+AutomationTimeAxisView::AutomationTimeAxisView (Session* s, boost::shared_ptr<Route> r,
boost::shared_ptr<Automatable> a, boost::shared_ptr<AutomationControl> c,
PublicEditor& e, TimeAxisView& parent, bool show_regions,
ArdourCanvas::Canvas& canvas, const string & nom, const string & nomparent)
_base_rect->set_data ("trackview", this);
- _base_rect->signal_event().connect (bind (
- mem_fun (_editor, &PublicEditor::canvas_automation_track_event),
+ _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")))));
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 */
shortened = true;
}
- plugname = new Label (pname);
+ plugname = new Label (pname);
plugname->set_name (X_("TrackPlugName"));
plugname->show();
name_label.set_name (X_("TrackParameterName"));
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.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");
_control->parameter());
if (xml_node) {
- set_state (*xml_node);
+ set_state (*xml_node, Stateful::loading_state_version);
}
/* ask for notifications of any new RegionViews */
/* 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 ()
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)));
}
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);
void
AutomationTimeAxisView::clear_clicked ()
{
- _session.begin_reversible_command (_("clear automation"));
+ _session->begin_reversible_command (_("clear automation"));
if (_line) {
_line->clear ();
}
- _session.commit_reversible_command ();
+ _session->commit_reversible_command ();
}
void
}
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 */
+ }
}
}
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 */
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<CheckMenuItem*>(&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<CheckMenuItem*>(&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<CheckMenuItem*>(&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<CheckMenuItem*>(&as_items.back());
/* 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");
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<CheckMenuItem*>(&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<CheckMenuItem*>(&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<CheckMenuItem*>(&am_items.back());
mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear);
}
_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<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
+ _session
->commit_reversible_command (new MementoCommand<ARDOUR::AutomationList>(*_control->alist(), &before, &after));
- _session.set_dirty ();
+ _session->set_dirty ();
}
-
bool
AutomationTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp 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<AutomationList>(*alist.get(), &before, &alist->get_state()));
+ _session
->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
ret = true;
}
break;
case Clear:
if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
- _session
.add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+ _session
->add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
ret = true;
}
break;
{
boost::shared_ptr<AutomationList> alist(line.the_list());
- _session
.add_command (new MementoCommand<AutomationList>(*alist.get(), &alist->get_state(), 0));
+ _session
->add_command (new MementoCommand<AutomationList>(*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;
}
for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
- if (&(*i).track != this) {
+ if ((*i).track != this) {
continue;
}
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<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
+ _session
->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
ret = true;
}
break;
case Clear:
if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
- _session
.add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
+ _session
->add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
ret = true;
}
break;
XMLNode &before = alist->get_state();
alist->paste (copy, pos, times);
- _session
.add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
+ _session
->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
return true;
}
void
AutomationTimeAxisView::set_selected_points (PointSelection& points)
{
- if (_line)
+ if (_line) {
_line->set_selected_points (points);
+ }
}
void
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);
}
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())) {
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;
+}
projects / ardour.git / blobdiff