summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_ops.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-12-22 13:39:41 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2014-12-22 13:39:46 -0500
commit64fa63212f7e79bab16147817211a33a3f7c8fba (patch)
tree54721a2dbd50611e7e5047e818ddfab2b67309dc /gtk2_ardour/editor_ops.cc
parent795c5c16f17867bb55b724abfe99bc9200184305 (diff)
move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
-rw-r--r--gtk2_ardour/editor_ops.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 692ef93c7f..d9575cb6f9 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1905,7 +1905,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
bool
Editor::choose_new_marker_name(string &name) {
- if (!Config->get_name_new_markers()) {
+ if (!ARDOUR_UI::config()->get_name_new_markers()) {
/* don't prompt user for a new name */
return true;
}
@@ -2348,7 +2348,7 @@ Editor::get_preroll ()
void
Editor::maybe_locate_with_edit_preroll ( framepos_t location )
{
- if ( _session->transport_rolling() || !Config->get_follow_edits() || _ignore_follow_edits )
+ if ( _session->transport_rolling() || !ARDOUR_UI::config()->get_follow_edits() || _ignore_follow_edits )
return;
location -= get_preroll();
@@ -5739,8 +5739,9 @@ Editor::set_playhead_cursor ()
}
}
- if ( Config->get_follow_edits() )
+ if (ARDOUR_UI::config()->get_follow_edits()) {
cancel_time_selection();
+ }
}
void