void
Selection::toggle (boost::shared_ptr<Playlist> pl)
{
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
PlaylistSelection::iterator i;
void
Selection::toggle (const MidiNoteSelection& midi_note_list)
{
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
for (MidiNoteSelection::const_iterator i = midi_note_list.begin(); i != midi_note_list.end(); ++i) {
toggle ((*i));
void
Selection::toggle (RegionView* r)
{
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
RegionSelection::iterator i;
void
Selection::toggle (MidiRegionView* mrv)
{
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
MidiRegionSelection::iterator i;
void
Selection::toggle (vector<RegionView*>& r)
{
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
RegionSelection::iterator i;
}
long
-Selection::toggle (framepos_t start, framepos_t end)
+Selection::toggle (samplepos_t start, samplepos_t end)
{
- clear_objects(); //enforce object/range exclusivity
+ clear_objects(); // enforce object/range exclusivity
AudioRangeComparator cmp;
{
if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) {
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
pl->use ();
playlists.push_back(pl);
PlaylistsChanged ();
}
if (changed) {
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
PlaylistsChanged ();
}
}
const MidiNoteSelection::const_iterator e = midi_list.end();
if (!midi_list.empty()) {
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
midi_notes.insert (midi_notes.end(), b, e);
MidiNotesChanged ();
}
}
if (changed) {
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
RegionsChanged ();
}
}
}
if (changed) {
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
RegionsChanged ();
}
}
if (find (regions.begin(), regions.end(), r) == regions.end()) {
bool changed = regions.add (r);
if (changed) {
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
RegionsChanged ();
}
}
{
DEBUG_TRACE(DEBUG::Selection, string_compose("Selection::add MRV %1\n", mrv));
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
if (find (midi_regions.begin(), midi_regions.end(), mrv) == midi_regions.end()) {
midi_regions.push_back (mrv);
}
long
-Selection::add (framepos_t start, framepos_t end)
+Selection::add (samplepos_t start, samplepos_t end)
{
- clear_objects(); //enforce object/range exclusivity
+ clear_objects(); // enforce object/range exclusivity
AudioRangeComparator cmp;
}
void
-Selection::move_time (framecnt_t distance)
+Selection::move_time (samplecnt_t distance)
{
if (distance == 0) {
return;
}
void
-Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
+Selection::replace (uint32_t sid, samplepos_t start, samplepos_t end)
{
- clear_objects(); //enforce object/range exclusivity
+ clear_objects(); // enforce object/range exclusivity
for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
if ((*i).id == sid) {
}
if (!cl->empty()) {
- clear_time(); //enforce object/range exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce object/range exclusivity
+ clear_tracks(); // enforce object/track exclusivity
}
/* The original may change so we must store a copy (not a pointer) here.
}
void
-Selection::remove (framepos_t /*start*/, framepos_t /*end*/)
+Selection::remove (samplepos_t /*start*/, samplepos_t /*end*/)
{
}
Selection::set (const MidiNoteSelection& midi_list)
{
if (!midi_list.empty()) {
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
}
clear_objects ();
add (midi_list);
Selection::set (boost::shared_ptr<Playlist> playlist)
{
if (playlist) {
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
}
clear_objects ();
add (playlist);
Selection::set (const list<boost::shared_ptr<Playlist> >& pllist)
{
if (!pllist.empty()) {
- clear_time(); //enforce region/object exclusivity
+ clear_time(); // enforce region/object exclusivity
}
clear_objects ();
add (pllist);
Selection::set (const RegionSelection& rs)
{
if (!rs.empty()) {
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
}
clear_objects();
regions = rs;
Selection::set (MidiRegionView* mrv)
{
if (mrv) {
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
}
clear_objects ();
add (mrv);
Selection::set (RegionView* r, bool /*also_clear_tracks*/)
{
if (r) {
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
}
clear_objects ();
add (r);
Selection::set (vector<RegionView*>& v)
{
if (!v.empty()) {
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
}
clear_objects();
* the list of tracks it applies to.
*/
long
-Selection::set (framepos_t start, framepos_t end)
+Selection::set (samplepos_t start, samplepos_t end)
{
- clear_objects(); //enforce region/object exclusivity
+ clear_objects(); // enforce region/object exclusivity
clear_time();
if ((start == 0 && end == 0) || end < start) {
* @param end New end time.
*/
void
-Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
+Selection::set_preserving_all_ranges (samplepos_t start, samplepos_t end)
{
- clear_objects(); //enforce region/object exclusivity
+ clear_objects(); // enforce region/object exclusivity
if ((start == 0 && end == 0) || (end < start)) {
return;
void
Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
{
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
clear_objects();
add (ac);
bool
Selection::empty (bool internal_selection)
{
- bool object_level_empty = regions.empty () &&
+ bool object_level_empty = regions.empty () &&
tracks.empty () &&
points.empty () &&
playlists.empty () &&
void
Selection::toggle (ControlPoint* cp)
{
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
cp->set_selected (!cp->selected ());
PointSelection::iterator i = find (points.begin(), points.end(), cp);
void
Selection::toggle (vector<ControlPoint*> const & cps)
{
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
for (vector<ControlPoint*>::const_iterator i = cps.begin(); i != cps.end(); ++i) {
toggle (*i);
void
Selection::toggle (list<Selectable*> const & selectables)
{
- clear_time(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time(); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
RegionView* rv;
ControlPoint* cp;
void
Selection::set (list<Selectable*> const & selectables)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
clear_objects ();
add (selectables);
void
Selection::add (PointSelection const & s)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
points.push_back (*i);
void
Selection::add (list<Selectable*> const & selectables)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
RegionView* rv;
ControlPoint* cp;
void
Selection::add (ControlPoint* cp)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
cp->set_selected (true);
points.push_back (cp);
void
Selection::add (vector<ControlPoint*> const & cps)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
for (vector<ControlPoint*>::const_iterator i = cps.begin(); i != cps.end(); ++i) {
(*i)->set_selected (true);
void
Selection::set (ControlPoint* cp)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
if (cp->selected () && points.size () == 1) {
return;
void
Selection::set (ArdourMarker* m)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
markers.clear ();
add (m);
void
Selection::add (ArdourMarker* m)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); //enforce region/object exclusivity
+ clear_tracks(); //enforce object/track exclusivity
if (find (markers.begin(), markers.end(), m) == markers.end()) {
markers.push_back (m);
void
Selection::add (const list<ArdourMarker*>& m)
{
- clear_time (); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
+ clear_time (); // enforce region/object exclusivity
+ clear_tracks(); // enforce object/track exclusivity
markers.insert (markers.end(), m.begin(), m.end());
markers.sort ();
}
void
-MarkerSelection::range (framepos_t& s, framepos_t& e)
+MarkerSelection::range (samplepos_t& s, samplepos_t& e)
{
- s = max_framepos;
+ s = max_samplepos;
e = 0;
for (MarkerSelection::iterator i = begin(); i != end(); ++i) {
XMLNode* node = new XMLNode (X_("Selection"));
for (TrackSelection::const_iterator i = tracks.begin(); i != tracks.end(); ++i) {
- RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
+ StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (*i);
AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (*i);
- if (rtv) {
- XMLNode* t = node->add_child (X_("RouteView"));
- t->set_property (X_("id"), rtv->route()->id ());
+ if (stv) {
+ XMLNode* t = node->add_child (X_("StripableView"));
+ t->set_property (X_("id"), stv->stripable()->id ());
} else if (atv) {
XMLNode* t = node->add_child (X_("AutomationView"));
t->set_property (X_("id"), atv->parent_stripable()->id ());
}
}
- for (RegionSelection::const_iterator i = regions.begin(); i != regions.end(); ++i) {
- XMLNode* r = node->add_child (X_("Region"));
- r->set_property (X_("id"), (*i)->region ()->id ());
+ if (!regions.empty()) {
+ XMLNode* parent = node->add_child (X_("Regions"));
+ for (RegionSelection::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+ XMLNode* r = parent->add_child (X_("Region"));
+ r->set_property (X_("id"), (*i)->region ()->id ());
+ }
}
/* midi region views have thir own internal selection. */
- list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > > rid_notes;
+ list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > > rid_notes;
editor->get_per_region_note_selection (rid_notes);
- list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >::iterator rn_it;
+ list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > >::iterator rn_it;
for (rn_it = rid_notes.begin(); rn_it != rid_notes.end(); ++rn_it) {
XMLNode* n = node->add_child (X_("MIDINotes"));
n->set_property (X_("region-id"), (*rn_it).first);
- for (std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) {
+ for (std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) {
XMLNode* nc = n->add_child(X_("note"));
nc->set_property(X_("note-id"), (*i)->id());
}
clear_time ();
clear_markers ();
- RegionSelection selected_regions;
-
/* NOTE: stripable/time-axis-view selection is saved/restored by
* ARDOUR::CoreSelection, not this Selection object
*/
XMLNodeList children = node.children ();
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
- if ((*i)->name() == X_("Region")) {
+ if ((*i)->name() == X_("Regions")) {
+ RegionSelection selected_regions;
+ XMLNodeList children = (*i)->children ();
+ for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) {
+ PBD::ID id;
- if (!(*i)->get_property (X_("id"), id)) {
- assert(false);
+ if (!(*ci)->get_property (X_("id"), id)) {
+ continue;
+ }
+
+ RegionSelection rs;
+ editor->get_regionviews_by_id (id, rs);
+
+ if (!rs.empty ()) {
+ for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) {
+ selected_regions.push_back (*i);
+ }
+ } else {
+ /*
+ regionviews haven't been constructed - stash the region IDs
+ so we can identify them in Editor::region_view_added ()
+ */
+ regions.pending.push_back (id);
+ }
}
- RegionSelection rs;
- editor->get_regionviews_by_id (id, rs);
-
- if (!rs.empty ()) {
- selected_regions.insert (selected_regions.end(), rs.begin(), rs.end());
- } else {
- /*
- regionviews haven't been constructed - stash the region IDs
- so we can identify them in Editor::region_view_added ()
- */
- regions.pending.push_back (id);
+ if (!selected_regions.empty()) {
+ add (selected_regions);
}
} else if ((*i)->name() == X_("MIDINotes")) {
pending_midi_note_selection.push_back (make_pair (id, notes));
}
- } else if ((*i)->name() == X_("ControlPoint")) {
+ } else if ((*i)->name() == X_("ControlPoint")) {
XMLProperty const * prop_type = (*i)->property (X_("type"));
assert(prop_type);
assert(false);
}
- RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (route_id); // XXX may also be VCA
+ StripableTimeAxisView* stv = editor->get_stripable_time_axis_by_id (route_id);
vector <ControlPoint *> cps;
- if (rtv) {
- boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().from_symbol (param));
+ if (stv) {
+ boost::shared_ptr<AutomationTimeAxisView> atv = stv->automation_child (EventTypeMap::instance().from_symbol (param));
if (atv) {
list<boost::shared_ptr<AutomationLine> > lines = atv->lines();
for (list<boost::shared_ptr<AutomationLine> > ::iterator li = lines.begin(); li != lines.end(); ++li) {
}
}
- } else if ((*i)->name() == X_("AudioRange")) {
- framepos_t start;
- framepos_t end;
+ } else if ((*i)->name() == X_("AudioRange")) {
+ samplepos_t start;
+ samplepos_t end;
if (!(*i)->get_property (X_("start"), start) || !(*i)->get_property (X_("end"), end)) {
assert(false);
}
- set_preserving_all_ranges (start, end);
+
+ add (start, end);
} else if ((*i)->name() == X_("AutomationView")) {
assert (false);
}
- RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
+ StripableTimeAxisView* stv = editor->get_stripable_time_axis_by_id (id);
- if (rtv) {
- boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().from_symbol (param));
+ if (stv) {
+ boost::shared_ptr<AutomationTimeAxisView> atv = stv->automation_child (EventTypeMap::instance().from_symbol (param));
/* the automation could be for an entity that was never saved
in the session file. Don't freak out if we can't find
}
- // now add regions to selection at once
- add (selected_regions);
-
return 0;
}
void
Selection::toggle (TimeAxisView* track)
{
- if (dynamic_cast<VCATimeAxisView*> (track)) {
- return;
- }
-
TrackViewList tr;
tr.push_back (track);
toggle (tr);
void
Selection::add (TimeAxisView* track)
{
- if (dynamic_cast<VCATimeAxisView*> (track)) {
- return;
- }
-
TrackViewList tr;
tr.push_back (track);
add (tr);
void
Selection::remove (TimeAxisView* track)
{
- if (dynamic_cast<VCATimeAxisView*> (track)) {
- return;
- }
-
TrackViewList tvl;
tvl.push_back (track);
remove (tvl);
void
Selection::set (TimeAxisView* track)
{
- if (dynamic_cast<VCATimeAxisView*> (track)) {
- return;
- }
-
TrackViewList tvl;
tvl.push_back (track);
set (tvl);
CoreSelection& selection (editor->session()->selection());
if (selection.selected()) {
- clear_objects(); // enforce object/range exclusivity
+ clear_objects(); // enforce object/range exclusivity
}
tracks.clear (); // clear stage for whatever tracks are now selected (maybe none)
tracks.push_back (tav);
}
}
+
+ TracksChanged();
}
projects / ardour.git / blobdiff