Further fixes to non-cxx11 enabled builds

Hopefully all that is necessary this time

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 07969f4c078405c995bde5ea294b228c48596031..4c626f52b98cff1f610f14500c561ff544e8ae54 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1947,7 +1947,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
        edit_items.push_back (MenuElem (_("Loop Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), true)));
 
        edit_items.push_back (SeparatorElem());
-       edit_items.push_back (MenuElem (_("Zoom to Range"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), ZoomAxis::Horizontal)));
+       edit_items.push_back (MenuElem (_("Zoom to Range"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal)));
 
        edit_items.push_back (SeparatorElem());
        edit_items.push_back (MenuElem (_("Loudness Analysis"), sigc::mem_fun(*this, &Editor::loudness_analyze_range_selection)));
@@ -3794,7 +3794,7 @@ Editor::build_track_count_menu ()
                zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 8 hours"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 8 * 60 * 60 * 1000)));
                zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 24 hours"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 24 * 60 * 60 * 1000)));
                zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session)));
-               zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Range/Region Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), ZoomAxis::Horizontal)));
+               zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Range/Region Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal)));
        }
 }
 

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index cad6e782a0c87b2c68dc0a6775e264cd2bf1d0f7..d29b9b78c45e7ec849f1e00a1fe5779d72971694 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -5314,7 +5314,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
 
                if (was_double_click()) {
                        if (UIConfiguration::instance().get_use_double_click_to_zoom_to_selection()) {
-                               _editor->temporal_zoom_selection (ZoomAxis::Both);
+                               _editor->temporal_zoom_selection (Both);
                                return;
                        }
                }

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index dabdb1e90d4f0e4d93862cf00c2b920bdb4c997e..578595ff2a5fc496f06664141e77edda499fe811 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2146,7 +2146,7 @@ void
 Editor::edit_region (RegionView* rv)
 {
        if (UIConfiguration::instance().get_use_double_click_to_zoom_to_selection()) {
-               temporal_zoom_selection (ZoomAxis::Both);
+               temporal_zoom_selection (Both);
        } else {
                rv->show_region_editor ();
        }