X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=fefca3d1ecf5d366ac0a12a3a1c29f1984d6b2fe;hb=d9ba78d59474d9f7ef5b9f90b6b171e664d3b974;hp=c1a53bd00db00460362bd01b0cc8f38b5c1d8271;hpb=084af96bf441c065841af6a399d4c0d3c99962d4;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index c1a53bd00d..fefca3d1ec 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -116,36 +116,37 @@ 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()) { for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) { (*x)->set_selected (false); } tracks.clear (); - if (!_no_tracks_changed) { + if (!_no_tracks_changed && with_signal) { TracksChanged(); } } } void -Selection::clear_time () +Selection::clear_time (bool with_signal) { time.clear(); - - TimeChanged (); + if (with_signal) { + TimeChanged (); + } } void @@ -159,23 +160,27 @@ Selection::dump_region_layers() 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 @@ -193,16 +198,18 @@ Selection::clear_midi_notes () } 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 */ @@ -214,25 +221,31 @@ Selection::clear_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(); + } } } @@ -607,10 +620,14 @@ Selection::add (boost::shared_ptr cl) 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 (new ARDOUR::AutomationList(*al))); + LinesChanged(); } void @@ -776,8 +793,8 @@ Selection::remove (boost::shared_ptr ac) void Selection::set (TimeAxisView* track) { - clear_objects(); //enforce object/range exclusivity - clear_tracks (); + clear_objects (); //enforce object/range exclusivity + clear_tracks (false); add (track); } @@ -785,7 +802,7 @@ void Selection::set (const TrackViewList& track_list) { clear_objects(); //enforce object/range exclusivity - clear_tracks (); + clear_tracks (false); add (track_list); } @@ -934,7 +951,7 @@ Selection::selected (ArdourMarker* m) bool Selection::selected (TimeAxisView* tv) { - return tv->get_selected (); + return tv->selected (); } bool @@ -980,7 +997,7 @@ Selection::toggle (ControlPoint* cp) 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); @@ -1090,11 +1107,13 @@ Selection::add (list const & selectables) } void -Selection::clear_points () +Selection::clear_points (bool with_signal) { if (!points.empty()) { points.clear (); - PointsChanged (); + if (with_signal) { + PointsChanged (); + } } } @@ -1128,7 +1147,7 @@ Selection::set (ControlPoint* cp) clear_time (); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity - if (cp->get_selected () && points.size () == 1) { + if (cp->selected () && points.size () == 1) { return; } @@ -1346,7 +1365,7 @@ Selection::set_state (XMLNode const & node, int) for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == X_("RouteView")) { - XMLProperty* prop_id = (*i)->property (X_("id")); + XMLProperty const * 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); @@ -1355,7 +1374,7 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("Region")) { - XMLProperty* prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_id = (*i)->property (X_("id")); assert (prop_id); PBD::ID id (prop_id->value ()); @@ -1373,7 +1392,7 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("MIDINote")) { - XMLProperty* prop_region_id = (*i)->property (X_("region-id")); + XMLProperty const * prop_region_id = (*i)->property (X_("region-id")); assert (prop_region_id); @@ -1386,12 +1405,12 @@ Selection::set_state (XMLNode const & node, int) XMLNodeList children = (*i)->children (); for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) { - XMLProperty* prop_channel = (*ci)->property (X_("channel")); - XMLProperty* prop_time = (*ci)->property (X_("time")); - XMLProperty* prop_note = (*ci)->property (X_("note")); - XMLProperty* prop_length = (*ci)->property (X_("length")); - XMLProperty* prop_velocity = (*ci)->property (X_("velocity")); - XMLProperty* prop_off_velocity = (*ci)->property (X_("off-velocity")); + XMLProperty const * prop_channel = (*ci)->property (X_("channel")); + XMLProperty const * prop_time = (*ci)->property (X_("time")); + XMLProperty const * prop_note = (*ci)->property (X_("note")); + XMLProperty const * prop_length = (*ci)->property (X_("length")); + XMLProperty const * prop_velocity = (*ci)->property (X_("velocity")); + XMLProperty const * prop_off_velocity = (*ci)->property (X_("off-velocity")); assert (prop_channel); assert (prop_time); @@ -1426,16 +1445,16 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("ControlPoint")) { - XMLProperty* prop_type = (*i)->property (X_("type")); + XMLProperty const * prop_type = (*i)->property (X_("type")); assert(prop_type); if (prop_type->value () == "track") { - XMLProperty* prop_route_id = (*i)->property (X_("route-id")); - XMLProperty* prop_alist_id = (*i)->property (X_("automation-list-id")); - XMLProperty* prop_parameter = (*i)->property (X_("parameter")); - XMLProperty* prop_view_index = (*i)->property (X_("view-index")); + XMLProperty const * prop_route_id = (*i)->property (X_("route-id")); + XMLProperty const * prop_alist_id = (*i)->property (X_("automation-list-id")); + XMLProperty const * prop_parameter = (*i)->property (X_("parameter")); + XMLProperty const * prop_view_index = (*i)->property (X_("view-index")); assert (prop_route_id); assert (prop_alist_id); @@ -1465,8 +1484,8 @@ Selection::set_state (XMLNode const & node, int) add (cps); } } else if (prop_type->value () == "region") { - XMLProperty* prop_region_id = (*i)->property (X_("region-id")); - XMLProperty* prop_view_index = (*i)->property (X_("view-index")); + XMLProperty const * prop_region_id = (*i)->property (X_("region-id")); + XMLProperty const * prop_view_index = (*i)->property (X_("view-index")); if (!prop_region_id || !prop_view_index) { continue; @@ -1496,8 +1515,8 @@ Selection::set_state (XMLNode const & node, int) } } else if ((*i)->name() == X_("AudioRange")) { - XMLProperty* prop_start = (*i)->property (X_("start")); - XMLProperty* prop_end = (*i)->property (X_("end")); + XMLProperty const * prop_start = (*i)->property (X_("start")); + XMLProperty const * prop_end = (*i)->property (X_("end")); assert (prop_start); assert (prop_end); @@ -1509,8 +1528,8 @@ Selection::set_state (XMLNode const & node, int) } else if ((*i)->name() == X_("AutomationView")) { - XMLProperty* prop_id = (*i)->property (X_("id")); - XMLProperty* prop_parameter = (*i)->property (X_("parameter")); + XMLProperty const * prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_parameter = (*i)->property (X_("parameter")); assert (prop_id); assert (prop_parameter); @@ -1533,8 +1552,8 @@ Selection::set_state (XMLNode const & node, int) } else if ((*i)->name() == X_("Marker")) { - XMLProperty* prop_id = (*i)->property (X_("id")); - XMLProperty* prop_start = (*i)->property (X_("start")); + XMLProperty const * prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_start = (*i)->property (X_("start")); assert (prop_id); assert (prop_start);