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 fbe46a1ae9656246af162de31b65662ac8923530..065cfdbcba42fb323049b0b5cf4dd8f0e8a692d6 100644 (file)
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -364,7 +364,7 @@ void
 Editor::get_onscreen_tracks (TrackViewList& tvl)
 {
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-               if ((*i)->y_position() < _canvas_height) {
+               if ((*i)->y_position() < _visible_canvas_height) {
                        tvl.push_back (*i);
                }
        }
@@ -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);
@@ -1682,12 +1677,12 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
        list<Selectable *> touched;
 
        if (after) {
-               start = cursor->current_frame;
+               start = cursor->current_frame();
                end = _session->current_end_frame();
        } else {
-               if (cursor->current_frame > 0) {
+               if (cursor->current_frame() > 0) {
                        start = 0;
-                       end = cursor->current_frame - 1;
+                       end = cursor->current_frame() - 1;
                } else {
                        return;
                }