Selection::Selection (const PublicEditor* e)
: tracks (e)
, editor (e)
- , next_time_id (0)
+ , next_time_id (0)
+ , _no_tracks_changed (false)
{
clear ();
void (Selection::*marker_remove)(Marker*) = &Selection::remove;
Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, ui_bind (marker_remove, this, _1), gui_context());
-}
+}
#if 0
Selection&
if (!regions.empty()) {
regions.clear_all ();
RegionsChanged();
+ if (Config->get_link_region_and_track_selection()) {
+ clear_tracks ();
+ }
}
}
{
if (!tracks.empty()) {
tracks.clear ();
- TracksChanged();
+ if (!_no_tracks_changed) {
+ TracksChanged();
+ }
}
}
tracks.erase (i);
}
- TracksChanged();
+ if (!_no_tracks_changed) {
+ TracksChanged();
+ }
}
void
}
long
-Selection::toggle (nframes_t start, nframes_t end)
+Selection::toggle (framepos_t start, framepos_t end)
{
AudioRangeComparator cmp;
TrackViewList added = tracks.add (track_list);
if (!added.empty()) {
- TracksChanged ();
+ if (!_no_tracks_changed) {
+ TracksChanged ();
+ }
}
}
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) {
list<TimeAxisView*>::iterator i;
if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) {
tracks.erase (i);
- TracksChanged();
+ if (!_no_tracks_changed) {
+ TracksChanged();
+ }
}
}
}
if (changed) {
- TracksChanged();
+ if (!_no_tracks_changed) {
+ TracksChanged();
+ }
}
}
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*/)
{
}
Selection::set (RegionView* r, bool also_clear_tracks)
{
clear_regions ();
- if (also_clear_tracks) {
+ if (also_clear_tracks && !Config->get_link_region_and_track_selection()) {
+ /* clear_regions() will have done this if the link preference
+ * is enabled
+ */
clear_tracks ();
}
add (r);
* 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;
return time.front().id;
}
+/** Set the start and end of the range selection. If more than one range
+ * is currently selected, the start of the earliest range and the end of the
+ * latest range are set. If no range is currently selected, this method
+ * selects a single range from start to end.
+ *
+ * @param start New start time.
+ * @param end New end time.
+ */
+void
+Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
+{
+ if ((start == 0 && end == 0) || (end < start)) {
+ return;
+ }
+
+ if (time.empty ()) {
+ time.push_back (AudioRange (start, end, next_time_id++));
+ } else {
+ time.sort (AudioRangeComparator ());
+ time.front().start = start;
+ time.back().end = end;
+ }
+
+ time.consolidate ();
+
+ TimeChanged ();
+}
+
void
Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
{
if (Config->get_link_region_and_track_selection ()) {
clear_tracks ();
}
-
+
add (selectables);
}
Selection::add (const list<Marker*>& m)
{
markers.insert (markers.end(), m.begin(), m.end());
+ markers.sort ();
+ markers.unique ();
+
MarkersChanged ();
}
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) {
Selection::set_point_selection_from_line (AutomationLine const & line)
{
points.clear ();
-
+
AutomationRange current (DBL_MAX, 0, 1, 0, &line.trackview);
for (uint32_t i = 0; i < line.npoints(); ++i) {
double const size = cp->size ();
double const x_size = line.time_converter().from (line.trackview.editor().pixel_to_frame (size));
double const y_size = size / line.trackview.current_height ();
-
- double const x1 = x - x_size / 2;
+
+ double const x1 = max (0.0, x - x_size / 2);
double const x2 = x + x_size / 2;
- double const y1 = y - y_size / 2;
+ double const y1 = max (0.0, y - y_size / 2);
double const y2 = y + y_size / 2;
/* extend the current AutomationRange to put this point in */
/* XXX: not complete; just sufficient to get track selection state
so that re-opening plugin windows for editor mixer strips works
*/
-
+
XMLNode* node = new XMLNode (X_("Selection"));
for (TrackSelection::const_iterator i = tracks.begin(); i != tracks.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 ()));
}
}
+ for (MarkerSelection::const_iterator i = markers.begin(); i != markers.end(); ++i) {
+ XMLNode* t = node->add_child (X_("Marker"));
+
+ bool is_start;
+ Location* loc = editor->find_location_from_marker (*i, is_start);
+
+ t->add_property (X_("id"), atoi (loc->id().to_s().c_str()));
+ t->add_property (X_("start"), is_start ? X_("yes") : X_("no"));
+ }
+
return *node;
}
if (node.name() != X_("Selection")) {
return -1;
}
-
+
XMLNodeList children = node.children ();
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
if ((*i)->name() == X_("RouteView")) {
-
+
XMLProperty* prop_id = (*i)->property (X_("id"));
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")) {
-
+
XMLProperty* prop_id = (*i)->property (X_("id"));
XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
PBD::ID id (prop_id->value ());
RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
- assert (rtv);
+
+ 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());
+ }
+ }
+
+ } else if ((*i)->name() == X_("Marker")) {
+
+ XMLProperty* prop_id = (*i)->property (X_("id"));
+ XMLProperty* prop_start = (*i)->property (X_("start"));
+ assert (prop_id);
+ assert (prop_start);
+
+ PBD::ID id (prop_id->value ());
+ Marker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
+ if (m) {
+ add (m);
+ }
- 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());
- }
}
+
}
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;
+ }
+}
+
+void
+Selection::block_tracks_changed (bool yn)
+{
+ _no_tracks_changed = yn;
+}
projects / ardour.git / blobdiff