/*
- 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
*/
#include <algorithm>
-#include <stdlib.h>
+#include <cstdlib>
-#include <pbd/stacktrace.h>
+#include "pbd/stacktrace.h"
-#include <ardour/diskstream.h>
-#include <ardour/playlist.h>
-#include <ardour/route_group.h>
-#include <ardour/profile.h>
+#include "ardour/session.h"
+#include "ardour/playlist.h"
+#include "ardour/route_group.h"
+#include "ardour/profile.h"
#include "editor.h"
#include "actions.h"
#include "audio_streamview.h"
#include "automation_line.h"
#include "control_point.h"
+#include "editor_regions.h"
#include "i18n.h"
using namespace std;
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
struct TrackViewByPositionSorter
{
bool operator() (const TimeAxisView* a, const TimeAxisView *b) {
- return a->y_position < b->y_position;
+ return a->y_position() < b->y_position();
}
};
} 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;
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;
} 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()) {
}
}
}
-
+
if (!to_be_added.empty()) {
selection->add (to_be_added);
return true;
}
-
+
return false;
}
void
Editor::select_all_tracks ()
{
- selection->set (track_views);
+ TrackViewList visible_views;
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ if ((*i)->marked_for_display()) {
+ visible_views.push_back (*i);
+ }
+ }
+ 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, bool /*force*/)
{
- if (!clicked_routeview) {
+ if (!clicked_axisview) {
return;
}
+#if 1
+ if (!clicked_routeview) {
+ return;
+ }
+
+ 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;
+
+ 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();
+ 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_routeview)) {
- selection->add (clicked_routeview);
+ if (!selection->selected (clicked_axisview)) {
+ selection->add (clicked_axisview);
}
} else if (force) {
- selection->set (clicked_routeview);
+ selection->set (clicked_axisview);
}
+#endif
}
void
case Selection::Set:
selection->set (&view);
break;
-
+
case Selection::Extend:
extend_selection_to_track (view);
break;
if (!clicked_routeview) {
return;
}
-
+
if (!press) {
return;
}
}
bool
-Editor::set_selected_control_point_from_click (Selection::Operation op, bool no_remove)
+Editor::set_selected_control_point_from_click (Selection::Operation op, bool /*no_remove*/)
{
if (!clicked_control_point) {
return false;
}
+
+ switch (op) {
+ case Selection::Set:
+ selection->set (clicked_control_point);
+ break;
+ case Selection::Add:
+ selection->add (clicked_control_point);
+ break;
+ case Selection::Toggle:
+ selection->toggle (clicked_control_point);
+ break;
+ case Selection::Extend:
+ /* XXX */
+ break;
+ }
- /* select this point and any others that it represents */
-
- double y1, y2;
- nframes_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;
-
- return select_all_within (x1, x2, y1, y2, selection->tracks, op);
+ return true;
}
void
-Editor::get_relevant_tracks (set<RouteTimeAxisView*>& relevant_tracks)
+Editor::get_onscreen_tracks (TrackViewList& tvl)
{
- /* step one: get all selected tracks and all tracks in the relevant edit groups */
-
- for (TrackSelection::iterator ti = selection->tracks.begin(); ti != selection->tracks.end(); ++ti) {
-
- RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*ti);
-
- if (!rtv) {
- continue;
- }
-
- RouteGroup* group = rtv->route()->edit_group();
-
- if (group && group->is_active()) {
-
- /* active group for this track, loop over all tracks and get every member of the group */
-
- for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-
- RouteTimeAxisView* trtv;
-
- if ((trtv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
-
- if (trtv->route()->edit_group() == group) {
- relevant_tracks.insert (trtv);
- }
- }
- }
- } else {
- relevant_tracks.insert (rtv);
- }
- }
+ 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 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<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis) const
+Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, PBD::PropertyID prop) const
{
RouteTimeAxisView* route_basis = dynamic_cast<RouteTimeAxisView*> (basis);
+
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<RouteTimeAxisView*> 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();
+
+ 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<RouteTimeAxisView*> (*i);
- if (v && v->route()->edit_group() == group) {
+ if (v && v->route()->route_group() == group) {
tracks.insert (v);
}
}
/* call the slots */
uint32_t const sz = tracks.size ();
+
for (set<RouteTimeAxisView*>::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<RegionView*>* all_equivs) const
+Editor::mapped_get_equivalent_regions (RouteTimeAxisView& tv, uint32_t, RegionView * basis, vector<RegionView*>* all_equivs) const
{
boost::shared_ptr<Playlist> pl;
vector<boost::shared_ptr<Region> > results;
RegionView* marv;
- boost::shared_ptr<Diskstream> ds;
+ boost::shared_ptr<Track> tr;
- if ((ds = tv.get_diskstream()) == 0) {
+ if ((tr = tv.track()) == 0) {
/* bus */
return;
}
return;
}
- if ((pl = ds->playlist()) != 0) {
+ if ((pl = tr->playlist()) != 0) {
pl->get_equivalent_regions (basis->region(), results);
}
}
void
-Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& equivalent_regions) const
+Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& 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 (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<RegionView*> eq;
+
+ mapover_tracks (
+ sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq),
+ &(*i)->get_time_axis_view(), prop
+ );
+
+ for (vector<RegionView*>::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> region)
+{
+ int region_count = 0;
+
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+
+ RouteTimeAxisView* tatv;
+
+ if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
+
+ boost::shared_ptr<Playlist> pl;
+ vector<boost::shared_ptr<Region> > results;
+ RegionView* marv;
+ boost::shared_ptr<Track> tr;
+
+ if ((tr = tatv->track()) == 0) {
+ /* bus */
+ continue;
+ }
+
+ if ((pl = (tr->playlist())) != 0) {
+ pl->get_region_list_equivalent_regions (region, results);
+ }
+
+ for (vector<boost::shared_ptr<Region> >::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, bool /*no_track_remove*/)
{
vector<RegionView*> all_equivalent_regions;
bool commit = false;
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) {
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 */
} else if (op == Selection::Extend) {
list<Selectable*> results;
- nframes_t last_frame;
- nframes_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()) {
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:
if (last_frame < clicked_regionview->region()->first_frame()) {
first_frame = clicked_regionview->region()->first_frame();
}
break;
-
+
case OverlapExternal:
if (last_frame < clicked_regionview->region()->first_frame()) {
first_frame = last_frame;
first_frame = clicked_regionview->region()->first_frame();
}
break;
-
+
case OverlapInternal:
if (last_frame < clicked_regionview->region()->first_frame()) {
first_frame = last_frame;
first_frame = clicked_regionview->region()->first_frame();
}
break;
-
+
case OverlapStart:
case OverlapEnd:
/* nothing to do except add clicked region to selection, since it
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();
/* 2. find all the tracks we should select in */
set<RouteTimeAxisView*> relevant_tracks;
- set<RouteTimeAxisView*> already_in_selection;
- get_relevant_tracks (relevant_tracks);
+ for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+ RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
+ if (r) {
+ relevant_tracks.insert (r);
+ }
+ }
+
+ set<RouteTimeAxisView*> 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<RouteTimeAxisView*> (&entered_regionview->get_time_axis_view());
+ RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&clicked_regionview->get_time_axis_view());
if (rtv) {
if (result.second) {
/* newly added to already_in_selection */
-
int d = artv->route()->order_key ("editor");
-
+
d -= key;
-
+
if (abs (d) < distance) {
distance = abs (d);
closest = artv;
}
}
}
-
+
if (closest) {
/* now add all tracks between that one and this one */
-
+
int okey = closest->route()->order_key ("editor");
-
+
if (okey > key) {
swap (okey, key);
}
-
+
for (TrackViewList::iterator x = track_views.begin(); x != track_views.end(); ++x) {
RouteTimeAxisView* artv = dynamic_cast<RouteTimeAxisView*>(*x);
if (artv && artv != rtv) {
one that was clicked.
*/
- get_relevant_tracks (relevant_tracks);
-
for (set<RouteTimeAxisView*>::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<RegionView*> regions;
-
+
for (list<Selectable*>::iterator x = results.begin(); x != results.end(); ++x) {
RegionView* arv;
}
begin_reversible_command (_("set selected regions"));
-
+
switch (op) {
case Selection::Toggle:
/* XXX this is not correct */
}
bool
-Editor::set_selected_regionview_from_map_event (GdkEventAny* ev, StreamView* sv, boost::weak_ptr<Region> weak_r)
+Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView* sv, boost::weak_ptr<Region> weak_r)
{
RegionView* rv;
boost::shared_ptr<Region> r (weak_r.lock());
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 () ;
void
Editor::track_selection_changed ()
{
- switch (selection->tracks.size()){
+ switch (selection->tracks.size()) {
case 0:
break;
default:
}
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);
- } else {
- (*i)->set_selected (false);
- }
- }
+
+ 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 &&
+ ((mouse_mode == MouseRange) ||
+ ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
+ (*i)->reshow_selection (selection->time);
+ } else {
+ (*i)->hide_selection ();
+ }
+ }
ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, !selection->tracks.empty());
}
(*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()) {
} else {
ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, true);
}
-
}
void
void
Editor::region_selection_changed ()
{
+ _regions->block_change_connection (true);
+ editor_regions_selection_changed_connection.block(true);
+
+ 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);
}
-
+
+ if (_region_selection_change_updates_region_list) {
+ _regions->set_selected (selection->regions);
+ }
+
sensitize_the_right_region_actions (!selection->regions.empty());
- zoomed_to_region = false;
+ _regions->block_change_connection (false);
+ editor_regions_selection_changed_connection.block(false);
}
void
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:
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) {
if (!clicked_routeview) {
return;
}
-
+
clicked_routeview->get_inverted_selectables (*selection, touched);
selection->set (touched);
}
Editor::invert_selection ()
{
list<Selectable *> touched;
-
+
for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
if ((*iter)->hidden()) {
continue;
selection->set (touched);
}
+/** @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.
+ */
bool
-Editor::select_all_within (nframes_t start, nframes_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op)
+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<Selectable*> touched;
- list<Selectable*>::size_type n = 0;
- TrackViewList touched_tracks;
+ list<Selectable*> 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()) {
+ if (found.empty()) {
return false;
}
- if (!touched_tracks.empty()) {
+ if (preserve_if_selected && op != Selection::Toggle) {
+ list<Selectable*>::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 false;
}
}
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();
+ return !found.empty();
}
void
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);
}
{
Location* location;
- if ((location = session->locations()->auto_punch_location()) == 0) {
+ if ((location = _session->locations()->auto_punch_location()) == 0) {
return;
}
{
Location* location;
- if ((location = session->locations()->auto_loop_location()) == 0) {
+ if ((location = _session->locations()->auto_loop_location()) == 0) {
return;
}
set_selection_from_range (*location);
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()) {
return;
}
- nframes_t start = selection->time[clicked_selection].start;
- nframes_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;
void
Editor::select_all_selectables_using_punch()
{
- Location* location = session->locations()->auto_punch_location();
+ Location* location = _session->locations()->auto_punch_location();
list<Selectable *> touched;
if (location == 0 || (location->end() - location->start() <= 1)) {
}
- TrackSelection* ts;
+ TrackViewList* ts;
if (selection->tracks.empty()) {
ts = &track_views;
void
Editor::select_all_selectables_using_loop()
{
- Location* location = session->locations()->auto_loop_location();
+ Location* location = _session->locations()->auto_loop_location();
list<Selectable *> touched;
if (location == 0 || (location->end() - location->start() <= 1)) {
}
- TrackSelection* ts;
+ TrackViewList* ts;
if (selection->tracks.empty()) {
ts = &track_views;
}
void
-Editor::select_all_selectables_using_cursor (Cursor *cursor, bool after)
+Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
{
- nframes_t start;
- nframes_t end;
+ framepos_t start;
+ framepos_t end;
list<Selectable *> touched;
if (after) {
begin_reversible_command (_("select all after cursor"));
start = cursor->current_frame ;
- end = session->current_end_frame();
+ end = _session->current_end_frame();
} else {
if (cursor->current_frame > 0) {
begin_reversible_command (_("select all before cursor"));
}
- TrackSelection* ts;
+ TrackViewList* ts;
if (selection->tracks.empty()) {
ts = &track_views;
void
Editor::select_all_selectables_using_edit (bool after)
{
- nframes_t start;
- nframes_t end;
+ framepos_t start;
+ framepos_t end;
list<Selectable *> 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"));
}
- TrackSelection* ts;
+ TrackViewList* ts;
if (selection->tracks.empty()) {
ts = &track_views;
}
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<Selectable *> touched;
if (!get_edit_op_range (start, end)) {
return;
}
- TrackSelection* ts;
+ TrackViewList* ts;
if (selection->tracks.empty()) {
ts = &track_views;
void
Editor::select_range_between ()
{
- nframes64_t start;
- nframes64_t end;
-
+ framepos_t start;
+ framepos_t end;
+
+ if (mouse_mode == MouseRange && !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 */
}
start = selection->markers.front()->position();
- end = session->audible_frame();
+ end = _session->audible_frame();
} else {
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,
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();
selection->clear ();
}
-
+long
+Editor::select_range_around_region (RegionView* rv)
+{
+ assert (rv);
+
+ selection->set (&rv->get_time_axis_view());
+
+ selection->time.clear ();
+ boost::shared_ptr<Region> r = rv->region ();
+ return selection->set (r->position(), r->position() + r->length());
+}
projects / ardour.git / blobdiff