X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_selection.cc;h=7b08eaeaa6765aea2db48504efd9a6fa9a09037e;hb=44680aa1bb6c42d261e4b6424d5d76fd42f26624;hp=c2338347d2d4b85235bca3392c1bc7f5cc3d4c5d;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index c2338347d2..7b08eaeaa6 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -22,11 +22,13 @@ #include "pbd/stacktrace.h" -#include "ardour/session.h" +#include "ardour/midi_region.h" #include "ardour/playlist.h" -#include "ardour/route_group.h" #include "ardour/profile.h" -#include "ardour/midi_region.h" +#include "ardour/route_group.h" +#include "ardour/session.h" + +#include "control_protocol/control_protocol.h" #include "editor.h" #include "actions.h" @@ -51,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 @@ -177,27 +179,26 @@ Editor::select_all_tracks () * tracks, in which case nothing will happen unless `force' is true. */ void -Editor::set_selected_track_as_side_effect (Selection::Operation op, bool /*force*/) +Editor::set_selected_track_as_side_effect (Selection::Operation op) { if (!clicked_axisview) { return; } -#if 1 - if (!clicked_routeview) { - return; - } + if (!clicked_routeview) { + return; + } - bool had_tracks = !selection->tracks.empty(); - RouteGroup* group = clicked_routeview->route()->route_group(); - RouteGroup& arg (_session->all_route_group()); + 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); + selection->remove(*i); } } else if (group && group->is_active()) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { @@ -206,77 +207,64 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op, bool /*force } } 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); + 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); - } + } else { + selection->add (clicked_axisview); + } } - break; + 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. - */ + /* 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); + 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 { + } else { selection->add (clicked_axisview); - } - break; + } + break; case Selection::Set: - selection->clear(); + 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. - */ + /* 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); + 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 { + } else { selection->set (clicked_axisview); - } - break; + } + break; case Selection::Extend: selection->clear(); - cerr << ("Editor::set_selected_track_as_side_effect case Selection::Add not yet implemented\n"); - break; - } - -#else // the older version - - if (!selection->tracks.empty()) { - if (!selection->selected (clicked_axisview)) { - selection->add (clicked_axisview); - } - - } else if (force) { - selection->set (clicked_axisview); + break; } -#endif } void @@ -324,7 +312,7 @@ 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; @@ -332,13 +320,37 @@ Editor::set_selected_control_point_from_click (Selection::Operation op, bool /*n switch (op) { case Selection::Set: - selection->set (clicked_control_point); + if (press) { + selection->set (clicked_control_point); + } break; case Selection::Add: - selection->add (clicked_control_point); + if (press) { + selection->add (clicked_control_point); + } break; case Selection::Toggle: - selection->toggle (clicked_control_point); + /* 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 */ @@ -351,11 +363,11 @@ Editor::set_selected_control_point_from_click (Selection::Operation op, bool /*n 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 @@ -401,6 +413,63 @@ Editor::mapover_tracks (sigc::slot sl, TimeA } } +/** 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_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; + } + + set tracks; + tracks.insert (route_basis); + + 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 */ + + 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) { + + 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, RegionView * basis, vector* all_equivs) const { @@ -433,7 +502,7 @@ Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionVi void Editor::get_equivalent_regions (RegionView* basis, vector& equivalent_regions, PBD::PropertyID property) const { - mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_time_axis_view(), property); + 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 */ @@ -449,10 +518,9 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c vector eq; - mapover_tracks ( + mapover_tracks_with_unique_playlists ( sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq), - &(*i)->get_time_axis_view(), prop - ); + &(*i)->get_time_axis_view(), prop); for (vector::iterator j = eq.begin(); j != eq.end(); ++j) { equivalent.add (*j); @@ -464,7 +532,6 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c return equivalent; } - int Editor::get_regionview_count_from_region_list (boost::shared_ptr region) { @@ -504,7 +571,7 @@ Editor::get_regionview_count_from_region_list (boost::shared_ptr region) 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; @@ -519,7 +586,6 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, if (op == Selection::Toggle || op == Selection::Set) { - switch (op) { case Selection::Toggle: if (selection->selected (clicked_regionview)) { @@ -616,7 +682,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, /* 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(); @@ -626,7 +692,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } 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(); @@ -636,7 +702,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } 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(); @@ -646,8 +712,8 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } 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. */ @@ -713,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) { @@ -728,7 +794,7 @@ 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; @@ -744,7 +810,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, /* 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); @@ -754,7 +820,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, 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) { @@ -765,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); } @@ -779,7 +845,7 @@ 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. */ for (set::iterator t = relevant_tracks.begin(); t != relevant_tracks.end(); ++t) { @@ -804,7 +870,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op, } } - out: +out: return commit; } @@ -883,27 +949,41 @@ Editor::track_selection_changed () break; } + RouteNotificationListPtr routes (new RouteNotificationList); + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - bool yn = (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end()); + bool yn = (find (selection->tracks.begin(), selection->tracks.end(), *i) != selection->tracks.end()); - (*i)->set_selected (yn); + (*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 && + ((mouse_mode == MouseRange) || + ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) { + (*i)->reshow_selection (selection->time); + } else { + (*i)->hide_selection (); + } - 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 && - ((mouse_mode == MouseRange) || - ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) { - (*i)->reshow_selection (selection->time); - } else { - (*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 @@ -926,6 +1006,10 @@ Editor::time_selection_changed () } else { 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 */ @@ -952,19 +1036,6 @@ Editor::sensitize_all_region_actions (bool s) void Editor::sensitize_the_right_region_actions () { - if ((mouse_mode == MouseRange) || (mouse_mode != MouseObject && _join_object_range_state == JOIN_OBJECT_RANGE_RANGE)) { - sensitize_all_region_actions (false); - if (!selection->time.empty()) { - _region_actions->get_action("split-region")->set_sensitive (true); - } - return; - - } else if (mouse_mode != MouseObject) { - sensitize_all_region_actions (false); - return; - } - - /* We get here if we are in Object mode */ RegionSelection rs = get_regions_from_selection_and_entered (); sensitize_all_region_actions (!rs.empty ()); @@ -974,6 +1045,7 @@ Editor::sensitize_the_right_region_actions () /* 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; @@ -984,12 +1056,14 @@ Editor::sensitize_the_right_region_actions () bool have_opaque = false; bool have_non_opaque = false; bool have_not_at_natural_position = false; - bool have_envelope_visible = false; - bool have_envelope_invisible = 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) { @@ -998,6 +1072,9 @@ Editor::sensitize_the_right_region_actions () if (ar) { have_audio = true; + if (ar->n_channels() > 1) { + have_multichannel_audio = true; + } } if (boost::dynamic_pointer_cast (r)) { @@ -1037,20 +1114,6 @@ Editor::sensitize_the_right_region_actions () } if (ar) { - /* its a bit unfortunate that "envelope visible" is a view-only - property. we have to find the regionview to able to check - its current setting. - */ - - have_envelope_invisible = true; - - if (*i) { - AudioRegionView* arv = dynamic_cast (*i); - if (arv && arv->envelope_visible()) { - have_envelope_visible = true; - } - } - if (ar->envelope_active()) { have_envelope_active = true; } else { @@ -1060,6 +1123,18 @@ Editor::sensitize_the_right_region_actions () 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; + } } } @@ -1078,11 +1153,21 @@ Editor::sensitize_the_right_region_actions () _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) { @@ -1101,23 +1186,16 @@ Editor::sensitize_the_right_region_actions () if (have_audio) { - if (have_envelope_visible && !have_envelope_invisible) { - Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-visible"))->set_active (); - } else if (have_envelope_visible && have_envelope_invisible) { -// _region_actions->get_action("toggle-region-gain-envelope-visible")->set_inconsistent (); - } - 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) { -// _region_actions->get_action("toggle-region-gain-envelope-active")->set_inconsistent (); + // 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-visible")->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); @@ -1127,25 +1205,29 @@ Editor::sensitize_the_right_region_actions () _region_actions->get_action("reset-region-scale-amplitude")->set_sensitive (false); } - Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-lock"))->set_active (have_locked && !have_unlocked); + 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) { -// _region_actions->get_action("toggle-region-lock")->set_inconsistent (); + // a->set_inconsistent (); } - Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"))->set_active (have_position_lock_style_music && !have_position_lock_style_audio); + 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) { -// _region_actions->get_action("toggle-region-lock-style")->set_inconsistent (); + // a->set_inconsistent (); } - Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-mute"))->set_active (have_muted && !have_unmuted); + a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-mute")); + a->set_active (have_muted && !have_unmuted); if (have_muted && have_unmuted) { -// _region_actions->get_action("toggle-region-mute")->set_inconsistent (); + // a->set_inconsistent (); } - Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-opaque-region"))->set_active (have_opaque && !have_non_opaque); + 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) { -// _region_actions->get_action("toggle-opaque-region")->set_inconsistent (); + // a->set_inconsistent (); } if (!have_not_at_natural_position) { @@ -1159,6 +1241,29 @@ Editor::sensitize_the_right_region_actions () _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; @@ -1179,9 +1284,9 @@ Editor::region_selection_changed () (*i)->set_selected_regionviews (selection->regions); } - if (_region_selection_change_updates_region_list) { - _regions->set_selected (selection->regions); - } + if (_region_selection_change_updates_region_list) { + _regions->set_selected (selection->regions); + } _regions->block_change_connection (false); editor_regions_selection_changed_connection.block(false); @@ -1192,6 +1297,10 @@ 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()); + } } void @@ -1230,15 +1339,13 @@ Editor::select_all_in_track (Selection::Operation op) } void -Editor::select_all_internal_edit (Selection::Operation op) +Editor::select_all_internal_edit (Selection::Operation) { - /* currently limited to MIDI only */ - for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { MidiRegionView* mrv = dynamic_cast(*i); - if (mrv) { - mrv->select_all_notes (); - } + if (mrv) { + mrv->select_all_notes (); + } } } @@ -1247,10 +1354,10 @@ Editor::select_all (Selection::Operation op) { list touched; - if (_internal_editing) { - select_all_internal_edit (op); - return; - } + if (_internal_editing) { + select_all_internal_edit (op); + return; + } for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { if ((*iter)->hidden()) { @@ -1275,6 +1382,7 @@ Editor::select_all (Selection::Operation op) } commit_reversible_command (); } + void Editor::invert_selection_in_track () { @@ -1293,6 +1401,16 @@ 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; @@ -1311,9 +1429,7 @@ Editor::invert_selection () * 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 - ) +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 found; @@ -1510,17 +1626,15 @@ Editor::select_all_selectables_using_loop() void Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after) { - framepos_t start; + 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(); } else { if (cursor->current_frame > 0) { - begin_reversible_command (_("select all before cursor")); start = 0; end = cursor->current_frame - 1; } else { @@ -1528,6 +1642,21 @@ 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")); + } TrackViewList* ts; @@ -1550,17 +1679,15 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after) void Editor::select_all_selectables_using_edit (bool after) { - framepos_t start; + 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(); } else { if ((end = get_preferred_edit_position()) > 1) { - begin_reversible_command (_("select all before edit")); start = 0; end -= 1; } else { @@ -1568,6 +1695,19 @@ 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")); + } TrackViewList* ts; @@ -1590,7 +1730,7 @@ Editor::select_all_selectables_using_edit (bool after) void Editor::select_all_selectables_between (bool /*within*/) { - framepos_t start; + framepos_t start; framepos_t end; list touched; @@ -1598,6 +1738,14 @@ Editor::select_all_selectables_between (bool /*within*/) return; } + 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()) { @@ -1619,12 +1767,12 @@ Editor::select_all_selectables_between (bool /*within*/) void Editor::select_range_between () { - framepos_t start; + framepos_t start; framepos_t end; - if (mouse_mode == MouseRange && !selection->time.empty()) { - selection->clear_time (); - } + if (mouse_mode == MouseRange && !selection->time.empty()) { + selection->clear_time (); + } if (!get_edit_op_range (start, end)) { return; @@ -1652,7 +1800,7 @@ Editor::get_edit_op_range (framepos_t& start, framepos_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; @@ -1692,9 +1840,9 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const 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.")); @@ -1738,13 +1886,9 @@ Editor::deselect_all () } long -Editor::select_range_around_region (RegionView* rv) +Editor::select_range (framepos_t s, framepos_t e) { - assert (rv); - - selection->set (&rv->get_time_axis_view()); - + selection->add (clicked_axisview); selection->time.clear (); - boost::shared_ptr r = rv->region (); - return selection->set (r->position(), r->position() + r->length()); + return selection->set (s, e); }