X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=04ac1ee0763835d54c0c2415b29bb49073d7df8f;hb=fc7a2e9ee1616cdcb78d6b60804baff336ad07ee;hp=d1b649e1a99b29de5e7647fba184ca54975b110d;hpb=e493b2b7c4fbbbfc457f02babf9546289b430177;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index d1b649e1a9..04ac1ee076 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -1,43 +1,54 @@ +/* + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + #include +#include #include "ardour_ui.h" #include "automation_time_axis.h" #include "automation_line.h" #include "public_editor.h" -#include "canvas-simplerect.h" -#include "canvas-waveview.h" +#include "simplerect.h" #include "selection.h" #include "ghostregion.h" #include "rgb_macros.h" #include "automation_selectable.h" #include "point_selection.h" +#include "canvas_impl.h" +#include "utils.h" #include "i18n.h" using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace Editing; -static const gchar * small_x_xpm[] = { -"11 11 2 1", -" c None", -". c #000000", -" ", -" ", -" . . ", -" . . ", -" . . ", -" . ", -" . . ", -" . . ", -" . . ", -" ", -" "}; - -AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& rent, Widget* p, std::string nom, std::string state_name, std::string nomparent) +Pango::FontDescription AutomationTimeAxisView::name_font; +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) : AxisView (s), - TimeAxisView (s, e, &rent, p), + TimeAxisView (s, e, &rent, canvas), route (r), _name (nom), _state_name (state_name), @@ -45,6 +56,11 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit clear_button (_("clear")), auto_button (X_("")) /* force addition of a label */ { + if (!have_name_font) { + name_font = get_font_for_style (X_("AutomationTrackName")); + have_name_font = true; + } + automation_menu = 0; in_destructor = false; auto_off_item = 0; @@ -52,31 +68,32 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit auto_write_item = 0; auto_play_item = 0; 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() = editor.frame_to_pixel (max_frames); + base_rect->property_outline_color_rgba() = Config->canvasvar_AutomationTrackOutline.get(); + /* outline ends and bottom */ + base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); + base_rect->property_fill_color_rgba() = Config->canvasvar_AutomationTrackFill.get(); + //base_rect->property_fill_color_rgba() = Config->canvasvar_EnteredControlPoint.get(); + + base_rect->set_data ("trackview", this); - base_rect = gtk_canvas_item_new (GTK_CANVAS_GROUP(canvas_display), - gtk_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 1000000.0, - "outline_color_rgba", color_map[cAutomationTrackOutline], - /* outline ends and bottom */ - "outline_what", (guint32) (0x1|0x2|0x8), - "fill_color_rgba", color_map[cAutomationTrackFill], - NULL); - - gtk_object_set_data (GTK_OBJECT(base_rect), "trackview", this); - - gtk_signal_connect (GTK_OBJECT(base_rect), "event", - (GtkSignalFunc) PublicEditor::canvas_automation_track_event, - this); + base_rect->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event), + base_rect, this)); - hide_button.add (*(manage (new Pixmap (small_x_xpm)))); + 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"); + 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")); @@ -88,43 +105,40 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit life easier and remove them. */ - name_hbox.remove (name_entry); + hide_name_entry(); /* move the name label over a bit */ string shortpname = _name; bool shortened = false; - - if (_name.length()) { - if (shortpname.length() > 18) { - shortpname = shortpname.substr (0, 16); - shortpname += "..."; - shortened = true; - } + + int ignore_width; + shortpname = fit_to_pixels (_name, 60, name_font, ignore_width, true); + + if (shortpname != _name ){ + shortened = true; } + name_label.set_text (shortpname); - name_label.set_alignment (1.0, 0.5); + name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); if (nomparent.length()) { /* limit the plug name string */ - string pname = nomparent; - - if (pname.length() > 14) { - pname = pname.substr (0, 11); - pname += "..."; + string pname = fit_to_pixels (nomparent, 60, name_font, ignore_width, true); + if (pname != nomparent) { shortened = true; } plugname = new Label (pname); plugname->set_name (X_("TrackPlugName")); - plugname->set_alignment (1.0, 0.5); + plugname->show(); name_label.set_name (X_("TrackParameterName")); controls_table.remove (name_hbox); - controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + 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, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); } else { plugname = 0; plugname_packed = false; @@ -143,28 +157,32 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit 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, 7, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (clear_button, 7, 9, 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); + controls_table.show_all (); - height_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::height_clicked)); - clear_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::clear_clicked)); - hide_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::hide_clicked)); - auto_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::auto_clicked)); + 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)); 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); + controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT); XMLNode* xml_node = get_parent_with_state()->get_child_xml_node (_state_name); - set_state (*xml_node); + + if (xml_node) { + set_state (*xml_node); + } /* make sure labels etc. are correct */ automation_state_changed (); + ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler)); } AutomationTimeAxisView::~AutomationTimeAxisView () @@ -186,17 +204,17 @@ AutomationTimeAxisView::auto_clicked () automation_menu->set_name ("ArdourContextMenu"); MenuList& items (automation_menu->items()); - items.push_back (MenuElem (_("off"), - bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off))); - items.push_back (MenuElem (_("play"), - bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); - items.push_back (MenuElem (_("write"), - bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); - items.push_back (MenuElem (_("touch"), - bind (slot (*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, 0); + automation_menu->popup (1, gtk_get_current_event_time()); } @@ -215,7 +233,7 @@ AutomationTimeAxisView::automation_state_changed () switch (state & (Off|Play|Touch|Write)) { case Off: - static_cast(auto_button.get_child())->set_text (_("off")); + auto_button.set_label (_("Manual")); if (auto_off_item) { ignore_state_request = true; auto_off_item->set_active (true); @@ -226,7 +244,7 @@ AutomationTimeAxisView::automation_state_changed () } break; case Play: - static_cast(auto_button.get_child())->set_text (_("play")); + auto_button.set_label (_("Play")); if (auto_play_item) { ignore_state_request = true; auto_play_item->set_active (true); @@ -237,7 +255,7 @@ AutomationTimeAxisView::automation_state_changed () } break; case Write: - static_cast(auto_button.get_child())->set_text (_("write")); + auto_button.set_label (_("Write")); if (auto_write_item) { ignore_state_request = true; auto_write_item->set_active (true); @@ -248,7 +266,7 @@ AutomationTimeAxisView::automation_state_changed () } break; case Touch: - static_cast(auto_button.get_child())->set_text (_("touch")); + auto_button.set_label (_("Touch")); if (auto_touch_item) { ignore_state_request = true; auto_touch_item->set_active (true); @@ -259,7 +277,7 @@ AutomationTimeAxisView::automation_state_changed () } break; default: - static_cast(auto_button.get_child())->set_text (_("???")); + auto_button.set_label (_("???")); break; } } @@ -281,131 +299,112 @@ AutomationTimeAxisView::clear_clicked () } void -AutomationTimeAxisView::set_height (TrackHeight h) +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); - controls_table.show_all (); - - TimeAxisView::set_height (h); - gtk_object_set (GTK_OBJECT(base_rect), "y2", (double) h, NULL); + TimeAxisView::set_height (ht); + base_rect->property_y2() = h; for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { - (*i)->set_height (h); + (*i)->set_y_position_and_height (0, h); } for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->set_height (); } - switch (height) { + + switch (ht) { case Largest: xml_node->add_property ("track_height", "largest"); - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - plugname_packed = true; - controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } else { - controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } - controls_table.show_all (); - name_label.show (); break; case Large: xml_node->add_property ("track_height", "large"); - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - plugname_packed = true; - } else { - controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } - controls_table.show_all (); - name_label.show (); break; case Larger: xml_node->add_property ("track_height", "larger"); - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - plugname_packed = true; - } else { - controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } - controls_table.show_all (); - name_label.show (); break; case Normal: xml_node->add_property ("track_height", "normal"); - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - plugname_packed = true; - controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } else { - controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } - controls_table.show_all (); - name_label.show (); break; case Smaller: xml_node->add_property ("track_height", "smaller"); - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - } - controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.hide_all (); - name_hbox.show_all (); - controls_table.show (); break; case Small: xml_node->add_property ("track_height", "small"); - controls_table.remove (name_hbox); - if (plugname) { - if (plugname_packed) { - controls_table.remove (*plugname); - plugname_packed = false; - } - } - controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.hide_all (); - name_hbox.show_all (); - controls_table.show (); break; } + 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; + } + } + 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 */ } } @@ -422,11 +421,15 @@ AutomationTimeAxisView::set_samples_per_unit (double 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); } - void AutomationTimeAxisView::build_display_menu () { @@ -446,30 +449,30 @@ AutomationTimeAxisView::build_display_menu () items.push_back (MenuElem (_("Height"), *size_menu)); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide"), slot (*this, &AutomationTimeAxisView::hide_clicked))); + items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Clear"), slot (*this, &AutomationTimeAxisView::clear_clicked))); + items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked))); items.push_back (SeparatorElem()); 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 (_("off"), - bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off))); - auto_off_item = dynamic_cast(as_items.back()); + 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 (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); - auto_play_item = dynamic_cast(as_items.back()); + 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 (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); - auto_write_item = dynamic_cast(as_items.back()); + 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 (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); - auto_touch_item = dynamic_cast(as_items.back()); + 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)); @@ -497,13 +500,13 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel AutomationList& alist (line.the_list()); bool ret = false; - _session.add_undo (alist.get_memento()); + 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_redo_no_execute (alist.get_memento()); + _session.add_command(new MementoCommand(alist, &before, &alist.get_state())); ret = true; } break; @@ -515,7 +518,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_redo_no_execute (alist.get_memento()); + _session.add_command(new MementoCommand(alist, &before, &alist.get_state())); delete what_we_got; what_we_got = 0; ret = true; @@ -534,6 +537,31 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel return ret; } +void +AutomationTimeAxisView::reset_objects (PointSelection& selection) +{ + for (vector::iterator i = lines.begin(); i != lines.end(); ++i) { + reset_objects_one ((**i), selection); + } +} + +void +AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& selection) +{ + AutomationList& alist (line.the_list()); + + _session.add_command (new MementoCommand(alist, &alist.get_state(), 0)); + + for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { + + if (&(*i).track != this) { + continue; + } + + alist.reset_range ((*i).start, (*i).end); + } +} + bool AutomationTimeAxisView::cut_copy_clear_objects (PointSelection& selection, CutCopyOp op) { @@ -553,7 +581,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS AutomationList& alist (line.the_list()); bool ret = false; - _session.add_undo (alist.get_memento()); + XMLNode &before = alist.get_state(); for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { @@ -565,7 +593,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_redo_no_execute (alist.get_memento()); + _session.add_command (new MementoCommand(alist, new XMLNode (before), &alist.get_state())); ret = true; } break; @@ -577,7 +605,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS case Clear: if ((what_we_got = alist.cut ((*i).start, (*i).end)) != 0) { - _session.add_redo_no_execute (alist.get_memento()); + _session.add_command (new MementoCommand(alist, new XMLNode (before), &alist.get_state())); delete what_we_got; what_we_got = 0; ret = true; @@ -585,7 +613,9 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS break; } } - + + delete &before; + if (what_we_got) { for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) { double foo = (*x)->value; @@ -598,7 +628,7 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS } bool -AutomationTimeAxisView::paste (jack_nframes_t pos, float times, Selection& selection, size_t nth) +AutomationTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth) { bool ret = true; @@ -610,7 +640,7 @@ AutomationTimeAxisView::paste (jack_nframes_t pos, float times, Selection& selec } bool -AutomationTimeAxisView::paste_one (AutomationLine& line, jack_nframes_t pos, float times, Selection& selection, size_t nth) +AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float times, Selection& selection, size_t nth) { AutomationSelection::iterator p; AutomationList& alist (line.the_list()); @@ -634,9 +664,9 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, jack_nframes_t pos, flo (*x)->value = foo; } - _session.add_undo (alist.get_memento()); + XMLNode &before = alist.get_state(); alist.paste (copy, pos, times); - _session.add_redo_no_execute (alist.get_memento()); + _session.add_command (new MementoCommand(alist, &before, &alist.get_state())); return true; } @@ -645,7 +675,7 @@ void AutomationTimeAxisView::add_ghost (GhostRegion* gr) { ghosts.push_back (gr); - gr->GoingAway.connect (slot (*this, &AutomationTimeAxisView::remove_ghost)); + gr->GoingAway.connect (mem_fun(*this, &AutomationTimeAxisView::remove_ghost)); } void @@ -666,7 +696,7 @@ AutomationTimeAxisView::remove_ghost (GhostRegion* gr) } void -AutomationTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list& results) +AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list& results) { if (!lines.empty() && touched (top, bot)) { double topfrac; @@ -676,7 +706,7 @@ AutomationTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t en y_position is the "origin" or "top" of the track. */ - double mybot = y_position + height; // XXX need to include Editor::track_spacing; + double mybot = y_position + height; if (y_position >= top && mybot <= bot) { @@ -736,12 +766,12 @@ AutomationTimeAxisView::add_line (AutomationLine& line) if (lines.empty()) { /* first line is the Model for automation state */ automation_connection = line.the_list().automation_state_changed.connect - (slot (*this, &AutomationTimeAxisView::automation_state_changed)); + (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed)); get = true; } lines.push_back (&line); - line.set_height (height); + line.set_y_position_and_height (0, height); if (get) { /* pick up the current state */ @@ -777,6 +807,37 @@ 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(); + } + +} + +void +AutomationTimeAxisView::color_handler () +{ + + //case cGhostTrackWave: + //case cGhostTrackWaveClip: + //case cGhostTrackZeroLine: + + //case cControlPoint: + //case cControlPointFill: + //case cControlPointOutline: + //case cAutomationLine: + set_colors (); + +} + + + void AutomationTimeAxisView::set_state (const XMLNode& node) {