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 7b08eaeaa6765aea2db48504efd9a6fa9a09037e..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);
                }
        }
@@ -880,7 +880,7 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> regi
 {
        vector<RegionView*> all_equivalent_regions;
 
-       get_regions_corresponding_to (region, all_equivalent_regions);
+       get_regions_corresponding_to (region, all_equivalent_regions, region->whole_file());
 
        if (all_equivalent_regions.empty()) {
                return;
@@ -962,9 +962,7 @@ Editor::track_selection_changed ()
                        (*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
                }
 
-               if (yn &&
-                   ((mouse_mode == MouseRange) ||
-                    ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
+               if (yn) {
                        (*i)->reshow_selection (selection->time);
                } else {
                        (*i)->hide_selection ();
@@ -1049,6 +1047,8 @@ Editor::sensitize_the_right_region_actions ()
        bool have_midi = false;
        bool have_locked = false;
        bool have_unlocked = false;
+       bool have_video_locked = false;
+       bool have_video_unlocked = false;
        bool have_position_lock_style_audio = false;
        bool have_position_lock_style_music = false;
        bool have_muted = false;
@@ -1091,6 +1091,12 @@ Editor::sensitize_the_right_region_actions ()
                        have_unlocked = true;
                }
 
+               if (r->video_locked()) {
+                       have_video_locked = true;
+               } else {
+                       have_video_unlocked = true;
+               }
+
                if (r->position_lock_style() == MusicTime) {
                        have_position_lock_style_music = true;
                } else {
@@ -1143,6 +1149,9 @@ Editor::sensitize_the_right_region_actions ()
                _region_actions->get_action("show-region-properties")->set_sensitive (false);
                _region_actions->get_action("rename-region")->set_sensitive (false);
                if (have_audio) {
+                       /* XXX need to check whether there is than 1 per
+                          playlist, because otherwise this makes no sense.
+                       */
                        _region_actions->get_action("combine-regions")->set_sensitive (true);
                } else {
                        _region_actions->get_action("combine-regions")->set_sensitive (false);
@@ -1211,6 +1220,12 @@ Editor::sensitize_the_right_region_actions ()
                // a->set_inconsistent ();
        }
 
+       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 ();
+       }
+
        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);
 
@@ -1298,8 +1313,8 @@ Editor::region_selection_changed ()
                sensitize_all_region_actions (true);
        }
 
-       if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->regions.empty()) {
-               _session->request_locate (selection->regions.start());
+       if (_session && !_session->transport_rolling() && !selection->regions.empty()) {
+               maybe_locate_with_edit_preroll (selection->regions.start());
        }
 }
 
@@ -1354,17 +1369,48 @@ Editor::select_all (Selection::Operation op)
 {
        list<Selectable *> touched;
 
+       TrackViewList ts;
+
+       if (selection->tracks.empty()) {
+               if (entered_track) {
+                       ts.push_back (entered_track);
+               } else {
+                       ts = track_views;
+               }
+       } else {
+               ts = selection->tracks;
+       }
+
        if (_internal_editing) {
-               select_all_internal_edit (op);
-               return;
+
+               bool midi_selected = false;
+
+               for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
+                       if ((*iter)->hidden()) {
+                               continue;
+                       }
+                       
+                       RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*iter);
+
+                       if (rtav && rtav->is_midi_track()) {
+                               midi_selected = true;
+                               break;
+                       }
+               }
+
+               if (midi_selected) {
+                       select_all_internal_edit (op);
+                       return;
+               }
        }
 
-       for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
+       for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) {
                if ((*iter)->hidden()) {
                        continue;
                }
                (*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
        }
+
        begin_reversible_command (_("select all"));
        switch (op) {
        case Selection::Add:
@@ -1631,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;
                }
@@ -1770,7 +1816,7 @@ Editor::select_range_between ()
        framepos_t start;
        framepos_t end;
 
-       if (mouse_mode == MouseRange && !selection->time.empty()) {
+       if ( !selection->time.empty() ) {
                selection->clear_time ();
        }
 
@@ -1788,9 +1834,9 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
        framepos_t m;
        bool ignored;
 
-       /* in range mode, use any existing selection */
+       /* if an explicit range exists, use it */
 
-       if (mouse_mode == MouseRange && !selection->time.empty()) {
+       if (!selection->time.empty()) {
                /* we know that these are ordered */
                start = selection->time.start();
                end = selection->time.end_frame();