X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=fefca3d1ecf5d366ac0a12a3a1c29f1984d6b2fe;hb=d9ba78d59474d9f7ef5b9f90b6b171e664d3b974;hp=0118c1c679b4f74d64fa2a572c33712ae60cad6b;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 0118c1c679..fefca3d1ec 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" @@ -61,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()); @@ -113,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 @@ -156,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 */ @@ -202,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(); + } } } @@ -516,6 +541,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 +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 @@ -717,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()) { @@ -725,7 +758,6 @@ Selection::remove (MidiRegionView* mrv) } } - void Selection::remove (uint32_t selection_id) { @@ -761,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); } @@ -770,7 +802,7 @@ void Selection::set (const TrackViewList& track_list) { clear_objects(); //enforce object/range exclusivity - clear_tracks (); + clear_tracks (false); add (track_list); } @@ -911,7 +943,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 +951,7 @@ Selection::selected (Marker* m) bool Selection::selected (TimeAxisView* tv) { - return tv->get_selected (); + return tv->selected (); } bool @@ -965,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); @@ -1075,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 (); + } } } @@ -1113,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->selected () && points.size () == 1) { return; } @@ -1126,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 @@ -1136,7 +1170,7 @@ Selection::set (Marker* m) } void -Selection::toggle (Marker* m) +Selection::toggle (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1148,7 +1182,7 @@ Selection::toggle (Marker* m) } void -Selection::remove (Marker* m) +Selection::remove (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1159,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 @@ -1171,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 @@ -1278,8 +1312,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) { @@ -1321,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); @@ -1330,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 ()); @@ -1348,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); @@ -1361,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); @@ -1401,18 +1445,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); @@ -1440,11 +1483,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); @@ -1456,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); @@ -1480,13 +1552,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); }