X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=2e5be77cde0964d01760f2969a94a5fb54ca874d;hb=f0db054a07ecc9d49fede8fcc9175a85c635369f;hp=b5454c4a123ca6afcad970f79657b2eef1f9476b;hpb=0178875021916feea05a830325c25e9a7db81d34;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index b5454c4a12..2e5be77cde 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,8 @@ #include "ardour/playlist.h" #include "ardour/rc_configuration.h" +#include "gui_thread.h" +#include "midi_cut_buffer.h" #include "region_view.h" #include "selection.h" #include "selection_templates.h" @@ -37,7 +39,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; struct AudioRangeComparator { bool operator()(AudioRange a, AudioRange b) { @@ -45,6 +46,23 @@ struct AudioRangeComparator { } }; +Selection::Selection (const PublicEditor* e) + : tracks (e) + , editor (e) + , next_time_id (0) +{ + clear (); + + /* we have disambiguate which remove() for the compiler */ + + void (Selection::*track_remove)(TimeAxisView*) = &Selection::remove; + TimeAxisView::CatchDeletion.connect (*this, MISSING_INVALIDATOR, ui_bind (track_remove, this, _1), gui_context()); + + void (Selection::*marker_remove)(Marker*) = &Selection::remove; + Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, ui_bind (marker_remove, this, _1), gui_context()); +} + +#if 0 Selection& Selection::operator= (const Selection& other) { @@ -58,14 +76,13 @@ Selection::operator= (const Selection& other) } return *this; } +#endif bool operator== (const Selection& a, const Selection& b) { return a.regions == b.regions && a.tracks == b.tracks && - a.time.track == b.time.track && - a.time.group == b.time.group && a.time == b.time && a.lines == b.lines && a.playlists == b.playlists && @@ -119,6 +136,9 @@ void Selection::clear_midi_notes () { if (!midi_notes.empty()) { + for (MidiNoteSelection::iterator x = midi_notes.begin(); x != midi_notes.end(); ++x) { + delete *x; + } midi_notes.clear (); MidiNotesChanged (); } @@ -136,8 +156,6 @@ Selection::clear_midi_regions () void Selection::clear_time () { - time.track = 0; - time.group = 0; time.clear(); TimeChanged (); @@ -194,9 +212,9 @@ Selection::toggle (boost::shared_ptr pl) } void -Selection::toggle (const list& track_list) +Selection::toggle (const TrackViewList& track_list) { - for (list::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { + for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { toggle ((*i)); } } @@ -205,10 +223,8 @@ void Selection::toggle (TimeAxisView* track) { TrackSelection::iterator i; - + if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - track->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), track)); tracks.push_back (track); } else { tracks.erase (i); @@ -229,13 +245,15 @@ void Selection::toggle (MidiCutBuffer* midi) { MidiNoteSelection::iterator i; - + if ((i = find (midi_notes.begin(), midi_notes.end(), midi)) == midi_notes.end()) { midi_notes.push_back (midi); } else { + /* remember that we own the MCB */ + delete *i; midi_notes.erase (i); } - + MidiNotesChanged(); } @@ -294,7 +312,7 @@ Selection::toggle (nframes_t start, nframes_t end) time.push_back (AudioRange (start, end, next_time_id++)); time.consolidate (); time.sort (cmp); - + TimeChanged (); return next_time_id - 1; @@ -322,22 +340,17 @@ Selection::add (const list >& pllist) changed = true; } } - + if (changed) { PlaylistsChanged (); } } void -Selection::add (const list& track_list) +Selection::add (const TrackViewList& track_list) { - list added = tracks.add (track_list); + TrackViewList added = tracks.add (track_list); - for (list::const_iterator i = added.begin(); i != added.end(); ++i) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - (*i)->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), (*i))); - } - if (!added.empty()) { TracksChanged (); } @@ -346,12 +359,9 @@ Selection::add (const list& track_list) void Selection::add (TimeAxisView* track) { - if (find (tracks.begin(), tracks.end(), track) == tracks.end()) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - track->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), track)); - tracks.push_back (track); - TracksChanged(); - } + TrackViewList tr; + tr.push_back (track); + add (tr); } void @@ -369,6 +379,8 @@ Selection::add (const MidiNoteSelection& midi_list) void Selection::add (MidiCutBuffer* midi) { + /* we take ownership of the MCB */ + if (find (midi_notes.begin(), midi_notes.end(), midi) == midi_notes.end()) { midi_notes.push_back (midi); MidiNotesChanged (); @@ -382,7 +394,7 @@ Selection::add (vector& v) */ bool changed = false; - + for (vector::iterator i = v.begin(); i != v.end(); ++i) { if (find (regions.begin(), regions.end(), (*i)) == regions.end()) { changed = regions.add ((*i)); @@ -404,7 +416,7 @@ Selection::add (const RegionSelection& rs) */ bool changed = false; - + for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) { if (find (regions.begin(), regions.end(), (*i)) == regions.end()) { changed = regions.add ((*i)); @@ -413,7 +425,7 @@ Selection::add (const RegionSelection& rs) } } } - + if (changed) { RegionsChanged (); } @@ -456,7 +468,7 @@ Selection::add (nframes_t start, nframes_t end) time.push_back (AudioRange (start, end, next_time_id++)); time.consolidate (); time.sort (cmp); - + TimeChanged (); return next_time_id - 1; @@ -509,15 +521,14 @@ Selection::remove (TimeAxisView* track) } void -Selection::remove (const list& track_list) +Selection::remove (const TrackViewList& track_list) { bool changed = false; - for (list::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { - - list::iterator x; + for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { - if ((x = find (tracks.begin(), tracks.end(), (*i))) != tracks.end()) { + TrackViewList::iterator x = find (tracks.begin(), tracks.end(), *i); + if (x != tracks.end()) { tracks.erase (x); changed = true; } @@ -552,8 +563,10 @@ void Selection::remove (MidiCutBuffer* midi) { MidiNoteSelection::iterator x; - + if ((x = find (midi_notes.begin(), midi_notes.end(), midi)) != midi_notes.end()) { + /* remember that we own the MCB */ + delete *x; midi_notes.erase (x); MidiNotesChanged (); } @@ -630,7 +643,7 @@ Selection::remove (uint32_t selection_id) for (list::iterator i = time.begin(); i != time.end(); ++i) { if ((*i).id == selection_id) { time.erase (i); - + TimeChanged (); break; } @@ -660,7 +673,7 @@ Selection::set (TimeAxisView* track) } void -Selection::set (const list& track_list) +Selection::set (const TrackViewList& track_list) { clear_tracks (); add (track_list); @@ -696,7 +709,7 @@ Selection::set (const RegionSelection& rs) } void -Selection::set (MidiRegionView* mrv) +Selection::set (MidiRegionView* mrv) { clear_midi_regions (); add (mrv); @@ -724,8 +737,11 @@ Selection::set (vector& v) add (v); } +/** Set the start and end time of the time selection, without changing + * the list of tracks it applies to. + */ long -Selection::set (TimeAxisView* track, nframes_t start, nframes_t end) +Selection::set (nframes_t start, nframes_t end) { if ((start == 0 && end == 0) || end < start) { return 0; @@ -743,14 +759,6 @@ Selection::set (TimeAxisView* track, nframes_t start, nframes_t end) time.front().end = end; } - if (track) { - time.track = track; - time.group = track->route_group(); - } else { - time.track = 0; - time.group = 0; - } - time.consolidate (); TimeChanged (); @@ -788,8 +796,8 @@ Selection::empty (bool internal_selection) { bool object_level_empty = regions.empty () && tracks.empty () && - points.empty () && - playlists.empty () && + points.empty () && + playlists.empty () && lines.empty () && time.empty () && playlists.empty () && @@ -825,14 +833,14 @@ Selection::toggle (const vector& autos) } void -Selection::toggle (list& selectables) +Selection::toggle (list const & selectables) { RegionView* rv; AutomationSelectable* as; vector rvs; vector autos; - for (std::list::iterator i = selectables.begin(); i != selectables.end(); ++i) { + for (std::list::const_iterator i = selectables.begin(); i != selectables.end(); ++i) { if ((rv = dynamic_cast (*i)) != 0) { rvs.push_back (rv); } else if ((as = dynamic_cast (*i)) != 0) { @@ -847,15 +855,15 @@ Selection::toggle (list& selectables) if (!rvs.empty()) { toggle (rvs); - } + } if (!autos.empty()) { toggle (autos); - } + } } void -Selection::set (list& selectables) +Selection::set (list const & selectables) { clear_regions(); clear_points (); @@ -864,14 +872,14 @@ Selection::set (list& selectables) void -Selection::add (list& selectables) +Selection::add (list const & selectables) { RegionView* rv; AutomationSelectable* as; vector rvs; vector autos; - for (std::list::iterator i = selectables.begin(); i != selectables.end(); ++i) { + for (std::list::const_iterator i = selectables.begin(); i != selectables.end(); ++i) { if ((rv = dynamic_cast (*i)) != 0) { rvs.push_back (rv); } else if ((as = dynamic_cast (*i)) != 0) { @@ -886,11 +894,11 @@ Selection::add (list& selectables) if (!rvs.empty()) { add (rvs); - } + } if (!autos.empty()) { add (autos); - } + } } void @@ -923,7 +931,7 @@ void Selection::toggle (Marker* m) { MarkerSelection::iterator i; - + if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { add (m); } else { @@ -946,13 +954,6 @@ void Selection::add (Marker* m) { if (find (markers.begin(), markers.end(), m) == markers.end()) { - - /* disambiguate which remove() for the compiler */ - - void (Selection::*pmf)(Marker*) = &Selection::remove; - - m->GoingAway.connect (bind (mem_fun (*this, pmf), m)); - markers.push_back (m); MarkersChanged(); } @@ -975,7 +976,7 @@ MarkerSelection::range (nframes64_t& s, nframes64_t& e) if ((*i)->position() < s) { s = (*i)->position(); - } + } if ((*i)->position() > e) { e = (*i)->position();