summaryrefslogtreecommitdiffstats
path: root/src/server/events/Delta.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-01-18 15:28:04 -0500
committerDavid Robillard <d@drobilla.net>2017-01-18 15:28:04 -0500
commit02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340 (patch)
tree5bbfb3eba51024529e3970103bfb0065b26bc8ec /src/server/events/Delta.hpp
parent4e1c349bd3687b866597afda56dc5f1b0c4be4ef (diff)
downloadingen-02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340.tar.gz
ingen-02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340.tar.bz2
ingen-02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340.zip
Fix invalid cross-thread use of mutex
Instead of abusing store mutex for this purpose, extend blocking mechanism of the PreProcessor (designed for atomic bundle execution) to support execution of individual atomic events which must be executed before the next event can be pre-processed.
Diffstat (limited to 'src/server/events/Delta.hpp')
-rw-r--r--src/server/events/Delta.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index ca9d0276..d2326cd9 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -78,6 +78,8 @@ public:
void post_process();
void undo(Interface& target);
+ Execution get_execution() const;
+
private:
enum class SpecialType {
NONE,
@@ -115,7 +117,7 @@ private:
boost::optional<Resource> _preset;
- std::unique_lock<Store::Mutex> _poly_lock; ///< Long-term lock for poly changes
+ bool _block;
};
} // namespace Events