diff options
| author | David Robillard <d@drobilla.net> | 2016-07-31 23:00:45 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-07-31 23:00:45 -0400 |
| commit | 7eb24a2761deb9604f1c6b813e6de69876088f9e (patch) | |
| tree | 919062cdc82d8c6a0697249bf95e6668c19eae83 /src/server/LV2Block.hpp | |
| parent | a3b28f2924801bd59ea7924a652247269e6af928 (diff) | |
| download | ingen-7eb24a2761deb9604f1c6b813e6de69876088f9e.tar.gz ingen-7eb24a2761deb9604f1c6b813e6de69876088f9e.tar.bz2 ingen-7eb24a2761deb9604f1c6b813e6de69876088f9e.zip | |
Support thread-safe state restoration
Diffstat (limited to 'src/server/LV2Block.hpp')
| -rw-r--r-- | src/server/LV2Block.hpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index 6483f8b0..6e78ad83 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -1,6 +1,6 @@ /* This file is part of Ingen. - Copyright 2007-2015 David Robillard <http://drobilla.net/> + Copyright 2007-2016 David Robillard <http://drobilla.net/> Ingen is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free @@ -17,6 +17,8 @@ #ifndef INGEN_ENGINE_LV2BLOCK_HPP #define INGEN_ENGINE_LV2BLOCK_HPP +#include <mutex> + #include "lilv/lilv.h" #include "lv2/lv2plug.in/ns/ext/worker/worker.h" #include "raul/Maid.hpp" @@ -60,14 +62,14 @@ public: void activate(BufferFactory& bufs); void deactivate(); - void work(uint32_t size, const void* data); + LV2_Worker_Status work(uint32_t size, const void* data); void run(ProcessContext& context); void post_process(ProcessContext& context); LilvState* load_preset(const Raul::URI& uri); - void apply_state(LilvState* state); + void apply_state(Worker* worker, LilvState* state); boost::optional<Resource> save_preset(const Raul::URI& bundle, const Properties& props); @@ -83,7 +85,7 @@ protected: uint32_t voice, bool preparing); - void load_default_state(); + void load_default_state(Worker* worker); inline LilvInstance* instance(uint32_t voice) { return (LilvInstance*)(*_instances)[voice].get(); @@ -122,6 +124,7 @@ protected: Instances* _instances; Instances* _prepared_instances; const LV2_Worker_Interface* _worker_iface; + std::mutex _work_mutex; Responses _responses; SPtr<LV2Features::FeatureArray> _features; }; |