Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / route_time_axis.cc

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 0e71f858a4bc84dfada011146fc1563edf37e4e2..0669c0471c53d6a7dc6803b94d3d472b7666d010 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -323,8 +323,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
 RouteTimeAxisView::~RouteTimeAxisView ()
 {
-       CatchDeletion (this);
-
        for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                delete *i;
        }
@@ -917,8 +915,8 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer
 
        if (timestretch_rect == 0) {
                timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ());
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill());
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline());
+               timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("time stretch fill"));
+               timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("time stretch outline"));
        }
 
        timestretch_rect->show ();
@@ -1815,11 +1813,11 @@ RouteTimeAxisView::color_handler ()
 {
        //case cTimeStretchOutline:
        if (timestretch_rect) {
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_TimeStretchOutline());
+               timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("time stretch outline"));
        }
        //case cTimeStretchFill:
        if (timestretch_rect) {
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_TimeStretchFill());
+               timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("time stretch fill"));
        }
 
        reset_meter();