#include "canvas/debug.h"
-#include "ardour_ui.h"
#include "automation_time_axis.h"
#include "automation_streamview.h"
-#include "global_signals.h"
#include "gui_thread.h"
#include "route_time_axis.h"
#include "automation_line.h"
#include "paste_context.h"
#include "public_editor.h"
#include "selection.h"
+#include "tooltips.h"
#include "rgb_macros.h"
#include "point_selection.h"
#include "control_point.h"
#include "utils.h"
#include "item_counts.h"
+#include "ui_config.h"
#include "i18n.h"
, _automatable (a)
, _parameter (p)
, _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)
{
+ //concatenate plugin name and param name into the tooltip
+ string tipname = nomparent;
+ if (!tipname.empty()) {
+ tipname += ": ";
+ }
+ tipname += nom;
+ set_tooltip(controls_ebox, tipname);
+ //plugin name and param name appear on 2 separate lines in the track header
+ tipname = nomparent;
+ if (!tipname.empty()) {
+ tipname += "\n";
+ }
+ tipname += nom;
+ _name = tipname;
+
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()));
CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
_base_rect->set_x1 (ArdourCanvas::COORD_MAX);
_base_rect->set_outline (false);
- _base_rect->set_fill_color (ARDOUR_UI::config()->color_mod (fill_color_name, "automation track fill"));
+ _base_rect->set_fill_color (UIConfiguration::instance().color_mod (fill_color_name, "automation track fill"));
_base_rect->set_data ("trackview", 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.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::CloseCross));
+ hide_button.set_icon (ArdourIcon::CloseCross);
hide_button.set_tweaks(ArdourButton::TrackHeader);
auto_button.set_name ("route button");
controls_table.set_no_show_all();
- ARDOUR_UI::instance()->set_tip(auto_button, _("automation state"));
- ARDOUR_UI::instance()->set_tip(hide_button, _("hide track"));
+ set_tooltip(auto_button, _("automation state"));
+ set_tooltip(hide_button, _("hide track"));
const string str = gui_property ("height");
if (!str.empty()) {
}
//name label isn't editable on an automation track; remove the tooltip
- ARDOUR_UI::instance()->set_tip (name_label, X_(""));
+ set_tooltip (name_label, X_(""));
/* repack the name label */
name_label.set_name (X_("TrackParameterName"));
name_label.set_ellipsize (Pango::ELLIPSIZE_END);
- string tipname = nomparent;
- if (!tipname.empty()) {
- tipname += ": ";
- }
- tipname += _name;
- ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
-
/* add the buttons */
controls_table.set_border_width (1);
controls_table.remove (name_hbox);
)
);
- line->set_line_color (ARDOUR_UI::config()->color ("processor automation line"));
+ line->set_line_color (UIConfiguration::instance().color ("processor automation line"));
line->queue_reset ();
add_line (line);
}
/* make sure labels etc. are correct */
automation_state_changed ();
- ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler));
+ UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &AutomationTimeAxisView::color_handler));
_route->DropReferences.connect (
_route_connections, invalidator (*this), boost::bind (&AutomationTimeAxisView::route_going_away, this), gui_context ()
AutomationTimeAxisView::~AutomationTimeAxisView ()
{
+ cleanup_gui_properties ();
delete _view;
}
} else if (_view) {
_view->clear ();
}
-
+ set_automation_state ((AutoState) ARDOUR::Off);
_editor.commit_reversible_command ();
_session->set_dirty ();
}
void
-AutomationTimeAxisView::set_height (uint32_t h)
+AutomationTimeAxisView::set_height (uint32_t h, TrackHeightMode m)
{
bool const changed = (height != (uint32_t) h) || first_call_to_set_height;
uint32_t const normal = preset_height (HeightNormal);
bool const changed_between_small_and_normal = ( (height < normal && h >= normal) || (height >= normal || h < normal) );
- TimeAxisView::set_height (h);
+ TimeAxisView::set_height (h, m);
_base_rect->set_y1 (h);
if (_line) {
- _line->set_height(h);
+ _line->set_height(h - 2.5);
}
if (_view) {
first_call_to_set_height = false;
if (h >= preset_height (HeightNormal)) {
- auto_button.show();
+ if (!(_parameter.type() >= MidiCCAutomation &&
+ _parameter.type() <= MidiChannelPressureAutomation)) {
+ auto_button.show();
+ }
name_label.show();
hide_button.show();
(AutoState) Touch)));
auto_touch_item = dynamic_cast<Gtk::CheckMenuItem*>(&as_items.back());
- items.push_back (MenuElem (_("State"), *auto_state_menu));
+ if (!(_parameter.type() >= MidiCCAutomation &&
+ _parameter.type() <= MidiChannelPressureAutomation)) {
+ items.push_back (MenuElem (_("State"), *auto_state_menu));
+ }
/* mode menu */
mode_line_item = dynamic_cast<Gtk::CheckMenuItem*>(&am_items.back());
mode_line_item->set_active (s == AutomationList::Linear);
- items.push_back (MenuElem (_("Record Mode"), *auto_mode_menu));
+ items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
}
/* make sure the automation menu state is correct */
_editor.begin_reversible_command (_("add automation event"));
XMLNode& before = list->get_state();
- list->add (when, y, with_guard_points);
+ list->editor_add (when, y, with_guard_points);
XMLNode& after = list->get_state();
- _session->add_command (new MementoCommand<ARDOUR::AutomationList> (*list, &before, &after));
+ _session->add_command (new MementoCommand<ARDOUR::AutomationList> (*list.get (), &before, &after));
_editor.commit_reversible_command ();
_session->set_dirty ();
}
projects / ardour.git / blobdiff