ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Further fixes to non-cxx11 enabled builds

Browse Source 
Hopefully all that is necessary this time
This commit is contained in:
Tim Mayberry 2016-12-13 17:10:30 +10:00
parent fced0887aa
commit b34a614df4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View File

@ -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)));
}
}

2
gtk2_ardour/editor_drag.cc
View File

@ -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;
}
}

2
gtk2_ardour/editor_mouse.cc
View File

@ -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 ();
}