#include "pbd/error.h"
#include "pbd/stacktrace.h"
+#include "pbd/types_convert.h"
#include "ardour/playlist.h"
#include "ardour/rc_configuration.h"
+#include "ardour/evoral_types_convert.h"
+#include "control_protocol/control_protocol.h"
+
+#include "audio_region_view.h"
+#include "debug.h"
#include "gui_thread.h"
#include "midi_cut_buffer.h"
+#include "region_gain_line.h"
#include "region_view.h"
#include "selection.h"
#include "selection_templates.h"
#include "automation_time_axis.h"
#include "public_editor.h"
#include "control_point.h"
+#include "vca_time_axis.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
struct AudioRangeComparator {
- bool operator()(AudioRange a, AudioRange b) {
- return a.start < b.start;
- }
+ bool operator()(AudioRange a, AudioRange b) {
+ return a.start < b.start;
+ }
};
Selection::Selection (const PublicEditor* e)
: tracks (e)
, editor (e)
, next_time_id (0)
- , _no_tracks_changed (false)
{
clear ();
void (Selection::*track_remove)(TimeAxisView*) = &Selection::remove;
TimeAxisView::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (track_remove, this, _1), gui_context());
- void (Selection::*marker_remove)(Marker*) = &Selection::remove;
- Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context());
+ void (Selection::*marker_remove)(ArdourMarker*) = &Selection::remove;
+ ArdourMarker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context());
void (Selection::*point_remove)(ControlPoint*) = &Selection::remove;
ControlPoint::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (point_remove, this, _1), gui_context());
clear_midi_notes ();
clear_midi_regions ();
clear_markers ();
+ pending_midi_note_selection.clear();
}
void
-Selection::clear_objects ()
+Selection::clear_objects (bool with_signal)
{
- clear_regions ();
- clear_points ();
- clear_lines();
- clear_playlists ();
- clear_midi_notes ();
- clear_midi_regions ();
+ clear_regions (with_signal);
+ clear_points (with_signal);
+ clear_lines(with_signal);
+ clear_playlists (with_signal);
+ clear_midi_notes (with_signal);
+ clear_midi_regions (with_signal);
}
void
-Selection::clear_tracks ()
+Selection::clear_tracks (bool with_signal)
{
if (!tracks.empty()) {
+ PresentationInfo::ChangeSuspender cs;
+
for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) {
(*x)->set_selected (false);
}
+
tracks.clear ();
- if (!_no_tracks_changed) {
- TracksChanged();
- }
}
}
void
-Selection::clear_time ()
+Selection::clear_time (bool with_signal)
{
time.clear();
-
- TimeChanged ();
+ if (with_signal) {
+ TimeChanged ();
+ }
}
void
void
-Selection::clear_regions ()
+Selection::clear_regions (bool with_signal)
{
if (!regions.empty()) {
regions.clear_all ();
- RegionsChanged();
+ if (with_signal) {
+ RegionsChanged();
+ }
}
}
void
-Selection::clear_midi_notes ()
+Selection::clear_midi_notes (bool with_signal)
{
if (!midi_notes.empty()) {
for (MidiNoteSelection::iterator x = midi_notes.begin(); x != midi_notes.end(); ++x) {
delete *x;
}
midi_notes.clear ();
- MidiNotesChanged ();
+ if (with_signal) {
+ MidiNotesChanged ();
+ }
+ }
+
+ // clear note selections for MRV's that have note selections
+ // this will cause the MRV to be removed from the list
+ for (MidiRegionSelection::iterator i = midi_regions.begin();
+ i != midi_regions.end();) {
+ MidiRegionSelection::iterator tmp = i;
+ ++tmp;
+ MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+ if (mrv) {
+ mrv->clear_selection();
+ }
+ i = tmp;
}
}
void
-Selection::clear_midi_regions ()
+Selection::clear_midi_regions (bool with_signal)
{
if (!midi_regions.empty()) {
midi_regions.clear ();
- MidiRegionsChanged ();
+ if (with_signal) {
+ MidiRegionsChanged ();
+ }
}
}
void
-Selection::clear_playlists ()
+Selection::clear_playlists (bool with_signal)
{
/* Selections own their playlists */
if (!playlists.empty()) {
playlists.clear ();
- PlaylistsChanged();
+ if (with_signal) {
+ PlaylistsChanged();
+ }
}
}
void
-Selection::clear_lines ()
+Selection::clear_lines (bool with_signal)
{
if (!lines.empty()) {
lines.clear ();
- LinesChanged();
+ if (with_signal) {
+ LinesChanged();
+ }
}
}
void
-Selection::clear_markers ()
+Selection::clear_markers (bool with_signal)
{
if (!markers.empty()) {
markers.clear ();
- MarkersChanged();
+ if (with_signal) {
+ MarkersChanged();
+ }
}
}
{
clear_time(); //enforce object/range exclusivity
clear_tracks(); //enforce object/track exclusivity
-
+
PlaylistSelection::iterator i;
if ((i = find (playlists.begin(), playlists.end(), pl)) == playlists.end()) {
void
Selection::toggle (const TrackViewList& track_list)
{
+ PresentationInfo::ChangeSuspender cs;
+
for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) {
+ if (dynamic_cast<VCATimeAxisView*> (*i)) {
+ continue;
+ }
toggle ((*i));
}
}
void
Selection::toggle (TimeAxisView* track)
{
+ if (dynamic_cast<VCATimeAxisView*> (track)) {
+ return;
+ }
+
TrackSelection::iterator i;
if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) {
- track->set_selected (true);
tracks.push_back (track);
+ track->set_selected (true);
} else {
- track->set_selected (false);
tracks.erase (i);
+ track->set_selected (false);
}
- if (!_no_tracks_changed) {
- TracksChanged();
- }
}
void
{
clear_time(); //enforce object/range exclusivity
clear_tracks(); //enforce object/track exclusivity
-
+
RegionSelection::iterator i;
if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) {
{
clear_time(); //enforce object/range exclusivity
clear_tracks(); //enforce object/track exclusivity
-
+
if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) {
pl->use ();
playlists.push_back(pl);
{
clear_time(); //enforce object/range exclusivity
clear_tracks(); //enforce object/track exclusivity
-
+
bool changed = false;
for (list<boost::shared_ptr<Playlist> >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) {
}
void
-Selection::add (const TrackViewList& track_list)
+Selection::add (TrackViewList const & track_list)
{
+ clear_objects(); //enforce object/range exclusivity
+
+ PresentationInfo::ChangeSuspender cs;
+
TrackViewList added = tracks.add (track_list);
if (!added.empty()) {
for (TrackViewList::iterator x = added.begin(); x != added.end(); ++x) {
+ if (dynamic_cast<VCATimeAxisView*> (*x)) {
+ continue;
+ }
(*x)->set_selected (true);
}
- if (!_no_tracks_changed) {
- TracksChanged ();
- }
}
}
void
Selection::add (TimeAxisView* track)
{
+ if (dynamic_cast<VCATimeAxisView*> (track)) {
+ return;
+ }
+
TrackViewList tr;
- track->set_selected (true);
tr.push_back (track);
add (tr);
}
if (find (regions.begin(), regions.end(), r) == regions.end()) {
bool changed = regions.add (r);
- if (changed) {
- RegionsChanged ();
- }
+ if (changed) {
+ RegionsChanged ();
+ }
}
}
void
Selection::add (MidiRegionView* mrv)
{
+ DEBUG_TRACE(DEBUG::Selection, string_compose("Selection::add MRV %1\n", mrv));
+
clear_time(); //enforce object/range exclusivity
clear_tracks(); //enforce object/track exclusivity
Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
{
clear_objects(); //enforce object/range exclusivity
-
+
for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
if ((*i).id == sid) {
time.erase (i);
warning << "Programming error: Selected list is not an ARDOUR::AutomationList" << endmsg;
return;
}
- if (find (lines.begin(), lines.end(), al) == lines.end()) {
- lines.push_back (al);
- LinesChanged();
- }
+
+ /* The original may change so we must store a copy (not a pointer) here.
+ * e.g AutomationLine rewrites the list with gain mapping.
+ * the downside is that we can't perfom duplicate checks.
+ * This code was changed in response to #6842
+ */
+ lines.push_back (boost::shared_ptr<ARDOUR::AutomationList> (new ARDOUR::AutomationList(*al)));
+ LinesChanged();
}
void
{
list<TimeAxisView*>::iterator i;
if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) {
- track->set_selected (false);
+ /* erase first, because set_selected() will remove the track
+ from the selection, invalidating the iterator.
+
+ In fact, we don't really even need to do the erase, but this is
+ a hangover of axis view selection being in the GUI.
+ */
tracks.erase (i);
- if (!_no_tracks_changed) {
- TracksChanged();
- }
+ track->set_selected (false);
}
}
void
Selection::remove (const TrackViewList& track_list)
{
- bool changed = false;
+ PresentationInfo::ChangeSuspender cs;
for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) {
TrackViewList::iterator x = find (tracks.begin(), tracks.end(), *i);
+
if (x != tracks.end()) {
- (*i)->set_selected (false);
tracks.erase (x);
- changed = true;
- }
- }
-
- if (changed) {
- if (!_no_tracks_changed) {
- TracksChanged();
+ (*i)->set_selected (false);
}
}
}
void
Selection::remove (MidiRegionView* mrv)
{
+ DEBUG_TRACE(DEBUG::Selection, string_compose("Selection::remove MRV %1\n", mrv));
+
MidiRegionSelection::iterator x;
if ((x = find (midi_regions.begin(), midi_regions.end(), mrv)) != midi_regions.end()) {
}
}
-
void
Selection::remove (uint32_t selection_id)
{
void
Selection::set (TimeAxisView* track)
{
- clear_objects(); //enforce object/range exclusivity
- clear_tracks ();
+ if (dynamic_cast<VCATimeAxisView*> (track)) {
+ return;
+ }
+ clear_objects (); //enforce object/range exclusivity
+
+ PresentationInfo::ChangeSuspender cs;
+
+ if (!tracks.empty()) {
+
+ if (tracks.size() == 1 && tracks.front() == track) {
+ /* already single selection: nothing to do */
+ return;
+ }
+
+ for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) {
+ (*x)->set_selected (false);
+ }
+
+ tracks.clear ();
+ }
+
add (track);
}
Selection::set (const TrackViewList& track_list)
{
clear_objects(); //enforce object/range exclusivity
- clear_tracks ();
- add (track_list);
+
+
+ TrackViewList to_be_added;
+ TrackViewList to_be_removed;
+
+ for (TrackViewList::const_iterator x = tracks.begin(); x != tracks.end(); ++x) {
+ if (find (track_list.begin(), track_list.end(), *x) == track_list.end()) {
+ to_be_removed.push_back (*x);
+ }
+ }
+
+ for (TrackViewList::const_iterator x = track_list.begin(); x != track_list.end(); ++x) {
+ if (dynamic_cast<VCATimeAxisView*> (*x)) {
+ continue;
+ }
+ if (find (tracks.begin(), tracks.end(), *x) == tracks.end()) {
+ to_be_added.push_back (*x);
+ }
+ }
+
+ PresentationInfo::ChangeSuspender cs;
+ remove (to_be_removed);
+ add (to_be_added);
+
}
void
Selection::set (framepos_t start, framepos_t end)
{
clear_objects(); //enforce region/object exclusivity
- clear_tracks(); //enforce object/track exclusivity
clear_time();
if ((start == 0 && end == 0) || end < start) {
clear_time(); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
clear_objects();
-
+
add (ac);
}
bool
-Selection::selected (Marker* m)
+Selection::selected (ArdourMarker* m) const
{
return find (markers.begin(), markers.end(), m) != markers.end();
}
bool
-Selection::selected (TimeAxisView* tv)
+Selection::selected (TimeAxisView* tv) const
{
- return tv->get_selected ();
+ return tv->selected ();
}
bool
-Selection::selected (RegionView* rv)
+Selection::selected (RegionView* rv) const
{
return find (regions.begin(), regions.end(), rv) != regions.end();
}
bool
-Selection::selected (ControlPoint* cp)
+Selection::selected (ControlPoint* cp) const
{
return find (points.begin(), points.end(), cp) != points.end();
}
as a cut buffer.
*/
- return object_level_empty && midi_notes.empty();
+ return object_level_empty && midi_notes.empty() && points.empty();
}
void
clear_time(); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
- cp->set_selected (!cp->get_selected ());
+ cp->set_selected (!cp->selected ());
PointSelection::iterator i = find (points.begin(), points.end(), cp);
if (i == points.end()) {
points.push_back (cp);
{
clear_time(); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
-
+
RegionView* rv;
ControlPoint* cp;
vector<RegionView*> rvs;
fatal << _("programming error: ")
<< X_("unknown selectable type passed to Selection::toggle()")
<< endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
}
}
fatal << _("programming error: ")
<< X_("unknown selectable type passed to Selection::add()")
<< endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
}
}
}
void
-Selection::clear_points ()
+Selection::clear_points (bool with_signal)
{
if (!points.empty()) {
points.clear ();
- PointsChanged ();
+ if (with_signal) {
+ PointsChanged ();
+ }
}
}
clear_time (); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
- if (cp->get_selected()) {
+ if (cp->selected () && points.size () == 1) {
return;
}
}
void
-Selection::set (Marker* m)
+Selection::set (ArdourMarker* m)
{
clear_time (); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
}
void
-Selection::toggle (Marker* m)
+Selection::toggle (ArdourMarker* m)
{
MarkerSelection::iterator i;
}
void
-Selection::remove (Marker* m)
+Selection::remove (ArdourMarker* m)
{
MarkerSelection::iterator i;
}
void
-Selection::add (Marker* m)
+Selection::add (ArdourMarker* m)
{
clear_time (); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
}
void
-Selection::add (const list<Marker*>& m)
+Selection::add (const list<ArdourMarker*>& m)
{
clear_time (); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
markers.insert (markers.end(), m.begin(), m.end());
markers.sort ();
markers.unique ();
-
+
MarkersChanged ();
}
AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (*i);
if (rtv) {
XMLNode* t = node->add_child (X_("RouteView"));
- t->add_property (X_("id"), atoi (rtv->route()->id().to_s().c_str()));
+ t->set_property (X_("id"), rtv->route()->id ());
} 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->parameter ()));
+ t->set_property (X_("id"), atv->parent_route()->id ());
+ t->set_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->parameter ()));
}
}
+ 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 ());
+ }
+
+ /* midi region views have thir own internal selection. */
+ list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::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;
+ 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) {
+ XMLNode* nc = n->add_child(X_("note"));
+ nc->set_property(X_("note-id"), (*i)->id());
+ }
+ }
+
+ for (PointSelection::const_iterator i = points.begin(); i != points.end(); ++i) {
+ AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (&(*i)->line().trackview);
+ if (atv) {
+
+ XMLNode* r = node->add_child (X_("ControlPoint"));
+ r->set_property (X_("type"), "track");
+ r->set_property (X_("route-id"), atv->parent_route()->id ());
+ r->set_property (X_("automation-list-id"), (*i)->line().the_list()->id ());
+ r->set_property (X_("parameter"), EventTypeMap::instance().to_symbol ((*i)->line().the_list()->parameter ()));
+ r->set_property (X_("view-index"), (*i)->view_index());
+ continue;
+ }
+
+ AudioRegionGainLine* argl = dynamic_cast<AudioRegionGainLine*> (&(*i)->line());
+ if (argl) {
+ XMLNode* r = node->add_child (X_("ControlPoint"));
+ r->set_property (X_("type"), "region");
+ r->set_property (X_("region-id"), argl->region_view ().region ()->id ());
+ r->set_property (X_("view-index"), (*i)->view_index());
+ }
+
+ }
+
+ for (TimeSelection::const_iterator i = time.begin(); i != time.end(); ++i) {
+ XMLNode* t = node->add_child (X_("AudioRange"));
+ t->set_property (X_("start"), (*i).start);
+ t->set_property (X_("end"), (*i).end);
+ }
+
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"));
+ t->set_property (X_("id"), loc->id());
+ t->set_property (X_("start"), is_start);
}
return *node;
return -1;
}
+ clear_regions ();
+ clear_midi_notes ();
+ clear_points ();
+ clear_time ();
+ clear_tracks ();
+ clear_markers ();
+
+ RegionSelection selected_regions;
+
+ PBD::ID id;
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 ());
+ if (!(*i)->get_property (X_("id"), id)) {
+ assert(false); // handle this more gracefully?
+ }
+
RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
if (rtv) {
add (rtv);
}
+ } else if ((*i)->name() == X_("Region")) {
+
+ if (!(*i)->get_property (X_("id"), id)) {
+ assert(false);
+ }
+
+ 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);
+ }
+
+ } else if ((*i)->name() == X_("MIDINotes")) {
+
+ if (!(*i)->get_property (X_("region-id"), id)) {
+ assert (false);
+ }
+
+ RegionSelection rs;
+
+ editor->get_regionviews_by_id (id, rs); // there could be more than one
+
+ std::list<Evoral::event_id_t> notes;
+ XMLNodeList children = (*i)->children ();
+
+ for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) {
+ Evoral::event_id_t id;
+ if ((*ci)->get_property (X_ ("note-id"), id)) {
+ notes.push_back (id);
+ }
+ }
+
+ for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) {
+ MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*rsi);
+ if (mrv) {
+ mrv->select_notes(notes);
+ }
+ }
+
+ if (rs.empty()) {
+ /* regionviews containing these notes don't yet exist on the canvas.*/
+ pending_midi_note_selection.push_back (make_pair (id, notes));
+ }
+
+ } else if ((*i)->name() == X_("ControlPoint")) {
+ XMLProperty const * prop_type = (*i)->property (X_("type"));
+
+ assert(prop_type);
+
+ if (prop_type->value () == "track") {
+
+ PBD::ID route_id;
+ PBD::ID alist_id;
+ std::string param;
+ uint32_t view_index;
+
+ if (!(*i)->get_property (X_("route-id"), route_id) ||
+ !(*i)->get_property (X_("automation-list-id"), alist_id) ||
+ !(*i)->get_property (X_("parameter"), param) ||
+ !(*i)->get_property (X_("view-index"), view_index)) {
+ assert(false);
+ }
+
+ RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (route_id);
+ vector <ControlPoint *> cps;
+
+ if (rtv) {
+ boost::shared_ptr<AutomationTimeAxisView> atv = rtv->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) {
+ if ((*li)->the_list()->id() == alist_id) {
+ ControlPoint* cp = (*li)->nth(view_index);
+ if (cp) {
+ cps.push_back (cp);
+ cp->show();
+ }
+ }
+ }
+ }
+ }
+ if (!cps.empty()) {
+ add (cps);
+ }
+ } else if (prop_type->value () == "region") {
+
+ PBD::ID region_id;
+ uint32_t view_index;
+ if (!(*i)->get_property (X_("region-id"), region_id) ||
+ !(*i)->get_property (X_("view-index"), view_index)) {
+ continue;
+ }
+
+ RegionSelection rs;
+ editor->get_regionviews_by_id (region_id, rs);
+
+ if (!rs.empty ()) {
+ vector <ControlPoint *> cps;
+ for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) {
+ AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*rsi);
+ if (arv) {
+ boost::shared_ptr<AudioRegionGainLine> gl = arv->get_gain_line ();
+ ControlPoint* cp = gl->nth(view_index);
+ if (cp) {
+ cps.push_back (cp);
+ cp->show();
+ }
+ }
+ }
+ if (!cps.empty()) {
+ add (cps);
+ }
+ }
+ }
+
+ } else if ((*i)->name() == X_("AudioRange")) {
+ framepos_t start;
+ framepos_t end;
+
+ if (!(*i)->get_property (X_("start"), start) || !(*i)->get_property (X_("end"), end)) {
+ assert(false);
+ }
+ set_preserving_all_ranges (start, end);
+
} else if ((*i)->name() == X_("AutomationView")) {
- XMLProperty* prop_id = (*i)->property (X_("id"));
- XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
+ std::string param;
- assert (prop_id);
- assert (prop_parameter);
+ if (!(*i)->get_property (X_("id"), id) || !(*i)->get_property (X_("parameter"), param)) {
+ assert (false);
+ }
- PBD::ID id (prop_id->value ());
RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
if (rtv) {
- boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ()));
+ boost::shared_ptr<AutomationTimeAxisView> atv = rtv->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
} 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);
+ bool is_start;
+ if (!(*i)->get_property (X_("id"), id) || !(*i)->get_property (X_("start"), is_start)) {
+ assert(false);
+ }
- PBD::ID id (prop_id->value ());
- Marker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
+ ArdourMarker* m = editor->find_marker_from_location_id (id, is_start);
if (m) {
add (m);
}
-
+
}
-
+
}
+ // now add regions to selection at once
+ add (selected_regions);
+
return 0;
}
i = tmp;
}
}
-
-void
-Selection::block_tracks_changed (bool yn)
-{
- _no_tracks_changed = yn;
-}