Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / editor_selection.cc

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index f6b52799c68d2af5d41643adfde40e60080f830a..065cfdbcba42fb323049b0b5cf4dd8f0e8a692d6 100644 (file)
--- 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);