ardour/livetrax
13
0
Fork 0
Code

re-order per-object and global selection change signals

Browse Source
This commit is contained in:
Paul Davis 2017-05-11 18:28:49 +01:00
parent d42da9046e
commit feab5ef91e
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libs/ardour/selection.cc
View File

@ -73,13 +73,6 @@ CoreSelection::add (boost::shared_ptr<Stripable> s, boost::shared_ptr<Automation
if (_stripables.insert (ss).second) {
DEBUG_TRACE (DEBUG::Selection, string_compose ("added %1/%2 to s/c selection\n", s->name(), c));
/* send per-object signal to notify interested parties
the selection status has changed
*/
if (s) {
PropertyChange pc (Properties::selected);
s->PropertyChanged (pc);
}
send = true;
} else {
DEBUG_TRACE (DEBUG::Selection, string_compose ("%1/%2 already in s/c selection\n", s->name(), c));
@ -88,6 +81,13 @@ CoreSelection::add (boost::shared_ptr<Stripable> s, boost::shared_ptr<Automation
if (send) {
send_selection_change ();
/* send per-object signal to notify interested parties
the selection status has changed
*/
if (s) {
PropertyChange pc (Properties::selected);
s->PropertyChanged (pc);
}
}
}
@ -105,6 +105,12 @@ CoreSelection::remove (boost::shared_ptr<Stripable> s, boost::shared_ptr<Automat
if (i != _stripables.end()) {
_stripables.erase (i);
DEBUG_TRACE (DEBUG::Selection, string_compose ("removed %1/%2 from s/c selection\n", s, c));
send = true;
}
}
if (send) {
send_selection_change ();
/* send per-object signal to notify interested parties
the selection status has changed
*/
@ -112,12 +118,6 @@ CoreSelection::remove (boost::shared_ptr<Stripable> s, boost::shared_ptr<Automat
PropertyChange pc (Properties::selected);
s->PropertyChanged (pc);
}
send = true;
}
}
if (send) {
send_selection_change ();
}
}
@ -136,6 +136,10 @@ CoreSelection::set (boost::shared_ptr<Stripable> s, boost::shared_ptr<Automation
_stripables.clear ();
_stripables.insert (ss);
DEBUG_TRACE (DEBUG::Selection, string_compose ("set s/c selection to %1/%2\n", s->name(), c));
}
send_selection_change ();
/* send per-object signal to notify interested parties
the selection status has changed
*/
@ -145,9 +149,6 @@ CoreSelection::set (boost::shared_ptr<Stripable> s, boost::shared_ptr<Automation
}
}
send_selection_change ();
}
void
CoreSelection::clear_stripables ()
{
@ -177,13 +178,14 @@ CoreSelection::clear_stripables ()
}
if (send) {
send_selection_change ();
PropertyChange pc (Properties::selected);
for (std::vector<boost::shared_ptr<Stripable> >::iterator ss = s.begin(); ss != s.end(); ++ss) {
(*ss)->PropertyChanged (pc);
}
send_selection_change ();
}
}