X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_selection.cc;h=e19afe375cea48a7057770538922d3f63be12892;hb=4df3666738607039445ebc9fa083bf5c23ac5539;hp=9bfba273f75ee99e00d4eda433317d4976edbc29;hpb=804da5653127aaedda057d3c683be5817f335fef;p=ardour.git diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 9bfba273f7..e19afe375c 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,10 +22,13 @@ #include "pbd/stacktrace.h" -#include "ardour/diskstream.h" +#include "ardour/midi_region.h" #include "ardour/playlist.h" -#include "ardour/route_group.h" #include "ardour/profile.h" +#include "ardour/route_group.h" +#include "ardour/session.h" + +#include "control_protocol/control_protocol.h" #include "editor.h" #include "actions.h" @@ -34,11 +37,13 @@ #include "audio_streamview.h" #include "automation_line.h" #include "control_point.h" +#include "editor_regions.h" +#include "editor_cursors.h" +#include "midi_region_view.h" #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -48,9 +53,9 @@ using namespace Editing; struct TrackViewByPositionSorter { - bool operator() (const TimeAxisView* a, const TimeAxisView *b) { - return a->y_position() < b->y_position(); - } + bool operator() (const TimeAxisView* a, const TimeAxisView *b) { + return a->y_position() < b->y_position(); + } }; bool @@ -69,10 +74,10 @@ Editor::extend_selection_to_track (TimeAxisView& view) } else { return false; } - } + } /* something is already selected, so figure out which range of things to add */ - + TrackViewList to_be_added; TrackViewList sorted = track_views; TrackViewByPositionSorter cmp; @@ -102,18 +107,18 @@ Editor::extend_selection_to_track (TimeAxisView& view) break; } } - + passed_clicked = false; if (forwards) { for (TrackViewList::iterator i = sorted.begin(); i != sorted.end(); ++i) { - + if ((*i) == &view) { passed_clicked = true; continue; } - + if (passed_clicked) { if ((*i)->hidden()) { continue; @@ -129,18 +134,18 @@ Editor::extend_selection_to_track (TimeAxisView& view) } else { for (TrackViewList::reverse_iterator r = sorted.rbegin(); r != sorted.rend(); ++r) { - + if ((*r) == &view) { passed_clicked = true; continue; } - + if (passed_clicked) { - + if ((*r)->hidden()) { continue; } - + if (selection->selected (*r)) { break; } else if (!(*r)->hidden()) { @@ -149,12 +154,12 @@ Editor::extend_selection_to_track (TimeAxisView& view) } } } - + if (!to_be_added.empty()) { selection->add (to_be_added); return true; } - + return false; } @@ -170,20 +175,95 @@ Editor::select_all_tracks () selection->set (visible_views); } +/** Select clicked_axisview, unless there are no currently selected + * tracks, in which case nothing will happen unless `force' is true. + */ void -Editor::set_selected_track_as_side_effect (bool force) +Editor::set_selected_track_as_side_effect (Selection::Operation op) { + if (!clicked_axisview) { + return; + } + if (!clicked_routeview) { return; } - if (!selection->tracks.empty()) { - if (!selection->selected (clicked_routeview)) { - selection->add (clicked_routeview); + bool had_tracks = !selection->tracks.empty(); + RouteGroup* group = clicked_routeview->route()->route_group(); + RouteGroup& arg (_session->all_route_group()); + + switch (op) { + case Selection::Toggle: + if (selection->selected (clicked_axisview)) { + if (arg.is_select() && arg.is_active()) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + selection->remove(*i); + } + } else if (group && group->is_active()) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + if ((*i)->route_group() == group) + selection->remove(*i); + } + } else { + selection->remove (clicked_axisview); + } + } else { + if (arg.is_select() && arg.is_active()) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + selection->add(*i); + } + } else if (group && group->is_active()) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + if ( (*i)->route_group() == group) + selection->add(*i); + } + } else { + selection->add (clicked_axisview); + } + } + break; + + case Selection::Add: + if (!had_tracks && arg.is_select() && arg.is_active()) { + /* nothing was selected already, and all group is active etc. so use + all tracks. + */ + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + selection->add(*i); + } + } else if (group && group->is_active()) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + if ((*i)->route_group() == group) + selection->add(*i); + } + } else { + selection->add (clicked_axisview); } + break; - } else if (force) { - selection->set (clicked_routeview); + case Selection::Set: + selection->clear(); + if (!had_tracks && arg.is_select() && arg.is_active()) { + /* nothing was selected already, and all group is active etc. so use + all tracks. + */ + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + selection->add(*i); + } + } else if (group && group->is_active()) { + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { + if ((*i)->route_group() == group) + selection->add(*i); + } + } else { + selection->set (clicked_axisview); + } + break; + + case Selection::Extend: + selection->clear(); + break; } } @@ -210,7 +290,7 @@ Editor::set_selected_track (TimeAxisView& view, Selection::Operation op, bool no case Selection::Set: selection->set (&view); break; - + case Selection::Extend: extend_selection_to_track (view); break; @@ -223,7 +303,7 @@ Editor::set_selected_track_from_click (bool press, Selection::Operation op, bool if (!clicked_routeview) { return; } - + if (!press) { return; } @@ -232,122 +312,173 @@ Editor::set_selected_track_from_click (bool press, Selection::Operation op, bool } bool -Editor::set_selected_control_point_from_click (Selection::Operation op, bool no_remove) +Editor::set_selected_control_point_from_click (bool press, Selection::Operation op) { if (!clicked_control_point) { return false; } - /* select this point and any others that it represents */ - - double y1, y2; - nframes64_t x1, x2; - - x1 = pixel_to_frame (clicked_control_point->get_x() - 10); - x2 = pixel_to_frame (clicked_control_point->get_x() + 10); - y1 = clicked_control_point->get_x() - 10; - y2 = clicked_control_point->get_y() + 10; + switch (op) { + case Selection::Set: + if (press) { + selection->set (clicked_control_point); + } + break; + case Selection::Add: + if (press) { + selection->add (clicked_control_point); + } + break; + case Selection::Toggle: + /* This is a bit of a hack; if we Primary-Click-Drag a control + point (for push drag) we want the point we clicked on to be + selected, otherwise we end up confusingly dragging an + unselected point. So here we ensure that the point is selected + after the press, and if we subsequently get a release (meaning no + drag occurred) we set things up so that the toggle has happened. + */ + if (press && !selection->selected (clicked_control_point)) { + /* This is the button press, and the control point is not selected; make it so, + in case this press leads to a drag. Also note that having done this, we don't + need to toggle again on release. + */ + selection->toggle (clicked_control_point); + _control_point_toggled_on_press = true; + } else if (!press && !_control_point_toggled_on_press) { + /* This is the release, and the point wasn't toggled on the press, so do it now */ + selection->toggle (clicked_control_point); + } else { + /* Reset our flag */ + _control_point_toggled_on_press = false; + } + break; + case Selection::Extend: + /* XXX */ + break; + } - return select_all_within (x1, x2, y1, y2, selection->tracks, op); + return true; } 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) { - tvl.push_back (*i); - } - } + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + if ((*i)->y_position() < _canvas_height) { + tvl.push_back (*i); + } + } } +/** Call a slot for a given `basis' track and also for any track that is in the same + * active route group with a particular set of properties. + * + * @param sl Slot to call. + * @param basis Basis track. + * @param prop Properties that active edit groups must share to be included in the map. + */ + void -Editor::get_relevant_tracks (set& relevant_tracks) +Editor::mapover_tracks (sigc::slot sl, TimeAxisView* basis, PBD::PropertyID prop) const { - /* step one: get all selected tracks and all tracks in the relevant edit groups */ + RouteTimeAxisView* route_basis = dynamic_cast (basis); - for (TrackSelection::iterator ti = selection->tracks.begin(); ti != selection->tracks.end(); ++ti) { + if (route_basis == 0) { + return; + } - RouteTimeAxisView* rtv = dynamic_cast(*ti); + set tracks; + tracks.insert (route_basis); - if (!rtv) { - continue; - } + RouteGroup* group = route_basis->route()->route_group(); - RouteGroup* group = rtv->route()->edit_group(); + if (group && group->enabled_property(prop) && group->enabled_property (Properties::active.property_id) ) { - if (group && group->is_active()) { - - /* active group for this track, loop over all tracks and get every member of the group */ + /* the basis is a member of an active route group, with the appropriate + properties; find other members */ - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - - RouteTimeAxisView* trtv; - - if ((trtv = dynamic_cast (*i)) != 0) { - - if (trtv->route()->edit_group() == group) { - relevant_tracks.insert (trtv); - } - } + for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) { + RouteTimeAxisView* v = dynamic_cast (*i); + if (v && v->route()->route_group() == group) { + tracks.insert (v); } - } else { - relevant_tracks.insert (rtv); } } + + /* call the slots */ + uint32_t const sz = tracks.size (); + + for (set::iterator i = tracks.begin(); i != tracks.end(); ++i) { + sl (**i, sz); + } } -/** - * Call a slot for a given `basis' track and also for any track that is in the same - * active edit group. +/** Call a slot for a given `basis' track and also for any track that is in the same + * active route group with a particular set of properties. + * * @param sl Slot to call. * @param basis Basis track. + * @param prop Properties that active edit groups must share to be included in the map. */ void -Editor::mapover_tracks (slot sl, TimeAxisView* basis) const +Editor::mapover_tracks_with_unique_playlists (sigc::slot sl, TimeAxisView* basis, PBD::PropertyID prop) const { RouteTimeAxisView* route_basis = dynamic_cast (basis); + set > playlists; + if (route_basis == 0) { return; } - /* work out the tracks that we will call the slot for; use - a set here as it will disallow possible duplicates of the - basis track */ set tracks; - - /* always call for the basis */ tracks.insert (route_basis); - RouteGroup* group = route_basis->route()->edit_group(); - if (group && group->is_active()) { + RouteGroup* group = route_basis->route()->route_group(); // could be null, not a problem + + if (group && group->enabled_property(prop) && group->enabled_property (Properties::active.property_id) ) { + + /* the basis is a member of an active route group, with the appropriate + properties; find other members */ - /* the basis is a member of an active edit group; find other members */ for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) { RouteTimeAxisView* v = dynamic_cast (*i); - if (v && v->route()->edit_group() == group) { - tracks.insert (v); + + if (v && v->route()->route_group() == group) { + + boost::shared_ptr t = v->track(); + if (t) { + if (playlists.insert (t->playlist()).second) { + /* haven't seen this playlist yet */ + tracks.insert (v); + } + } else { + /* not actually a "Track", but a timeaxis view that + we should mapover anyway. + */ + tracks.insert (v); + } } } } /* call the slots */ uint32_t const sz = tracks.size (); + for (set::iterator i = tracks.begin(); i != tracks.end(); ++i) { sl (**i, sz); } } void -Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t ignored, RegionView* basis, vector* all_equivs) const +Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionView * basis, vector* all_equivs) const { boost::shared_ptr pl; vector > results; RegionView* marv; - boost::shared_ptr ds; + boost::shared_ptr tr; - if ((ds = tv.get_diskstream()) == 0) { + if ((tr = tv.track()) == 0) { /* bus */ return; } @@ -357,7 +488,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t ignored, return; } - if ((pl = ds->playlist()) != 0) { + if ((pl = tr->playlist()) != 0) { pl->get_equivalent_regions (basis->region(), results); } @@ -369,55 +500,78 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t ignored, } void -Editor::get_equivalent_regions (RegionView* basis, vector& equivalent_regions) const +Editor::get_equivalent_regions (RegionView* basis, vector& equivalent_regions, PBD::PropertyID property) const { - mapover_tracks (bind (mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview()); - + mapover_tracks_with_unique_playlists (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_time_axis_view(), property); + /* add clicked regionview since we skipped all other regions in the same track as the one it was in */ - + equivalent_regions.push_back (basis); } +RegionSelection +Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) const +{ + RegionSelection equivalent; + + for (RegionSelection::const_iterator i = basis.begin(); i != basis.end(); ++i) { + + vector eq; + + mapover_tracks_with_unique_playlists ( + sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq), + &(*i)->get_time_axis_view(), prop); + + for (vector::iterator j = eq.begin(); j != eq.end(); ++j) { + equivalent.add (*j); + } + + equivalent.add (*i); + } + + return equivalent; +} + int Editor::get_regionview_count_from_region_list (boost::shared_ptr region) { int region_count = 0; - + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - + RouteTimeAxisView* tatv; - + if ((tatv = dynamic_cast (*i)) != 0) { - + boost::shared_ptr pl; vector > results; RegionView* marv; - boost::shared_ptr ds; - - if ((ds = tatv->get_diskstream()) == 0) { + boost::shared_ptr tr; + + if ((tr = tatv->track()) == 0) { /* bus */ continue; } - - if ((pl = (ds->playlist())) != 0) { + + if ((pl = (tr->playlist())) != 0) { pl->get_region_list_equivalent_regions (region, results); } - + for (vector >::iterator ir = results.begin(); ir != results.end(); ++ir) { if ((marv = tatv->view()->find_view (*ir)) != 0) { region_count++; } } - + } } - + return region_count; } bool -Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, bool no_track_remove) +Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) { vector all_equivalent_regions; bool commit = false; @@ -428,14 +582,12 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, if (press) { button_release_can_deselect = false; - } + } if (op == Selection::Toggle || op == Selection::Set) { - switch (op) { case Selection::Toggle: - if (selection->selected (clicked_regionview)) { if (press) { @@ -446,7 +598,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, button_release_can_deselect = true; } else { - if (button_release_can_deselect) { /* just remove this one region, but only on a permitted button release */ @@ -460,34 +611,33 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, button_release_can_deselect = false; } - } + } } else { if (press) { if (selection->selected (clicked_routeview)) { - get_equivalent_regions (clicked_regionview, all_equivalent_regions); + get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id); } else { all_equivalent_regions.push_back (clicked_regionview); } /* add all the equivalent regions, but only on button press */ - - if (!all_equivalent_regions.empty()) { commit = true; } selection->add (all_equivalent_regions); - } + } } break; - + case Selection::Set: if (!selection->selected (clicked_regionview)) { - selection->set (clicked_regionview); + get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id); + selection->set (all_equivalent_regions); commit = true; } else { /* no commit necessary: clicked on an already selected region */ @@ -503,14 +653,14 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } else if (op == Selection::Extend) { list results; - nframes64_t last_frame; - nframes64_t first_frame; + framepos_t last_frame; + framepos_t first_frame; bool same_track = false; /* 1. find the last selected regionview in the track that was clicked in */ last_frame = 0; - first_frame = max_frames; + first_frame = max_framepos; for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) { if (&(*x)->get_time_axis_view() == &clicked_regionview->get_time_axis_view()) { @@ -530,9 +680,9 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, if (same_track) { /* 2. figure out the boundaries for our search for new objects */ - + switch (clicked_regionview->region()->coverage (first_frame, last_frame)) { - case OverlapNone: + case Evoral::OverlapNone: if (last_frame < clicked_regionview->region()->first_frame()) { first_frame = last_frame; last_frame = clicked_regionview->region()->last_frame(); @@ -541,8 +691,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, first_frame = clicked_regionview->region()->first_frame(); } break; - - case OverlapExternal: + + case Evoral::OverlapExternal: if (last_frame < clicked_regionview->region()->first_frame()) { first_frame = last_frame; last_frame = clicked_regionview->region()->last_frame(); @@ -551,8 +701,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, first_frame = clicked_regionview->region()->first_frame(); } break; - - case OverlapInternal: + + case Evoral::OverlapInternal: if (last_frame < clicked_regionview->region()->first_frame()) { first_frame = last_frame; last_frame = clicked_regionview->region()->last_frame(); @@ -561,9 +711,9 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, first_frame = clicked_regionview->region()->first_frame(); } break; - - case OverlapStart: - case OverlapEnd: + + case Evoral::OverlapStart: + case Evoral::OverlapEnd: /* nothing to do except add clicked region to selection, since it overlaps with the existing selection in this track. */ @@ -576,11 +726,11 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, to pick out all regions that are defined by the existing selection plus this one. */ - - - first_frame = entered_regionview->region()->position(); - last_frame = entered_regionview->region()->last_frame(); - + + + first_frame = clicked_regionview->region()->position(); + last_frame = clicked_regionview->region()->last_frame(); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { if ((*i)->region()->position() < first_frame) { first_frame = (*i)->region()->position(); @@ -594,21 +744,28 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, /* 2. find all the tracks we should select in */ set relevant_tracks; - set already_in_selection; - get_relevant_tracks (relevant_tracks); + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + RouteTimeAxisView* r = dynamic_cast (*i); + if (r) { + relevant_tracks.insert (r); + } + } + + set already_in_selection; if (relevant_tracks.empty()) { - /* no relevant tracks -> no tracks selected .. thus .. if - the regionview we're in isn't selected (i.e. we're - about to extend to it), then find all tracks between - the this one and any selected ones. + /* no tracks selected .. thus .. if the + regionview we're in isn't selected + (i.e. we're about to extend to it), then + find all tracks between the this one and + any selected ones. */ - if (!selection->selected (entered_regionview)) { + if (!selection->selected (clicked_regionview)) { - RouteTimeAxisView* rtv = dynamic_cast (&entered_regionview->get_time_axis_view()); + RouteTimeAxisView* rtv = dynamic_cast (&clicked_regionview->get_time_axis_view()); if (rtv) { @@ -622,7 +779,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, RouteTimeAxisView* closest = 0; int distance = INT_MAX; - int key = rtv->route()->order_key ("editor"); + int key = rtv->route()->order_key (EditorSort); for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) { @@ -636,12 +793,11 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, if (result.second) { /* newly added to already_in_selection */ - - int d = artv->route()->order_key ("editor"); - + int d = artv->route()->order_key (EditorSort); + d -= key; - + if (abs (d) < distance) { distance = abs (d); closest = artv; @@ -649,22 +805,22 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } } } - + if (closest) { /* now add all tracks between that one and this one */ - - int okey = closest->route()->order_key ("editor"); - + + int okey = closest->route()->order_key (EditorSort); + if (okey > key) { swap (okey, key); } - + for (TrackViewList::iterator x = track_views.begin(); x != track_views.end(); ++x) { RouteTimeAxisView* artv = dynamic_cast(*x); if (artv && artv != rtv) { - int k = artv->route()->order_key ("editor"); + int k = artv->route()->order_key (EditorSort); if (k >= okey && k <= key) { @@ -675,8 +831,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, */ if (find (already_in_selection.begin(), - already_in_selection.end(), - artv) == already_in_selection.end()) { + already_in_selection.end(), + artv) == already_in_selection.end()) { relevant_tracks.insert (artv); } @@ -689,19 +845,17 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } /* 3. find all selectable objects (regionviews in this case) between that one and the end of the - one that was clicked. + one that was clicked. */ - get_relevant_tracks (relevant_tracks); - for (set::iterator t = relevant_tracks.begin(); t != relevant_tracks.end(); ++t) { (*t)->get_selectables (first_frame, last_frame, -1.0, -1.0, results); } - + /* 4. convert to a vector of regions */ vector regions; - + for (list::iterator x = results.begin(); x != results.end(); ++x) { RegionView* arv; @@ -716,7 +870,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } } - out: +out: return commit; } @@ -726,14 +880,14 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr regi { vector 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; } begin_reversible_command (_("set selected regions")); - + switch (op) { case Selection::Toggle: /* XXX this is not correct */ @@ -754,7 +908,7 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr regi } bool -Editor::set_selected_regionview_from_map_event (GdkEventAny* ev, StreamView* sv, boost::weak_ptr weak_r) +Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView* sv, boost::weak_ptr weak_r) { RegionView* rv; boost::shared_ptr r (weak_r.lock()); @@ -767,16 +921,16 @@ Editor::set_selected_regionview_from_map_event (GdkEventAny* ev, StreamView* sv, return true; } - /* don't reset the selection if its something other than + /* don't reset the selection if its something other than a single other region. */ if (selection->regions.size() > 1) { return true; } - + begin_reversible_command (_("set selected regions")); - + selection->set (rv); commit_reversible_command () ; @@ -787,7 +941,7 @@ Editor::set_selected_regionview_from_map_event (GdkEventAny* ev, StreamView* sv, void Editor::track_selection_changed () { - switch (selection->tracks.size()){ + switch (selection->tracks.size()) { case 0: break; default: @@ -795,15 +949,39 @@ Editor::track_selection_changed () break; } + RouteNotificationListPtr routes (new RouteNotificationList); + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - if (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end()) { - (*i)->set_selected (true); + + bool yn = (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end()); + + (*i)->set_selected (yn); + + TimeAxisView::Children c = (*i)->get_child_list (); + for (TimeAxisView::Children::iterator j = c.begin(); j != c.end(); ++j) { + (*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end()); + } + + if (yn) { + (*i)->reshow_selection (selection->time); } else { - (*i)->set_selected (false); + (*i)->hide_selection (); + } + + + if (yn) { + RouteTimeAxisView* rtav = dynamic_cast (*i); + if (rtav) { + routes->push_back (rtav->route()); + } } } ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty()); + + /* notify control protocols */ + + ControlProtocol::TrackSelectionChanged (routes); } void @@ -817,14 +995,8 @@ Editor::time_selection_changed () (*i)->hide_selection (); } - if (selection->tracks.empty()) { - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->show_selection (selection->time); - } - } else { - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - (*i)->show_selection (selection->time); - } + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + (*i)->show_selection (selection->time); } if (selection->time.empty()) { @@ -833,53 +1005,317 @@ Editor::time_selection_changed () ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true); } + if (_session && Config->get_always_play_range() && !_session->transport_rolling() && !selection->time.empty()) { + _session->request_locate (selection->time.start()); + } } +/** Set all region actions to have a given sensitivity */ void -Editor::sensitize_the_right_region_actions (bool have_selected_regions) +Editor::sensitize_all_region_actions (bool s) { - for (vector >::iterator x = ActionManager::region_selection_sensitive_actions.begin(); - x != ActionManager::region_selection_sensitive_actions.end(); ++x) { + Glib::ListHandle > all = _region_actions->get_actions (); - string accel_path = (*x)->get_accel_path (); - AccelKey key; + for (Glib::ListHandle >::iterator i = all.begin(); i != all.end(); ++i) { + (*i)->set_sensitive (s); + } - /* if there is an accelerator, it should always be sensitive - to allow for keyboard ops on entered regions. - */ + _all_region_actions_sensitized = s; +} + +/** Sensitize region-based actions based on the selection ONLY, ignoring the entered_regionview. + * This method should be called just before displaying a Region menu. When a Region menu is not + * currently being shown, all region actions are sensitized so that hotkey-triggered actions + * on entered_regionviews work without having to check sensitivity every time the selection or + * entered_regionview changes. + * + * This method also sets up toggle action state as appropriate. + */ +void +Editor::sensitize_the_right_region_actions () +{ + + RegionSelection rs = get_regions_from_selection_and_entered (); + sensitize_all_region_actions (!rs.empty ()); + + _ignore_region_action = true; + + /* Look through the regions that are selected and make notes about what we have got */ + + bool have_audio = false; + bool have_multichannel_audio = false; + 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; + bool have_unmuted = false; + bool have_opaque = false; + bool have_non_opaque = false; + bool have_not_at_natural_position = false; + bool have_envelope_active = false; + bool have_envelope_inactive = false; + bool have_non_unity_scale_amplitude = false; + bool have_compound_regions = false; + bool have_inactive_fade_in = false; + bool have_inactive_fade_out = false; + bool have_active_fade_in = false; + bool have_active_fade_out = false; + + for (list::const_iterator i = rs.begin(); i != rs.end(); ++i) { + + boost::shared_ptr r = (*i)->region (); + boost::shared_ptr ar = boost::dynamic_pointer_cast (r); + + if (ar) { + have_audio = true; + if (ar->n_channels() > 1) { + have_multichannel_audio = true; + } + } - bool known = ActionManager::lookup_entry (accel_path, key); + if (boost::dynamic_pointer_cast (r)) { + have_midi = true; + } + + if (r->is_compound()) { + have_compound_regions = true; + } - if (known && ((key.get_key() != GDK_VoidSymbol) && (key.get_key() != 0))) { - (*x)->set_sensitive (true); + if (r->locked()) { + have_locked = true; } else { - (*x)->set_sensitive (have_selected_regions); + 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 { + have_position_lock_style_audio = true; + } + + if (r->muted()) { + have_muted = true; + } else { + have_unmuted = true; + } + + if (r->opaque()) { + have_opaque = true; + } else { + have_non_opaque = true; + } + + if (!r->at_natural_position()) { + have_not_at_natural_position = true; + } + + if (ar) { + if (ar->envelope_active()) { + have_envelope_active = true; + } else { + have_envelope_inactive = true; + } + + if (ar->scale_amplitude() != 1) { + have_non_unity_scale_amplitude = true; + } + + if (ar->fade_in_active ()) { + have_active_fade_in = true; + } else { + have_inactive_fade_in = true; + } + + if (ar->fade_out_active ()) { + have_active_fade_out = true; + } else { + have_inactive_fade_out = true; + } + } + } + + if (rs.size() > 1) { + _region_actions->get_action("show-region-list-editor")->set_sensitive (false); + _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); + } + } else if (rs.size() == 1) { + _region_actions->get_action("add-range-markers-from-region")->set_sensitive (false); + _region_actions->get_action("close-region-gaps")->set_sensitive (false); + _region_actions->get_action("combine-regions")->set_sensitive (false); + } + + if (!have_multichannel_audio) { + _region_actions->get_action("split-multichannel-region")->set_sensitive (false); + } + + if (!have_midi) { + editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (false); + _region_actions->get_action("show-region-list-editor")->set_sensitive (false); + _region_actions->get_action("quantize-region")->set_sensitive (false); + _region_actions->get_action("fork-region")->set_sensitive (false); + _region_actions->get_action("insert-patch-change-context")->set_sensitive (false); + _region_actions->get_action("insert-patch-change")->set_sensitive (false); + _region_actions->get_action("transpose-region")->set_sensitive (false); + } else { + editor_menu_actions->get_action("RegionMenuMIDI")->set_sensitive (true); + /* others were already marked sensitive */ + } + + if (_edit_point == EditAtMouse) { + _region_actions->get_action("set-region-sync-position")->set_sensitive (false); + _region_actions->get_action("trim-front")->set_sensitive (false); + _region_actions->get_action("trim-back")->set_sensitive (false); + _region_actions->get_action("split-region")->set_sensitive (false); + _region_actions->get_action("place-transient")->set_sensitive (false); + } + + if (have_compound_regions) { + _region_actions->get_action("uncombine-regions")->set_sensitive (true); + } else { + _region_actions->get_action("uncombine-regions")->set_sensitive (false); + } + + if (have_audio) { + + if (have_envelope_active && !have_envelope_inactive) { + Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-active"))->set_active (); + } else if (have_envelope_active && have_envelope_inactive) { + // Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-active"))->set_inconsistent (); } + + } else { + + _region_actions->get_action("analyze-region")->set_sensitive (false); + _region_actions->get_action("reset-region-gain-envelopes")->set_sensitive (false); + _region_actions->get_action("toggle-region-gain-envelope-active")->set_sensitive (false); + _region_actions->get_action("pitch-shift-region")->set_sensitive (false); + + } + + if (!have_non_unity_scale_amplitude || !have_audio) { + _region_actions->get_action("reset-region-scale-amplitude")->set_sensitive (false); + } + + Glib::RefPtr a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-lock")); + a->set_active (have_locked && !have_unlocked); + if (have_locked && have_unlocked) { + // a->set_inconsistent (); } + + a = Glib::RefPtr::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::cast_dynamic (_region_actions->get_action("toggle-region-lock-style")); + a->set_active (have_position_lock_style_music && !have_position_lock_style_audio); + + if (have_position_lock_style_music && have_position_lock_style_audio) { + // a->set_inconsistent (); + } + + a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-mute")); + a->set_active (have_muted && !have_unmuted); + if (have_muted && have_unmuted) { + // a->set_inconsistent (); + } + + a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-opaque-region")); + a->set_active (have_opaque && !have_non_opaque); + if (have_opaque && have_non_opaque) { + // a->set_inconsistent (); + } + + if (!have_not_at_natural_position) { + _region_actions->get_action("naturalize-region")->set_sensitive (false); + } + + /* XXX: should also check that there is a track of the appropriate type for the selected region */ + if (_edit_point == EditAtMouse || _regions->get_single_selection() == 0 || selection->tracks.empty()) { + _region_actions->get_action("insert-region-from-region-list")->set_sensitive (false); + } else { + _region_actions->get_action("insert-region-from-region-list")->set_sensitive (true); + } + + a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-fade-in")); + a->set_active (have_active_fade_in && !have_inactive_fade_in); + if (have_active_fade_in && have_inactive_fade_in) { + // a->set_inconsistent (); + } + + a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-fade-out")); + a->set_active (have_active_fade_out && !have_inactive_fade_out); + + if (have_active_fade_out && have_inactive_fade_out) { + // a->set_inconsistent (); + } + + bool const have_active_fade = have_active_fade_in || have_active_fade_out; + bool const have_inactive_fade = have_inactive_fade_in || have_inactive_fade_out; + + a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-fades")); + a->set_active (have_active_fade && !have_inactive_fade); + + if (have_active_fade && have_inactive_fade) { + // a->set_inconsistent (); + } + + _ignore_region_action = false; + + _all_region_actions_sensitized = false; } void Editor::region_selection_changed () { - region_list_change_connection.block(true); + _regions->block_change_connection (true); editor_regions_selection_changed_connection.block(true); - - region_list_display.get_selection()->unselect_all(); - + + if (_region_selection_change_updates_region_list) { + _regions->unselect_all (); + } + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - (*i)->set_selected_regionviews (selection->regions); - set_selected_in_region_list(selection->regions); - } - - sensitize_the_right_region_actions (!selection->regions.empty()); - zoomed_to_region = false; + if (_region_selection_change_updates_region_list) { + _regions->set_selected (selection->regions); + } - region_list_change_connection.block(false); + _regions->block_change_connection (false); editor_regions_selection_changed_connection.block(false); + + if (!_all_region_actions_sensitized) { + /* This selection change might have changed what region actions + are allowed, so sensitize them all in case a key is pressed. + */ + sensitize_all_region_actions (true); + } + + if (_session && !_session->transport_rolling() && !selection->regions.empty()) { + maybe_locate_with_edit_preroll (selection->regions.start()); + } } void @@ -898,8 +1334,8 @@ Editor::select_all_in_track (Selection::Operation op) if (!clicked_routeview) { return; } - - clicked_routeview->get_selectables (0, max_frames, 0, DBL_MAX, touched); + + clicked_routeview->get_selectables (0, max_framepos, 0, DBL_MAX, touched); switch (op) { case Selection::Toggle: @@ -917,17 +1353,64 @@ Editor::select_all_in_track (Selection::Operation op) } } +void +Editor::select_all_internal_edit (Selection::Operation) +{ + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + MidiRegionView* mrv = dynamic_cast(*i); + if (mrv) { + mrv->select_all_notes (); + } + } +} + void Editor::select_all (Selection::Operation op) { list touched; - for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { + 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) { + + bool midi_selected = false; + + for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) { + if ((*iter)->hidden()) { + continue; + } + + RouteTimeAxisView* rtav = dynamic_cast (*iter); + + if (rtav && rtav->is_midi_track()) { + midi_selected = true; + break; + } + } + + if (midi_selected) { + select_all_internal_edit (op); + return; + } + } + + for (TrackViewList::iterator iter = ts.begin(); iter != ts.end(); ++iter) { if ((*iter)->hidden()) { continue; } - (*iter)->get_selectables (0, max_frames, 0, DBL_MAX, touched); + (*iter)->get_selectables (0, max_framepos, 0, DBL_MAX, touched); } + begin_reversible_command (_("select all")); switch (op) { case Selection::Add: @@ -945,6 +1428,7 @@ Editor::select_all (Selection::Operation op) } commit_reversible_command (); } + void Editor::invert_selection_in_track () { @@ -953,7 +1437,7 @@ Editor::invert_selection_in_track () if (!clicked_routeview) { return; } - + clicked_routeview->get_inverted_selectables (*selection, touched); selection->set (touched); } @@ -962,7 +1446,17 @@ void Editor::invert_selection () { list touched; - + + if (_internal_editing) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + MidiRegionView* mrv = dynamic_cast(*i); + if (mrv) { + mrv->invert_selection (); + } + } + return; + } + for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { if ((*iter)->hidden()) { continue; @@ -973,68 +1467,59 @@ Editor::invert_selection () selection->set (touched); } -bool -Editor::select_all_within (nframes64_t start, nframes64_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op) +/** @param start Start time in session frames. + * @param end End time in session frames. + * @param top Top (lower) y limit in trackview coordinates (ie 0 at the top of the track view) + * @param bottom Bottom (higher) y limit in trackview coordinates (ie 0 at the top of the track view) + * @param preserve_if_selected true to leave the current selection alone if we're adding to the selection and all of the selectables + * within the region are already selected. + */ +void +Editor::select_all_within (framepos_t start, framepos_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op, bool preserve_if_selected) { - list touched; - list::size_type n = 0; - TrackViewList touched_tracks; + list found; for (TrackViewList::const_iterator iter = tracklist.begin(); iter != tracklist.end(); ++iter) { + if ((*iter)->hidden()) { continue; } - n = touched.size(); - - (*iter)->get_selectables (start, end, top, bot, touched); - - if (n != touched.size()) { - touched_tracks.push_back (*iter); - } + (*iter)->get_selectables (start, end, top, bot, found); } - if (touched.empty()) { - return false; + if (found.empty()) { + return; } - if (!touched_tracks.empty()) { + if (preserve_if_selected && op != Selection::Toggle) { + list::iterator i = found.begin(); + while (i != found.end() && (*i)->get_selected()) { + ++i; + } - switch (op) { - case Selection::Add: - selection->add (touched_tracks); - break; - case Selection::Toggle: - selection->toggle (touched_tracks); - break; - case Selection::Set: - selection->set (touched_tracks); - break; - case Selection::Extend: - /* not defined yet */ - break; + if (i == found.end()) { + return; } } begin_reversible_command (_("select all within")); switch (op) { case Selection::Add: - selection->add (touched); + selection->add (found); break; case Selection::Toggle: - selection->toggle (touched); + selection->toggle (found); break; case Selection::Set: - selection->set (touched); + selection->set (found); break; case Selection::Extend: /* not defined yet */ break; } - - commit_reversible_command (); - return !touched.empty(); + commit_reversible_command (); } void @@ -1044,7 +1529,7 @@ Editor::set_selection_from_region () return; } - selection->set (0, selection->regions.start(), selection->regions.end_frame()); + selection->set (selection->regions.start(), selection->regions.end_frame()); if (!Profile->get_sae()) { set_mouse_mode (Editing::MouseRange, false); } @@ -1055,7 +1540,7 @@ Editor::set_selection_from_punch() { Location* location; - if ((location = session->locations()->auto_punch_location()) == 0) { + if ((location = _session->locations()->auto_punch_location()) == 0) { return; } @@ -1067,7 +1552,7 @@ Editor::set_selection_from_loop() { Location* location; - if ((location = session->locations()->auto_loop_location()) == 0) { + if ((location = _session->locations()->auto_loop_location()) == 0) { return; } set_selection_from_range (*location); @@ -1077,7 +1562,7 @@ void Editor::set_selection_from_range (Location& loc) { begin_reversible_command (_("set selection from range")); - selection->set (0, loc.start(), loc.end()); + selection->set (loc.start(), loc.end()); commit_reversible_command (); if (!Profile->get_sae()) { @@ -1094,14 +1579,14 @@ Editor::select_all_selectables_using_time_selection () return; } - nframes64_t start = selection->time[clicked_selection].start; - nframes64_t end = selection->time[clicked_selection].end; + framepos_t start = selection->time[clicked_selection].start; + framepos_t end = selection->time[clicked_selection].end; if (end - start < 1) { return; } - TrackSelection* ts; + TrackViewList* ts; if (selection->tracks.empty()) { ts = &track_views; @@ -1125,7 +1610,7 @@ Editor::select_all_selectables_using_time_selection () void Editor::select_all_selectables_using_punch() { - Location* location = session->locations()->auto_punch_location(); + Location* location = _session->locations()->auto_punch_location(); list touched; if (location == 0 || (location->end() - location->start() <= 1)) { @@ -1133,7 +1618,7 @@ Editor::select_all_selectables_using_punch() } - TrackSelection* ts; + TrackViewList* ts; if (selection->tracks.empty()) { ts = &track_views; @@ -1156,7 +1641,7 @@ Editor::select_all_selectables_using_punch() void Editor::select_all_selectables_using_loop() { - Location* location = session->locations()->auto_loop_location(); + Location* location = _session->locations()->auto_loop_location(); list touched; if (location == 0 || (location->end() - location->start() <= 1)) { @@ -1164,7 +1649,7 @@ Editor::select_all_selectables_using_loop() } - TrackSelection* ts; + TrackViewList* ts; if (selection->tracks.empty()) { ts = &track_views; @@ -1187,17 +1672,15 @@ Editor::select_all_selectables_using_loop() void Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after) { - nframes64_t start; - nframes64_t end; + framepos_t start; + framepos_t end; list touched; if (after) { - begin_reversible_command (_("select all after cursor")); - start = cursor->current_frame ; - end = session->current_end_frame(); + start = cursor->current_frame; + end = _session->current_end_frame(); } else { if (cursor->current_frame > 0) { - begin_reversible_command (_("select all before cursor")); start = 0; end = cursor->current_frame - 1; } else { @@ -1205,8 +1688,23 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after) } } + if (_internal_editing) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + MidiRegionView* mrv = dynamic_cast(*i); + if (mrv) { + mrv->select_range (start, end); + } + } + return; + } + + if (after) { + begin_reversible_command (_("select all after cursor")); + } else { + begin_reversible_command (_("select all before cursor")); + } - TrackSelection* ts; + TrackViewList* ts; if (selection->tracks.empty()) { ts = &track_views; @@ -1227,17 +1725,15 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after) void Editor::select_all_selectables_using_edit (bool after) { - nframes64_t start; - nframes64_t end; + framepos_t start; + framepos_t end; list touched; if (after) { - begin_reversible_command (_("select all after edit")); start = get_preferred_edit_position(); - end = session->current_end_frame(); + end = _session->current_end_frame(); } else { if ((end = get_preferred_edit_position()) > 1) { - begin_reversible_command (_("select all before edit")); start = 0; end -= 1; } else { @@ -1245,8 +1741,21 @@ Editor::select_all_selectables_using_edit (bool after) } } + if (_internal_editing) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + MidiRegionView* mrv = dynamic_cast(*i); + mrv->select_range (start, end); + } + return; + } + + if (after) { + begin_reversible_command (_("select all after edit")); + } else { + begin_reversible_command (_("select all before edit")); + } - TrackSelection* ts; + TrackViewList* ts; if (selection->tracks.empty()) { ts = &track_views; @@ -1265,17 +1774,25 @@ Editor::select_all_selectables_using_edit (bool after) } void -Editor::select_all_selectables_between (bool within) +Editor::select_all_selectables_between (bool /*within*/) { - nframes64_t start; - nframes64_t end; + framepos_t start; + framepos_t end; list touched; if (!get_edit_op_range (start, end)) { return; } - TrackSelection* ts; + if (_internal_editing) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + MidiRegionView* mrv = dynamic_cast(*i); + mrv->select_range (start, end); + } + return; + } + + TrackViewList* ts; if (selection->tracks.empty()) { ts = &track_views; @@ -1296,26 +1813,30 @@ Editor::select_all_selectables_between (bool within) void Editor::select_range_between () { - nframes64_t start; - nframes64_t end; - + framepos_t start; + framepos_t end; + + if ( !selection->time.empty() ) { + selection->clear_time (); + } + if (!get_edit_op_range (start, end)) { return; } set_mouse_mode (MouseRange); - selection->set ((TimeAxisView*) 0, start, end); + selection->set (start, end); } bool -Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const +Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const { - nframes64_t m; + 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(); @@ -1325,14 +1846,14 @@ Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const if (!mouse_frame (m, ignored)) { /* mouse is not in a canvas, try playhead+selected marker. this is probably most true when using menus. - */ + */ if (selection->markers.empty()) { return false; } start = selection->markers.front()->position(); - end = session->audible_frame(); + end = _session->audible_frame(); } else { @@ -1341,44 +1862,44 @@ Editor::get_edit_op_range (nframes64_t& start, nframes64_t& end) const if (selection->markers.empty()) { /* use mouse + playhead */ start = m; - end = session->audible_frame(); + end = _session->audible_frame(); } else { /* use playhead + selected marker */ - start = session->audible_frame(); + start = _session->audible_frame(); end = selection->markers.front()->position(); } break; - + case EditAtMouse: /* use mouse + selected marker */ if (selection->markers.empty()) { start = m; - end = session->audible_frame(); + end = _session->audible_frame(); } else { start = selection->markers.front()->position(); end = m; } break; - + case EditAtSelectedMarker: /* use mouse + selected marker */ if (selection->markers.empty()) { - + MessageDialog win (_("No edit range defined"), - false, - MESSAGE_INFO, - BUTTONS_OK); + false, + MESSAGE_INFO, + BUTTONS_OK); win.set_secondary_text ( _("the edit point is Selected Marker\nbut there is no selected marker.")); - + win.set_default_response (RESPONSE_CLOSE); win.set_position (Gtk::WIN_POS_MOUSE); win.show_all(); - + win.run (); - + return false; // NO RANGE } start = selection->markers.front()->position(); @@ -1410,4 +1931,10 @@ Editor::deselect_all () selection->clear (); } - +long +Editor::select_range (framepos_t s, framepos_t e) +{ + selection->add (clicked_axisview); + selection->time.clear (); + return selection->set (s, e); +}