add variant of Rect::expand() that allows different amounts in each direction

[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 9f68aa5e55e0cc5ff006324346150f2285da4641..c65b23428de3345d3a86b13275d5d5da509f6643 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -89,7 +89,7 @@
 
 #include "ardour/midi_track.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -119,6 +119,7 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanva
        , _channel_selector (0)
        , _step_edit_item (0)
        , controller_menu (0)
+       , poly_pressure_menu (0)
        , _step_editor (0)
 {
        _midnam_model_selector.disable_scrolling();
@@ -605,6 +606,13 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection)
                build_controller_menu ();
 
                automation_items.push_back (MenuElem (_("Controllers"), *controller_menu));
+
+               if (!poly_pressure_menu) {
+                       poly_pressure_menu = new Gtk::Menu;
+               }
+
+               automation_items.push_back (MenuElem  (_("Polyphonic Pressure"), *poly_pressure_menu));
+
                automation_items.back().set_sensitive (
                        !for_selection || _editor.get_selection().tracks.size() == 1);
        } else {
@@ -1508,7 +1516,7 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param)
 }
 
 boost::shared_ptr<MidiRegion>
-MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
+MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit, const int32_t sub_num)
 {
        Editor* real_editor = dynamic_cast<Editor*> (&_editor);
        if (commit) {
@@ -1526,8 +1534,9 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
        plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix(src->name()));
 
        boost::shared_ptr<Region> region = (RegionFactory::create (src, plist));
-
-       playlist()->add_region (region, pos);
+       /* sets beat position */
+       region->set_position (pos, sub_num);
+       playlist()->add_region (region, pos, 1.0, false, sub_num);
        _session->add_command (new StatefulDiffCommand (playlist()));
 
        if (commit) {
@@ -1604,6 +1613,10 @@ MidiTimeAxisView::contents_height_changed ()
 void
 MidiTimeAxisView::playback_channel_mode_changed ()
 {
+       /* Invalidate the controller automation menu */
+       delete controller_menu;
+       controller_menu = 0;
+       /* Update the button text */
        switch (midi_track()->get_playback_channel_mode()) {
        case AllChannels:
                _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), _("all")));
@@ -1634,12 +1647,12 @@ MidiTimeAxisView::capture_channel_mode_changed ()
 }
 
 bool
-MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx)
+MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
 {
        if (!_editor.internal_editing()) {
                // Non-internal paste, paste regions like any other route
-               return RouteTimeAxisView::paste(pos, selection, ctx);
+               return RouteTimeAxisView::paste(pos, selection, ctx, sub_num);
        }
 
-       return midi_view()->paste(pos, selection, ctx);
+       return midi_view()->paste(pos, selection, ctx, sub_num);
 }