X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fautomation_time_axis.cc;h=f474acd007b6ea335aef342c0b53ae87c1ea5e89;hb=9c59b21bb67906e4619b27ee3a87e9b27f8ec55c;hp=1621697335431eba00e7ff43569ab00d5b86c8ec;hpb=8c5cff60912c7e0a7256f635641399500d8d00d9;p=ardour.git diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 1621697335..f474acd007 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -31,6 +31,8 @@ #include "ardour/route.h" #include "ardour/session.h" +#include "canvas/debug.h" + #include "ardour_ui.h" #include "automation_time_axis.h" #include "automation_streamview.h" @@ -39,11 +41,9 @@ #include "route_time_axis.h" #include "automation_line.h" #include "public_editor.h" -#include "simplerect.h" #include "selection.h" #include "rgb_macros.h" #include "point_selection.h" -#include "canvas_impl.h" #include "control_point.h" #include "utils.h" @@ -51,6 +51,7 @@ using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; @@ -84,12 +85,17 @@ AutomationTimeAxisView::AutomationTimeAxisView ( , _control (c) , _automatable (a) , _parameter (p) - , _base_rect (0) - , _view (show_regions ? new AutomationStreamView (*this) : 0) + , _base_rect (new ArdourCanvas::Rectangle (_canvas_display)) , _name (nom) + , _view (show_regions ? new AutomationStreamView (*this) : 0) , auto_button (X_("")) /* force addition of a label */ , _show_regions (show_regions) { + + CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for auto %2/%1", _name, r->name())); + CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for auto %2/%1", _name, r->name())); + CANVAS_DEBUG_NAME (_ghost_group, string_compose ("ghosts for auto %2/%1", _name, r->name())); + if (!have_name_font) { name_font = get_font_for_style (X_("AutomationTrackName")); have_name_font = true; @@ -110,33 +116,21 @@ AutomationTimeAxisView::AutomationTimeAxisView ( 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; - /** gnomecanvas sometimes converts this value to int or adds 2 to it, so it must be - set correctly to avoid overflow. - */ - _base_rect->property_x2() = INT_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() = ARDOUR_UI::config()->canvasvar_AutomationTrackFill.get(); - + CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name)); + _base_rect->set_x1 (ArdourCanvas::COORD_MAX); + _base_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_AutomationTrackOutline()); + _base_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); + _base_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AutomationTrackFill()); _base_rect->set_data ("trackview", this); - - _base_rect->signal_event().connect (sigc::bind ( - sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), - _base_rect, this)); - + _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this)); if (!a) { _base_rect->lower_to_bottom(); } - hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); + hide_button.set_image ( ::get_icon(X_("hide"))); - auto_button.set_name ("TrackVisualButton"); - hide_button.set_name ("TrackRemoveButton"); + auto_button.set_name ("mixer strip button"); + hide_button.set_name ("mixer strip button"); auto_button.unset_flags (Gtk::CAN_FOCUS); hide_button.unset_flags (Gtk::CAN_FOCUS); @@ -153,6 +147,9 @@ AutomationTimeAxisView::AutomationTimeAxisView ( set_height (preset_height (HeightNormal)); } + //name label isn't editable on an automation track; remove the tooltip + ARDOUR_UI::instance()->set_tip (name_label, X_("")); + /* repack the name label */ if (name_label.get_parent()) { @@ -160,8 +157,8 @@ AutomationTimeAxisView::AutomationTimeAxisView ( } name_label.set_text (_name); - name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); - name_label.set_name (X_("TrackParameterName")); + name_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER); + name_label.set_name (X_("TrackParameterName")); name_label.set_ellipsize (Pango::ELLIPSIZE_END); string tipname = nomparent; @@ -172,28 +169,31 @@ AutomationTimeAxisView::AutomationTimeAxisView ( ARDOUR_UI::instance()->set_tip(controls_ebox, tipname); /* add the buttons */ - controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (name_label, 0, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (auto_button, 6, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + controls_table.remove (name_hbox); + controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK); + controls_table.attach (name_label, 1, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0); + controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK); + controls_table.set_border_width (0); name_label.show (); + hide_button.show (); if (_controller) { _controller.get()->set_size_request(-1, 24); /* add bar controller */ - controls_table.attach (*_controller.get(), 1, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + controls_table.attach (*_controller.get(), 1, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); /* note that this handler connects *before* the default handler */ _controller->event_widget().signal_scroll_event().connect (mem_fun (*this, &AutomationTimeAxisView::controls_ebox_scroll), false); } controls_table.show_all (); - hide_button.signal_clicked().connect (sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked)); - auto_button.signal_clicked().connect (sigc::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"); - controls_ebox.set_name (controls_base_unselected_name); + time_axis_frame.set_name (controls_base_unselected_name); /* ask for notifications of any new RegionViews */ if (show_regions) { @@ -216,7 +216,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( ) ); - line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get()); + line->set_line_color (ARDOUR_UI::config()->get_canvasvar_ProcessorAutomationLine()); line->queue_reset (); add_line (line); } @@ -304,7 +304,7 @@ AutomationTimeAxisView::automation_state_changed () switch (state & (ARDOUR::Off|Play|Touch|Write)) { case ARDOUR::Off: - auto_button.set_label (S_("Automation|Manual")); + auto_button.set_text (S_("Automation|Manual")); if (auto_off_item) { ignore_state_request = true; auto_off_item->set_active (true); @@ -315,7 +315,7 @@ AutomationTimeAxisView::automation_state_changed () } break; case Play: - auto_button.set_label (_("Play")); + auto_button.set_text (_("Play")); if (auto_play_item) { ignore_state_request = true; auto_play_item->set_active (true); @@ -326,7 +326,7 @@ AutomationTimeAxisView::automation_state_changed () } break; case Write: - auto_button.set_label (_("Write")); + auto_button.set_text (_("Write")); if (auto_write_item) { ignore_state_request = true; auto_write_item->set_active (true); @@ -337,7 +337,7 @@ AutomationTimeAxisView::automation_state_changed () } break; case Touch: - auto_button.set_label (_("Touch")); + auto_button.set_text (_("Touch")); if (auto_touch_item) { ignore_state_request = true; auto_touch_item->set_active (true); @@ -348,7 +348,7 @@ AutomationTimeAxisView::automation_state_changed () } break; default: - auto_button.set_label (_("???")); + auto_button.set_text (_("???")); break; } } @@ -410,7 +410,7 @@ AutomationTimeAxisView::set_height (uint32_t h) TimeAxisView::set_height (h); - _base_rect->property_y2() = h; + _base_rect->set_y1 (h); if (_line) { _line->set_height(h); @@ -427,16 +427,18 @@ AutomationTimeAxisView::set_height (uint32_t h) if (h >= preset_height (HeightNormal)) { auto_button.show(); - hide_button.show_all(); + name_label.show(); + hide_button.show(); } else if (h >= preset_height (HeightSmall)) { controls_table.hide_all (); auto_button.hide(); + name_label.hide(); } } if (changed) { - if (canvas_item_visible (_canvas_display) && _route) { + if (_canvas_display->visible() && _route) { /* only emit the signal if the height really changed and we were visible */ _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ } @@ -444,16 +446,16 @@ AutomationTimeAxisView::set_height (uint32_t h) } void -AutomationTimeAxisView::set_samples_per_unit (double spu) +AutomationTimeAxisView::set_samples_per_pixel (double fpp) { - TimeAxisView::set_samples_per_unit (spu); + TimeAxisView::set_samples_per_pixel (fpp); if (_line) { _line->reset (); } if (_view) { - _view->set_samples_per_unit (spu); + _view->set_samples_per_pixel (fpp); } } @@ -550,7 +552,7 @@ AutomationTimeAxisView::build_display_menu () } void -AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y) +AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y, bool with_guard_points) { if (!_line) { return; @@ -567,7 +569,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double x = 0; - _canvas_display->w2i (x, y); + _canvas_display->canvas_to_item (x, y); /* compute vertical fractional position */ @@ -583,7 +585,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, _session->begin_reversible_command (_("add automation event")); XMLNode& before = list->get_state(); - list->add (when, y); + list->add (when, y, with_guard_points); XMLNode& after = list->get_state(); _session->commit_reversible_command (new MementoCommand (*list, &before, &after));