smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

AutomationWatch: single DropReferences connection per AC

Browse source
This commit is contained in:
Robin Gareus 2017-07-22 15:40:27 +02:00
parent 48ec6dd5c4
commit 24829c93b8
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/automation_watch.h
View file

@ -33,7 +33,7 @@ namespace ARDOUR {
class AutomationControl;
class LIBARDOUR_API AutomationWatch : public sigc::trackable, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList {
class LIBARDOUR_API AutomationWatch : public sigc::trackable, public ARDOUR::SessionHandlePtr {
public:
static AutomationWatch& instance();
@ -46,6 +46,7 @@ class LIBARDOUR_API AutomationWatch : public sigc::trackable, public ARDOUR::Ses
private:
typedef std::set<boost::shared_ptr<ARDOUR::AutomationControl> > AutomationWatches;
typedef std::map<boost::shared_ptr<ARDOUR::AutomationControl>, PBD::ScopedConnection> AutomationConnection;
AutomationWatch ();
~AutomationWatch();
@ -55,6 +56,7 @@ class LIBARDOUR_API AutomationWatch : public sigc::trackable, public ARDOUR::Ses
framepos_t _last_time;
bool _run_thread;
AutomationWatches automation_watches;
AutomationConnection automation_connections;
Glib::Threads::Mutex automation_watch_lock;
PBD::ScopedConnection transport_connection;

11
libs/ardour/automation_watch.cc
View file

@ -60,6 +60,7 @@ AutomationWatch::~AutomationWatch ()
Glib::Threads::Mutex::Lock lm (automation_watch_lock);
automation_watches.clear ();
automation_connections.clear ();
}
void
@ -67,7 +68,11 @@ AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
{
Glib::Threads::Mutex::Lock lm (automation_watch_lock);
DEBUG_TRACE (DEBUG::Automation, string_compose ("now watching control %1 for automation, astate = %2\n", ac->name(), enum_2_string (ac->automation_state())));
automation_watches.insert (ac);
std::pair<AutomationWatches::iterator, bool> r = automation_watches.insert (ac);
if (!r.second) {
return;
}
/* if an automation control is added here while the transport is
* rolling, make sure that it knows that there is a write pass going
@ -87,7 +92,7 @@ AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac)
*/
boost::weak_ptr<AutomationControl> wac (ac);
ac->DropReferences.connect_same_thread (*this, boost::bind (&AutomationWatch::remove_weak_automation_watch, this, wac));
ac->DropReferences.connect_same_thread (automation_connections[ac], boost::bind (&AutomationWatch::remove_weak_automation_watch, this, wac));
}
void
@ -108,6 +113,7 @@ AutomationWatch::remove_automation_watch (boost::shared_ptr<AutomationControl> a
Glib::Threads::Mutex::Lock lm (automation_watch_lock);
DEBUG_TRACE (DEBUG::Automation, string_compose ("remove control %1 from automation watch\n", ac->name()));
automation_watches.erase (ac);
automation_connections.erase (ac);
ac->list()->set_in_write_pass (false);
}
@ -128,6 +134,7 @@ AutomationWatch::transport_stop_automation_watches (framepos_t when)
*/
automation_watches.clear ();
automation_connections.clear ();
}
for (AutomationWatches::iterator i = tmp.begin(); i != tmp.end(); ++i) {