allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

amend 67f9f6fd: no recursive ReaderLock

Browse Source
This commit is contained in:
Robin Gareus
2017-06-03 12:31:59 +02:00
parent c2cb60ea03
commit d662e6e0bf
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/ardour/slavable_automation_control.h
View File

@@ -64,7 +64,13 @@ class LIBARDOUR_API SlavableAutomationControl : public AutomationControl
int set_state (XMLNode const&, int);
XMLNode& get_state();
bool find_next_event (double now, double end, Evoral::ControlEvent& next_event) const;
bool find_next_event (double n, double e, Evoral::ControlEvent& ev) const
{
Glib::Threads::RWLock::ReaderLock lm (master_lock);
return find_next_event_locked (n, e, ev);
}
bool find_next_event_locked (double now, double end, Evoral::ControlEvent& next_event) const;
protected:

5
libs/ardour/slavable_automation_control.cc
View File

@@ -345,9 +345,8 @@ SlavableAutomationControl::clear_masters ()
}
bool
SlavableAutomationControl::find_next_event (double now, double end, Evoral::ControlEvent& next_event) const
SlavableAutomationControl::find_next_event_locked (double now, double end, Evoral::ControlEvent& next_event) const
{
Glib::Threads::RWLock::ReaderLock lm (master_lock);
if (_masters.empty()) {
return false;
}
@@ -363,7 +362,7 @@ SlavableAutomationControl::find_next_event (double now, double end, Evoral::Cont
boost::shared_ptr<SlavableAutomationControl> sc
= boost::dynamic_pointer_cast<SlavableAutomationControl>(ac);
if (sc && sc->find_next_event (now, end, next_event)) {
if (sc && sc->find_next_event_locked (now, end, next_event)) {
rv = true;
}