X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=04ac1ee0763835d54c0c2415b29bb49073d7df8f;hb=fc7a2e9ee1616cdcb78d6b60804baff336ad07ee;hp=cdeed5cc4d5c7d46bd02007658c1445172b19588;hpb=b74c57290073e7e99f8c8908d6d935943ff3eaab;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index cdeed5cc4d..04ac1ee076 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -1,4 +1,24 @@ +/* + 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" @@ -20,6 +40,9 @@ using namespace PBD; using namespace Gtk; using namespace Editing; +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) @@ -33,6 +56,11 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrproperty_x1() = 0.0; base_rect->property_y1() = 0.0; - base_rect->property_x2() = 1000000.0; - base_rect->property_outline_color_rgba() = color_map[cAutomationTrackOutline]; + 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() = color_map[cAutomationTrackFill]; + 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->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_automation_track_event), base_rect, this)); - hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm"))))); + hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); height_button.set_name ("TrackSizeButton"); auto_button.set_name ("TrackVisualButton"); @@ -92,32 +111,28 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr 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); @@ -159,11 +174,15 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptrget_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 () @@ -195,7 +214,7 @@ AutomationTimeAxisView::auto_clicked () bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); } - automation_menu->popup (1, 0); + automation_menu->popup (1, gtk_get_current_event_time()); } @@ -294,7 +313,7 @@ AutomationTimeAxisView::set_height (TrackHeight 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) { @@ -402,8 +421,13 @@ 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 @@ -476,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; @@ -494,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; @@ -526,7 +550,7 @@ AutomationTimeAxisView::reset_objects_one (AutomationLine& line, PointSelection& { AutomationList& alist (line.the_list()); - _session.add_undo (alist.get_memento()); + _session.add_command (new MementoCommand(alist, &alist.get_state(), 0)); for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) { @@ -557,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) { @@ -569,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; @@ -581,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; @@ -589,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; @@ -602,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; @@ -614,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()); @@ -638,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; } @@ -670,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; @@ -680,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) { @@ -745,7 +771,7 @@ AutomationTimeAxisView::add_line (AutomationLine& line) } lines.push_back (&line); - line.set_height (height); + line.set_y_position_and_height (0, height); if (get) { /* pick up the current state */ @@ -781,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) {