summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-11-14 21:05:36 +0100
committerRobin Gareus <robin@gareus.org>2016-11-14 21:06:18 +0100
commitf30fbcaaf968dcb5af8b762b6e3d25f6fe313f3f (patch)
tree51dfdfda0759fdc5f72e55a1a493fc0d8263dd29 /libs/ardour/ardour
parent8e3b6c9ac6b4d0e167ab116d197d32b0f8202e8b (diff)
Fix VST state-lock SNAFU (effSetChunk and process are exclusive)
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/vst_plugin.h2
-rw-r--r--libs/ardour/ardour/vst_types.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h
index 182b432692..2a8b4dc9a1 100644
--- a/libs/ardour/ardour/vst_plugin.h
+++ b/libs/ardour/ardour/vst_plugin.h
@@ -120,8 +120,6 @@ protected:
framepos_t _transport_frame;
float _transport_speed;
mutable std::map <uint32_t, float> _parameter_defaults;
-
- Glib::Threads::Mutex _state_lock;
};
}
diff --git a/libs/ardour/ardour/vst_types.h b/libs/ardour/ardour/vst_types.h
index 936cab6173..0b8bcb6273 100644
--- a/libs/ardour/ardour/vst_types.h
+++ b/libs/ardour/ardour/vst_types.h
@@ -129,6 +129,7 @@ struct LIBARDOUR_API _VSTState
struct _VSTState * next;
pthread_mutex_t lock;
+ pthread_mutex_t state_lock;
pthread_cond_t window_status_change;
pthread_cond_t plugin_dispatcher_called;
pthread_cond_t window_created;
@@ -136,6 +137,7 @@ struct LIBARDOUR_API _VSTState
void init () {
pthread_mutex_init (&lock, 0);
+ pthread_mutex_init (&state_lock, 0);
pthread_cond_init (&window_status_change, 0);
pthread_cond_init (&plugin_dispatcher_called, 0);
pthread_cond_init (&window_created, 0);