X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_selection.cc;h=c5ba764af8a5f32d11389edc005b47615f07b393;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=a04ea77f068934af6d0103575534407041e9870e;hpb=639750f815a856bd9a61355e0d8e331e0fe215b6;p=ardour.git diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index a04ea77f06..c5ba764af8 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -30,6 +30,7 @@ #include "control_protocol/control_protocol.h" +#include "editor_drag.h" #include "editor.h" #include "actions.h" #include "audio_time_axis.h" @@ -40,8 +41,9 @@ #include "editor_regions.h" #include "editor_cursors.h" #include "midi_region_view.h" +#include "sfdb_ui.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -190,17 +192,10 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) group = clicked_routeview->route()->route_group(); } - bool had_tracks = !selection->tracks.empty(); - 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()) { + 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); @@ -210,11 +205,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) 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()) { + 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); @@ -227,14 +218,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) 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()) { + 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); @@ -247,14 +231,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) 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()) { + 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); @@ -325,15 +302,27 @@ Editor::set_selected_control_point_from_click (bool press, Selection::Operation if (!clicked_control_point) { return false; } + bool ret = false; switch (op) { case Selection::Set: - if (press) { + if (!selection->selected (clicked_control_point)) { selection->set (clicked_control_point); ret = true; + } else { + /* clicked on an already selected point */ + if (press) { + break; + } else { + if (selection->points.size() > 1) { + selection->set (clicked_control_point); + ret = true; + } + } } break; + case Selection::Add: if (press) { selection->add (clicked_control_point); @@ -459,7 +448,7 @@ Editor::mapover_tracks_with_unique_playlists (sigc::slot (*i); if (v && v->route()->route_group() == group) { - + boost::shared_ptr t = v->track(); if (t) { if (playlists.insert (t->playlist()).second) { @@ -632,7 +621,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) if (press) { if (selection->selected (clicked_routeview)) { - get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id); + get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id); } else { all_equivalent_regions.push_back (clicked_regionview); } @@ -650,7 +639,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) case Selection::Set: if (!selection->selected (clicked_regionview)) { - get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id); + get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id); selection->set (all_equivalent_regions); commit = true; } else { @@ -658,9 +647,12 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op) if (press) goto out; else { - get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id); - selection->set(all_equivalent_regions); - commit = true; + if (selection->regions.size() > 1) { + /* collapse region selection down to just this one region (and its equivalents) */ + get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id); + selection->set(all_equivalent_regions); + commit = true; + } } } break; @@ -799,7 +791,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 (); + int key = rtv->route()->presentation_info().order (); for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) { @@ -814,7 +806,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 (); + int d = artv->route()->presentation_info().order (); d -= key; @@ -830,7 +822,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 (); + int okey = closest->route()->presentation_info().order (); if (okey > key) { swap (okey, key); @@ -840,7 +832,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 (); + int k = artv->route()->presentation_info().order (); if (k >= okey && k <= key) { @@ -970,6 +962,7 @@ Editor::track_selection_changed () } RouteNotificationListPtr routes (new RouteNotificationList); + StripableNotificationListPtr stripables (new StripableNotificationList); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { @@ -993,6 +986,7 @@ Editor::track_selection_changed () RouteTimeAxisView* rtav = dynamic_cast (*i); if (rtav) { routes->push_back (rtav->route()); + stripables->push_back (rtav->route()); } } } @@ -1000,17 +994,39 @@ Editor::track_selection_changed () ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty()); /* notify control protocols */ - - ControlProtocol::TrackSelectionChanged (routes); + + ControlProtocol::StripableSelectionChanged (stripables); + + if (sfbrowser && _session && !_session->deletion_in_progress()) { + uint32_t audio_track_cnt = 0; + uint32_t midi_track_cnt = 0; + + for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) { + AudioTimeAxisView* atv = dynamic_cast(*x); + + if (atv) { + if (atv->is_audio_track()) { + audio_track_cnt++; + } + + } else { + MidiTimeAxisView* mtv = dynamic_cast(*x); + + if (mtv) { + if (mtv->is_midi_track()) { + midi_track_cnt++; + } + } + } + } + + sfbrowser->reset (audio_track_cnt, midi_track_cnt); + } } void Editor::time_selection_changed () { - if (Profile->get_sae()) { - return; - } - /* XXX this is superficially inefficient. Hide the selection in all * tracks, then show it in all selected tracks. * @@ -1033,6 +1049,19 @@ Editor::time_selection_changed () } else { ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true); } + + /* propagate into backend, but only when there is no drag or we are at + * the end of a drag, otherwise this is too expensive (could case a + * locate per mouse motion event. + */ + + if (_session && !_drags->active()) { + if (selection->time.length() != 0) { + _session->set_range_selection (selection->time.start(), selection->time.end_frame()); + } else { + _session->clear_range_selection (); + } + } } /** Set all region actions to have a given sensitivity */ @@ -1059,7 +1088,6 @@ Editor::sensitize_all_region_actions (bool s) void Editor::sensitize_the_right_region_actions () { - RegionSelection rs = get_regions_from_selection_and_entered (); sensitize_all_region_actions (!rs.empty ()); @@ -1089,6 +1117,7 @@ Editor::sensitize_the_right_region_actions () bool have_inactive_fade_out = false; bool have_active_fade_in = false; bool have_active_fade_out = false; + bool have_transients = false; for (list::const_iterator i = rs.begin(); i != rs.end(); ++i) { @@ -1144,6 +1173,10 @@ Editor::sensitize_the_right_region_actions () have_not_at_natural_position = true; } + if (r->has_transients ()){ + have_transients = true; + } + if (ar) { if (ar->envelope_active()) { have_envelope_active = true; @@ -1169,6 +1202,8 @@ Editor::sensitize_the_right_region_actions () } } + _region_actions->get_action("split-region-at-transients")->set_sensitive (have_transients); + 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); @@ -1197,6 +1232,7 @@ Editor::sensitize_the_right_region_actions () _region_actions->get_action("quantize-region")->set_sensitive (false); _region_actions->get_action("legatize-region")->set_sensitive (false); _region_actions->get_action("remove-overlap")->set_sensitive (false); + _region_actions->get_action("transform-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); @@ -1230,10 +1266,13 @@ Editor::sensitize_the_right_region_actions () } else { - _region_actions->get_action("analyze-region")->set_sensitive (false); + _region_actions->get_action("loudness-analyze-region")->set_sensitive (false); + _region_actions->get_action("spectral-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); + _region_actions->get_action("strip-region-silence")->set_sensitive (false); + _region_actions->get_action("show-rhythm-ferret")->set_sensitive (false); } @@ -1295,7 +1334,7 @@ Editor::sensitize_the_right_region_actions () 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; @@ -1305,7 +1344,7 @@ Editor::sensitize_the_right_region_actions () if (have_active_fade && have_inactive_fade) { // a->set_inconsistent (); } - + _ignore_region_action = false; _all_region_actions_sensitized = false; @@ -1333,16 +1372,31 @@ Editor::region_selection_changed () _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 (selection->regions.empty()) { + sensitize_all_region_actions (false); + } else { + 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()); } + + /* propagate into backend */ + + if (_session) { + if (!selection->regions.empty()) { + _session->set_object_selection (selection->regions.start(), selection->regions.end_frame()); + } else { + _session->clear_object_selection (); + } + } + } void @@ -1515,7 +1569,7 @@ Editor::select_all_within (framepos_t start, framepos_t end, double top, double if (preserve_if_selected && op != Selection::Toggle) { list::iterator i = found.begin(); - while (i != found.end() && (*i)->get_selected()) { + while (i != found.end() && (*i)->selected()) { ++i; } @@ -1553,7 +1607,7 @@ Editor::set_selection_from_region () /* find all the tracks that have selected regions */ set tracks; - + for (RegionSelection::const_iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) { tracks.insert (&(*r)->get_time_axis_view()); } @@ -1566,12 +1620,10 @@ Editor::set_selection_from_region () selection->set (selection->regions.start(), selection->regions.end_frame()); /* and select the tracks */ - + selection->set (tvl); - - if (!Profile->get_sae()) { - set_mouse_mode (Editing::MouseRange, false); - } + + set_mouse_mode (Editing::MouseRange, false); } void @@ -1604,9 +1656,7 @@ Editor::set_selection_from_range (Location& loc) selection->set (loc.start(), loc.end()); commit_reversible_selection_op (); - if (!Profile->get_sae()) { - set_mouse_mode (Editing::MouseRange, false); - } + set_mouse_mode (Editing::MouseRange, false); } void @@ -1762,17 +1812,17 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after) } void -Editor::select_all_selectables_using_edit (bool after) +Editor::select_all_selectables_using_edit (bool after, bool from_context_menu) { framepos_t start; framepos_t end; list touched; if (after) { - start = get_preferred_edit_position(EDIT_IGNORE_NONE, true); + start = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu); end = _session->current_end_frame(); } else { - if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, true)) > 1) { + if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu)) > 1) { start = 0; end -= 1; } else { @@ -1889,7 +1939,7 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const end = 0; return false; } - + // if (!mouse_frame (m, ignored)) { // /* mouse is not in a canvas, try playhead+selected marker. // this is probably most true when using menus.