remove unused function

[ardour.git] / gtk2_ardour / automation_time_axis.cc

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 6d3a506cfa9b73561c5ad8bab9f7023468adf547..c9deae95dfa529485cf39b08e7e432600ca23884 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -36,21 +36,21 @@
 
 #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"
 
@@ -101,7 +101,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                tipname += ": ";
        }
        tipname += nom;
-       ARDOUR_UI::instance()->set_tip(controls_ebox, tipname);
+       set_tooltip(controls_ebox, tipname);
 
        //plugin name and param name appear on 2 separate lines in the track header
        tipname = nomparent;
@@ -142,7 +142,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        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) {
@@ -160,8 +160,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 
        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()) {
@@ -171,7 +171,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        }
 
        //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 */
 
@@ -268,7 +268,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                                )
                        );
 
-               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);
        }
@@ -276,7 +276,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        /* 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 ()
@@ -644,10 +644,10 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when,
        _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 ();
 }