projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into cairocanvas
[ardour.git]
/
gtk2_ardour
/
editor_ops.cc
diff --git
a/gtk2_ardour/editor_ops.cc
b/gtk2_ardour/editor_ops.cc
index 9eb0a4c2bd0eda175a0b9fe386a3eacf31102046..c4f084170abd1f757dbbba3650fb18a82ebfaa23 100644
(file)
--- a/
gtk2_ardour/editor_ops.cc
+++ b/
gtk2_ardour/editor_ops.cc
@@
-5052,7
+5052,6
@@
Editor::toggle_region_lock ()
_session->commit_reversible_command ();
}
-#ifdef WITH_VIDEOTIMELINE
void
Editor::toggle_region_video_lock ()
{
@@
-5076,8
+5075,6
@@
Editor::toggle_region_video_lock ()
_session->commit_reversible_command ();
}
-#endif
-
void
Editor::toggle_region_lock_style ()