diff options
author | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
commit | 6ae4f104371ed433a79c8845de97428d964edd8b (patch) | |
tree | 6955c57269b951e2e9d4b665c2687ed9e1670961 /gtk2_ardour/editor_selection.cc | |
parent | ae2b39b2e346548e2bf9f6cb308d8bd0b9d64005 (diff) | |
parent | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (diff) |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
Diffstat (limited to 'gtk2_ardour/editor_selection.cc')
-rw-r--r-- | gtk2_ardour/editor_selection.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index f6b52799c6..065cfdbcba 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1047,10 +1047,8 @@ Editor::sensitize_the_right_region_actions () bool have_midi = false; bool have_locked = false; bool have_unlocked = false; -#ifdef WITH_VIDEOTIMELINE bool have_video_locked = false; bool have_video_unlocked = false; -#endif bool have_position_lock_style_audio = false; bool have_position_lock_style_music = false; bool have_muted = false; @@ -1092,13 +1090,12 @@ Editor::sensitize_the_right_region_actions () } else { have_unlocked = true; } -#ifdef WITH_VIDEOTIMELINE + if (r->video_locked()) { have_video_locked = true; } else { have_video_unlocked = true; } -#endif if (r->position_lock_style() == MusicTime) { have_position_lock_style_music = true; @@ -1223,13 +1220,11 @@ Editor::sensitize_the_right_region_actions () // a->set_inconsistent (); } -#ifdef WITH_VIDEOTIMELINE a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-video-lock")); a->set_active (have_video_locked && !have_video_unlocked); if (have_video_locked && have_video_unlocked) { // a->set_inconsistent (); } -#endif a = Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style")); a->set_active (have_position_lock_style_music && !have_position_lock_style_audio); |