}
long
-Selection::toggle (nframes_t start, nframes_t end)
+Selection::toggle (framepos_t start, framepos_t end)
{
AudioRangeComparator cmp;
if (find (regions.begin(), regions.end(), (*i)) == regions.end()) {
changed = regions.add ((*i));
if (Config->get_link_region_and_track_selection() && changed) {
- add (&(*i)->get_trackview());
+ add (&(*i)->get_time_axis_view());
}
}
}
if (find (regions.begin(), regions.end(), (*i)) == regions.end()) {
changed = regions.add ((*i));
if (Config->get_link_region_and_track_selection() && changed) {
- add (&(*i)->get_trackview());
+ add (&(*i)->get_time_axis_view());
}
}
}
Selection::add (RegionView* r)
{
if (find (regions.begin(), regions.end(), r) == regions.end()) {
- regions.add (r);
- if (Config->get_link_region_and_track_selection()) {
- add (&r->get_trackview());
- }
- RegionsChanged ();
+ bool changed = regions.add (r);
+ if (Config->get_link_region_and_track_selection() && changed) {
+ add (&r->get_time_axis_view());
+ }
+ if (changed) {
+ RegionsChanged ();
+ }
}
}
/* XXX should we do this? */
#if 0
if (Config->get_link_region_and_track_selection()) {
- add (&mrv->get_trackview());
+ add (&mrv->get_time_axis_view());
}
#endif
MidiRegionsChanged ();
}
long
-Selection::add (nframes_t start, nframes_t end)
+Selection::add (framepos_t start, framepos_t end)
{
AudioRangeComparator cmp;
}
void
-Selection::replace (uint32_t sid, nframes_t start, nframes_t end)
+Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
{
for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
if ((*i).id == sid) {
RegionsChanged ();
}
- if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) {
- remove (&r->get_trackview());
+ if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) {
+ remove (&r->get_time_axis_view());
}
}
#if 0
/* XXX fix this up ? */
- if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) {
- remove (&r->get_trackview());
+ if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) {
+ remove (&r->get_time_axis_view());
}
#endif
}
}
void
-Selection::remove (nframes_t /*start*/, nframes_t /*end*/)
+Selection::remove (framepos_t /*start*/, framepos_t /*end*/)
{
}
* the list of tracks it applies to.
*/
long
-Selection::set (nframes_t start, nframes_t end)
+Selection::set (framepos_t start, framepos_t end)
{
if ((start == 0 && end == 0) || end < start) {
return 0;
}
void
-MarkerSelection::range (nframes64_t& s, nframes64_t& e)
+MarkerSelection::range (framepos_t& s, framepos_t& e)
{
- s = max_frames;
+ s = max_framepos;
e = 0;
for (MarkerSelection::iterator i = begin(); i != end(); ++i) {
} else if (atv) {
XMLNode* t = node->add_child (X_("AutomationView"));
t->add_property (X_("id"), atoi (atv->parent_route()->id().to_s().c_str()));
- t->add_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->control()->parameter ()));
+ t->add_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->parameter ()));
}
}
assert (prop_id);
PBD::ID id (prop_id->value ());
RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
- assert (rtv);
- add (rtv);
+ if (rtv) {
+ add (rtv);
+ }
} else if ((*i)->name() == X_("AutomationView")) {
PBD::ID id (prop_id->value ());
RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
- assert (rtv);
-
- boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ()));
+
+ if (rtv) {
+ boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ()));
- /* the automation could be for an entity that was never saved
- in the session file. Don't freak out if we can't find
- it.
- */
-
- if (atv) {
- add (atv.get());
- }
+ /* the automation could be for an entity that was never saved
+ in the session file. Don't freak out if we can't find
+ it.
+ */
+
+ if (atv) {
+ add (atv.get());
+ }
+ }
}
}
return 0;
}
+
+void
+Selection::remove_regions (TimeAxisView* t)
+{
+ RegionSelection::iterator i = regions.begin();
+ while (i != regions.end ()) {
+ RegionSelection::iterator tmp = i;
+ ++tmp;
+
+ if (&(*i)->get_time_axis_view() == t) {
+ remove (*i);
+ }
+
+ i = tmp;
+ }
+}