mp4chaps Lua script: don't clutter global environment

[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..33160f8da3e185fb2c07167563d351b393434f2a 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;
@@ -123,6 +122,7 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanva
        , controller_menu (0)
        , poly_pressure_menu (0)
        , _step_editor (0)
+       , _patch_change_dialog (0)
 {
        _midnam_model_selector.disable_scrolling();
        _midnam_custom_device_mode_selector.disable_scrolling();
@@ -154,7 +154,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 +261,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);
@@ -346,6 +346,9 @@ MidiTimeAxisView::~MidiTimeAxisView ()
 
        delete controller_menu;
        delete _step_editor;
+
+       delete  _patch_change_dialog;
+       _patch_change_dialog = 0;
 }
 
 void
@@ -1079,19 +1082,14 @@ MidiTimeAxisView::build_color_mode_menu()
 }
 
 void
-MidiTimeAxisView::send_patch_change ()
+MidiTimeAxisView::immediate_patch_chnage_response (int response)
 {
-       if (!_route) {
-               return;
-       }
-
-       Evoral::PatchChange<Evoral::Beats> empty (Evoral::Beats(), 0, 0, 0);
-       PatchChangeDialog d (0, 0, empty, _route->instrument_info(), Gtk::Stock::OK);
-
-       if (d.run() == RESPONSE_CANCEL) {
+       if (response != RESPONSE_ACCEPT || !_route) {
+               delete  _patch_change_dialog;
+               _patch_change_dialog = 0;
                return;
        }
-       Evoral::PatchChange<Evoral::Beats> p (d.patch ());
+       Evoral::PatchChange<Evoral::Beats> p (_patch_change_dialog->patch ());
 
        uint8_t chn = p.channel();
 
@@ -1100,12 +1098,32 @@ MidiTimeAxisView::send_patch_change ()
        boost::shared_ptr<AutomationControl> program = _route->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true);
 
        if (!bank_msb || ! bank_lsb || !program) {
+               _patch_change_dialog->show ();
                return;
        }
 
        bank_msb->set_value (p.bank_msb (), Controllable::NoGroup);
        bank_lsb->set_value (p.bank_lsb (), Controllable::NoGroup);
        program->set_value  (p.program () , Controllable::NoGroup);
+       _patch_change_dialog->show ();
+}
+
+void
+MidiTimeAxisView::send_patch_change ()
+{
+       if (!_route) {
+               return;
+       }
+       if (_patch_change_dialog) {
+               _patch_change_dialog->present ();
+               return;
+       }
+
+       Evoral::PatchChange<Evoral::Beats> empty (Evoral::Beats(), 0, 0, 0);
+       PatchChangeDialog* d = new PatchChangeDialog (0, 0, empty, _route->instrument_info(), Gtk::Stock::APPLY, false, false);
+       d->signal_response().connect (sigc::mem_fun (*this, &MidiTimeAxisView::immediate_patch_chnage_response));
+       _patch_change_dialog = d;
+       _patch_change_dialog->present ();
 }
 
 void
@@ -1325,6 +1343,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: