X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=d5fadb9cbb4f57d09b40b953c67fc742de8e94a4;hb=e25dce8849719f382a84fb82c7fd657465f1b2a1;hp=9f69666497c314a869e02cb17aa07eb3d1bac174;hpb=7ab8a11fb53782dfcf67b652dc65d8d177b0a1b6;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 9f69666497..d5fadb9cbb 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -26,8 +26,11 @@ #include "ardour/playlist.h" #include "ardour/rc_configuration.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" @@ -42,12 +45,10 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal0 Selection::ClearMidiNoteSelection; - 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) @@ -63,8 +64,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()); @@ -111,39 +112,41 @@ Selection::clear () 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()) { 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 @@ -157,41 +160,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 */ @@ -203,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(); + } } } @@ -230,7 +254,7 @@ Selection::toggle (boost::shared_ptr pl) { 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()) { @@ -302,7 +326,7 @@ Selection::toggle (RegionView* r) { 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()) { @@ -373,7 +397,7 @@ Selection::add (boost::shared_ptr pl) { 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); @@ -386,7 +410,7 @@ Selection::add (const list >& pllist) { clear_time(); //enforce object/range exclusivity clear_tracks(); //enforce object/track exclusivity - + bool changed = false; for (list >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) { @@ -508,15 +532,17 @@ Selection::add (RegionView* r) 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 @@ -564,7 +590,7 @@ void Selection::replace (uint32_t sid, framepos_t start, framepos_t end) { clear_objects(); //enforce object/range exclusivity - + for (list::iterator i = time.begin(); i != time.end(); ++i) { if ((*i).id == sid) { time.erase (i); @@ -594,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 @@ -718,6 +748,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()) { @@ -726,7 +758,6 @@ Selection::remove (MidiRegionView* mrv) } } - void Selection::remove (uint32_t selection_id) { @@ -762,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); } @@ -771,7 +802,7 @@ void Selection::set (const TrackViewList& track_list) { clear_objects(); //enforce object/range exclusivity - clear_tracks (); + clear_tracks (false); add (track_list); } @@ -907,12 +938,12 @@ Selection::set (boost::shared_ptr ac) 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) { return find (markers.begin(), markers.end(), m) != markers.end(); } @@ -993,7 +1024,7 @@ Selection::toggle (list const & selectables) { clear_time(); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity - + RegionView* rv; ControlPoint* cp; vector rvs; @@ -1076,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 (); + } } } @@ -1114,7 +1147,7 @@ Selection::set (ControlPoint* cp) clear_time (); //enforce region/object exclusivity clear_tracks(); //enforce object/track exclusivity - if (cp->get_selected()) { + if (cp->get_selected () && points.size () == 1) { return; } @@ -1127,7 +1160,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 @@ -1137,7 +1170,7 @@ Selection::set (Marker* m) } void -Selection::toggle (Marker* m) +Selection::toggle (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1149,7 +1182,7 @@ Selection::toggle (Marker* m) } void -Selection::remove (Marker* m) +Selection::remove (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1160,7 +1193,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 @@ -1172,7 +1205,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 @@ -1180,7 +1213,7 @@ Selection::add (const list& m) markers.insert (markers.end(), m.begin(), m.end()); markers.sort (); markers.unique (); - + MarkersChanged (); } @@ -1231,20 +1264,79 @@ Selection::get_state () const for (RegionSelection::const_iterator i = regions.begin(); i != regions.end(); ++i) { XMLNode* r = node->add_child (X_("Region")); r->add_property (X_("id"), atoi ((*i)->region ()->id ().to_s ().c_str())); - + } + + /* midi region views have thir own internal selection. */ + XMLNode* n = NULL; + 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) { + assert(n); // hint for clang static analysis + 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)); + } + } + + for (PointSelection::const_iterator i = points.begin(); i != points.end(); ++i) { + AutomationTimeAxisView* atv = dynamic_cast (&(*i)->line().trackview); + if (atv) { + + XMLNode* r = node->add_child (X_("ControlPoint")); + r->add_property (X_("type"), "track"); + r->add_property (X_("route-id"), atoi (atv->parent_route()->id ().to_s ().c_str())); + r->add_property (X_("automation-list-id"), atoi ((*i)->line().the_list()->id ().to_s ().c_str())); + r->add_property (X_("parameter"), EventTypeMap::instance().to_symbol ((*i)->line().the_list()->parameter ())); + + 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) { XMLNode* t = node->add_child (X_("AudioRange")); - snprintf(buf, sizeof(buf), "%ld", (*i).start); + snprintf(buf, sizeof(buf), "%" PRId64, (*i).start); t->add_property (X_("start"), string(buf)); - snprintf(buf, sizeof(buf), "%ld", (*i).end); + snprintf(buf, sizeof(buf), "%" PRId64, (*i).end); t->add_property (X_("end"), string(buf)); } - + 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); @@ -1263,6 +1355,8 @@ Selection::set_state (XMLNode const & node, int) } clear_regions (); + clear_midi_notes (); + clear_points (); clear_time (); clear_tracks (); clear_markers (); @@ -1283,20 +1377,143 @@ Selection::set_state (XMLNode const & node, int) XMLProperty* prop_id = (*i)->property (X_("id")); assert (prop_id); PBD::ID id (prop_id->value ()); - + RegionSelection rs; editor->get_regionviews_by_id (id, rs); - + if (!rs.empty ()) { add (rs); } else { /* - regionviews are being constructed - stash the region IDs + 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_("MIDINote")) { + XMLProperty* prop_region_id = (*i)->property (X_("region-id")); + + assert (prop_region_id); + + PBD::ID const id (prop_region_id->value ()); + RegionSelection rs; + + editor->get_regionviews_by_id (id, rs); // there could be more than one + + 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); + } + + for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) { + MidiRegionView* mrv = dynamic_cast (*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* 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")); + + assert (prop_route_id); + assert (prop_alist_id); + assert (prop_parameter); + assert (prop_view_index); + + PBD::ID route_id (prop_route_id->value ()); + RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (route_id); + vector cps; + + if (rtv) { + boost::shared_ptr atv = rtv->automation_child (EventTypeMap::instance().from_symbol (prop_parameter->value ())); + if (atv) { + list > lines = atv->lines(); + for (list > ::iterator li = lines.begin(); li != lines.end(); ++li) { + if ((*li)->the_list()->id() == prop_alist_id->value()) { + ControlPoint* cp = (*li)->nth(atol(prop_view_index->value().c_str())); + if (cp) { + cps.push_back (cp); + cp->show(); + } + } + } + } + } + if (!cps.empty()) { + 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")); + + 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")); @@ -1341,13 +1558,13 @@ Selection::set_state (XMLNode const & node, int) 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); } - + } - + } return 0;