Remove old destructive API (non layered is a dynamic mode) 1/2

[ardour.git] / gtk2_ardour / midi_time_axis.cc

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 524cacc35d8ba7e81ce68d47282a0c92ebbf4dba..ffff6a96981a7b0e2aea69c6a7eaba673c1b0f43 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -25,6 +25,9 @@
 
 #include <sigc++/bind.h>
 
+#include <gtkmm/separator.h>
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/ffs.h"
 #include "pbd/stl_delete.h"
@@ -35,10 +38,10 @@
 #include "pbd/stateful_diff_command.h"
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/selector.h"
-#include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/utils.h"
 
+#include "widgets/tooltips.h"
+
 #include "ardour/event_type_map.h"
 #include "ardour/midi_patch_manager.h"
 #include "ardour/midi_playlist.h"
@@ -61,7 +64,6 @@
 #include "ardour/track.h"
 #include "ardour/types.h"
 
-#include "ardour_button.h"
 #include "automation_line.h"
 #include "automation_time_axis.h"
 #include "editor.h"
@@ -80,12 +82,10 @@
 #include "plugin_selector.h"
 #include "plugin_ui.h"
 #include "point_selection.h"
-#include "prompter.h"
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
 #include "step_editor.h"
-#include "tooltips.h"
 #include "utils.h"
 #include "note_base.h"
 
@@ -94,7 +94,6 @@
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -154,7 +153,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        */
        RouteTimeAxisView::set_route (rt);
 
-       _view->apply_color (gdk_color_to_rgba (color()), StreamView::RegionColor);
+       _view->apply_color (ARDOUR_UI_UTILS::gdk_color_to_rgba (color()), StreamView::RegionColor);
 
        subplugin_menu.set_name ("ArdourContextMenu");
 
@@ -261,8 +260,8 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                }
        }
 
-       set_tooltip (_midnam_model_selector, _("External MIDI Device"));
-       set_tooltip (_midnam_custom_device_mode_selector, _("External Device Mode"));
+       ArdourWidgets::set_tooltip (_midnam_model_selector, _("External MIDI Device"));
+       ArdourWidgets::set_tooltip (_midnam_custom_device_mode_selector, _("External Device Mode"));
 
        _midi_controls_box.pack_start (_midnam_model_selector, false, false, 2);
        _midi_controls_box.pack_start (_midnam_custom_device_mode_selector, false, false, 2);
@@ -1325,6 +1324,10 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
                }
 
                add_automation_child (param, track, show);
+               if (selected ()) {
+                       reshow_selection (_editor.get_selection().time);
+               }
+
                break;
 
        case PanWidthAutomation: