X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=27a062e87dd57facf79912d42e79cab3c5241232;hb=08bca2a07d009c25f8cfec29dbe87682fc1af22c;hp=2cf79a3c4b0b74e7ffe6f3ea8765290b13401682;hpb=ade1c4923ca58a56c5160826253091f67f03fd2f;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 2cf79a3c4b..27a062e87d 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -26,8 +26,13 @@ #include "ardour/playlist.h" #include "ardour/rc_configuration.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" @@ -36,7 +41,7 @@ #include "public_editor.h" #include "control_point.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -52,7 +57,6 @@ Selection::Selection (const PublicEditor* e) : tracks (e) , editor (e) , next_time_id (0) - , _no_tracks_changed (false) { clear (); @@ -61,8 +65,8 @@ Selection::Selection (const PublicEditor* e) 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()); @@ -113,36 +117,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()) { + 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 @@ -156,41 +161,56 @@ 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 (); + } } - /* The note selection is actually stored in MidiRegionView, emit signal to - tell them to clear their selection. */ - ClearMidiNoteSelection(); /* EMIT SIGNAL */ + // 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(*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 */ @@ -202,25 +222,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(); + } } } @@ -245,6 +271,8 @@ Selection::toggle (boost::shared_ptr pl) void Selection::toggle (const TrackViewList& track_list) { + PresentationInfo::ChangeSuspender cs; + for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { toggle ((*i)); } @@ -256,16 +284,13 @@ Selection::toggle (TimeAxisView* track) 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 @@ -402,19 +427,18 @@ Selection::add (const list >& pllist) } 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) { (*x)->set_selected (true); } - if (!_no_tracks_changed) { - TracksChanged (); - } } } @@ -516,6 +540,8 @@ Selection::add (RegionView* r) 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 @@ -593,10 +619,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 @@ -606,30 +636,18 @@ Selection::remove (TimeAxisView* track) if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) { track->set_selected (false); tracks.erase (i); - if (!_no_tracks_changed) { - TracksChanged(); - } } } void Selection::remove (const TrackViewList& track_list) { - bool changed = false; - 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(); } } } @@ -717,6 +735,8 @@ Selection::remove (RegionView* r) 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()) { @@ -725,7 +745,6 @@ Selection::remove (MidiRegionView* mrv) } } - void Selection::remove (uint32_t selection_id) { @@ -761,8 +780,24 @@ 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 + + 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); } @@ -770,7 +805,40 @@ void Selection::set (const TrackViewList& track_list) { clear_objects(); //enforce object/range exclusivity - clear_tracks (); + + PresentationInfo::ChangeSuspender cs; + + if (!tracks.empty()) { + + /* cannot use set::operator== (set const &) here, because + * apparently the ordering used within 2 sets is not + * necessarily the same. + */ + + if (tracks.size() == track_list.size()) { + bool missing = false; + + for (TrackViewList::const_iterator x = track_list.begin(); x != track_list.end(); ++x) { + if (find (tracks.begin(), tracks.end(), *x) == tracks.end()) { + missing = true; + } + } + + if (!missing) { + /* already same selection: nothing to do */ + return; + } + } + + /* argument is different from existing selection */ + + for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) { + (*x)->set_selected (false); + } + + tracks.clear (); + } + add (track_list); } @@ -911,7 +979,7 @@ Selection::set (boost::shared_ptr ac) } bool -Selection::selected (Marker* m) +Selection::selected (ArdourMarker* m) { return find (markers.begin(), markers.end(), m) != markers.end(); } @@ -919,7 +987,7 @@ Selection::selected (Marker* m) bool Selection::selected (TimeAxisView* tv) { - return tv->get_selected (); + return tv->selected (); } bool @@ -965,7 +1033,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); @@ -1075,11 +1143,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 (); + } } } @@ -1113,7 +1183,7 @@ Selection::set (ControlPoint* cp) clear_time (); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity - if (cp->get_selected()) { + if (cp->selected () && points.size () == 1) { return; } @@ -1126,7 +1196,7 @@ Selection::set (ControlPoint* cp) } void -Selection::set (Marker* m) +Selection::set (ArdourMarker* m) { clear_time (); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity @@ -1136,7 +1206,7 @@ Selection::set (Marker* m) } void -Selection::toggle (Marker* m) +Selection::toggle (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1148,7 +1218,7 @@ Selection::toggle (Marker* m) } void -Selection::remove (Marker* m) +Selection::remove (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1159,7 +1229,7 @@ Selection::remove (Marker* m) } void -Selection::add (Marker* m) +Selection::add (ArdourMarker* m) { clear_time (); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity @@ -1171,7 +1241,7 @@ Selection::add (Marker* m) } void -Selection::add (const list& m) +Selection::add (const list& m) { clear_time (); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity @@ -1233,35 +1303,19 @@ Selection::get_state () const } /* midi region views have thir own internal selection. */ - XMLNode* n; list > > > > rid_notes; editor->get_per_region_note_selection (rid_notes); - if (!rid_notes.empty()) { - n = node->add_child (X_("MIDINote")); - } + list > > > >::iterator rn_it; for (rn_it = rid_notes.begin(); rn_it != rid_notes.end(); ++rn_it) { - n->add_property (X_("region_id"), atoi((*rn_it).first.to_s().c_str())); + XMLNode* n = node->add_child (X_("MIDINotes")); + n->add_property (X_("region-id"), atoi((*rn_it).first.to_s().c_str())); for (std::set > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) { XMLNode* nc = n->add_child(X_("note")); - snprintf(buf, sizeof(buf), "%d", (*i)->channel()); - nc->add_property(X_("channel"), string(buf)); - - snprintf(buf, sizeof(buf), "%f", (*i)->time().to_double()); - nc->add_property(X_("time"), string(buf)); - snprintf(buf, sizeof(buf), "%d", (*i)->note()); - nc->add_property(X_("note"), string(buf)); - - snprintf(buf, sizeof(buf), "%f", (*i)->length().to_double()); - nc->add_property(X_("length"), string(buf)); - - snprintf(buf, sizeof(buf), "%d", (*i)->velocity()); - nc->add_property(X_("velocity"), string(buf)); - - snprintf(buf, sizeof(buf), "%d", (*i)->off_velocity()); - nc->add_property(X_("off-velocity"), string(buf)); + snprintf(buf, sizeof(buf), "%d", (*i)->id()); + nc->add_property (X_("note-id"), string(buf)); } } @@ -1277,8 +1331,18 @@ Selection::get_state () const snprintf(buf, sizeof(buf), "%d", (*i)->view_index()); r->add_property (X_("view-index"), string(buf)); + continue; + } + AudioRegionGainLine* argl = dynamic_cast (&(*i)->line()); + if (argl) { + XMLNode* r = node->add_child (X_("ControlPoint")); + r->add_property (X_("type"), "region"); + r->add_property (X_("region-id"), atoi (argl->region_view ().region ()->id ().to_s ().c_str())); + snprintf(buf, sizeof(buf), "%d", (*i)->view_index()); + r->add_property (X_("view-index"), string(buf)); } + } for (TimeSelection::const_iterator i = time.begin(); i != time.end(); ++i) { @@ -1320,7 +1384,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); @@ -1329,7 +1393,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 ()); @@ -1346,8 +1410,8 @@ Selection::set_state (XMLNode const & node, int) regions.pending.push_back (id); } - } else if ((*i)->name() == X_("MIDINote")) { - XMLProperty* prop_region_id = (*i)->property (X_("region-id")); + } else if ((*i)->name() == X_("MIDINotes")) { + XMLProperty const * prop_region_id = (*i)->property (X_("region-id")); assert (prop_region_id); @@ -1356,35 +1420,15 @@ Selection::set_state (XMLNode const & node, int) editor->get_regionviews_by_id (id, rs); // there could be more than one - std::list > > notes; + std::list notes; 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")); - - assert (prop_channel); - assert (prop_time); - assert (prop_note); - assert (prop_length); - assert (prop_velocity); - assert (prop_off_velocity); - - uint8_t channel = atoi(prop_channel->value()); - Evoral::Beats time (atof(prop_time->value())); - Evoral::Beats length (atof(prop_length->value())); - uint8_t note = atoi(prop_note->value()); - uint8_t velocity = atoi(prop_velocity->value()); - uint8_t off_velocity = atoi(prop_off_velocity->value()); - boost::shared_ptr > the_note - (new Evoral::Note (channel, time, length, note, velocity)); - the_note->set_off_velocity (off_velocity); - - notes.push_back (the_note); + XMLProperty const * prop_id = (*ci)->property (X_("note-id")); + if (prop_id) { + Evoral::event_id_t id = atoi(prop_id->value()); + notes.push_back (id); + } } for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) { @@ -1400,18 +1444,17 @@ 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_type); assert (prop_route_id); assert (prop_alist_id); assert (prop_parameter); @@ -1439,11 +1482,40 @@ Selection::set_state (XMLNode const & node, int) if (!cps.empty()) { add (cps); } + } else if (prop_type->value () == "region") { + 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; + } + + PBD::ID region_id (prop_region_id->value ()); + RegionSelection rs; + editor->get_regionviews_by_id (region_id, rs); + + if (!rs.empty ()) { + vector cps; + for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) { + AudioRegionView* arv = dynamic_cast (*rsi); + if (arv) { + boost::shared_ptr gl = arv->get_gain_line (); + ControlPoint* cp = gl->nth(atol(prop_view_index->value().c_str())); + if (cp) { + cps.push_back (cp); + cp->show(); + } + } + } + if (!cps.empty()) { + add (cps); + } + } } } 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); @@ -1455,8 +1527,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); @@ -1479,13 +1551,13 @@ 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); 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, string_is_affirmative (prop_start->value ())); if (m) { add (m); } @@ -1512,9 +1584,3 @@ Selection::remove_regions (TimeAxisView* t) i = tmp; } } - -void -Selection::block_tracks_changed (bool yn) -{ - _no_tracks_changed = yn; -}