Merge branch 'master' into cairocanvas

diff --cc gtk2_ardour/ardev_common.sh.in
Simple merge

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/editor.cc
Simple merge

diff --cc gtk2_ardour/editor_canvas_events.cc
index 4acd04a318e86f4422d45f5483114b615d6d5855,79cc1e066fcacbc0b8f5c87a5a6ca6d71e6ca89a..5bd0060d231d8eda915d4ec02464a1319bc2d0d9
--- 1/gtk2_ardour/editor_canvas_events.cc
--- 2/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@@ -79,13 -73,13 +79,13 @@@ Editor::track_canvas_scroll (GdkEventSc
                        temporal_zoom_step (false);
                        zoom_focus = temp_focus;
                        return true;
-               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
                        direction = GDK_SCROLL_LEFT;
                        goto retry;
-               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) {
                        if (!current_stepping_trackview) {
                                step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500);
 -                              std::pair<TimeAxisView*, int> const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize);
 +                              std::pair<TimeAxisView*, int> const p = trackview_by_y_position (event_coords.y);
                                current_stepping_trackview = p.first;
                                if (!current_stepping_trackview) {
                                        return false;
@@@ -108,13 -102,13 +108,13 @@@
                        temporal_zoom_step (true);
                        zoom_focus = temp_focus;
                        return true;
-               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
                        direction = GDK_SCROLL_RIGHT;
                        goto retry;
-               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) {
                        if (!current_stepping_trackview) {
                                step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500);
 -                              std::pair<TimeAxisView*, int> const p = trackview_by_y_position (ev->y + vertical_adjustment.get_value() - canvas_timebars_vsize);
 +                              std::pair<TimeAxisView*, int> const p = trackview_by_y_position (event_coords.y);
                                current_stepping_trackview = p.first;
                                if (!current_stepping_trackview) {
                                        return false;

diff --cc gtk2_ardour/editor_summary.cc
Simple merge

diff --cc gtk2_ardour/editor_videotimeline.cc
index fcb1d31ba07df482bfe5a66d70e4e9c2c9c91f53,7395d767c77083c7697d177e0792b8a561d956b4..f392b238373b88b169812323dd77fcb748c87494
--- 1/gtk2_ardour/editor_videotimeline.cc
--- 2/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@@ -116,8 -130,20 +117,15 @@@ Editor::export_video (
                if (infobox.show_again()) {
                        ARDOUR::Config->set_show_video_export_info(false);
                }
+               switch (rv) {
+                       case GTK_RESPONSE_YES:
+                               PBD::open_uri (ARDOUR::Config->get_reference_manual_url() + "/video-timeline/operations/#export");
+                               break;
+                       default:
+                               break;
+               }
        }
        ExportVideoDialog dialog (*this, _session);
 -      Gtk::ResponseType r = (Gtk::ResponseType) dialog.run();
 +      dialog.run();
        dialog.hide();
 -#if 0
 -      if (r == Gtk::RESPONSE_ACCEPT) {
 -              ARDOUR_UI::instance()->popup_error(string_compose(_("Export Successful: %1"),dialog.get_exported_filename()));
 -      }
 -#endif
  }

diff --cc gtk2_ardour/gain_meter.cc
Simple merge

diff --cc gtk2_ardour/time_axis_view.cc
Simple merge

diff --cc wscript
Simple merge