From bf71b4be9f36f9d7c619053d97ab6f98bb98dc21 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 14 Dec 2016 14:44:32 -0500
Subject: Fix real-time safety of control bindings

---
 src/server/events/Delta.hpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/server/events/Delta.hpp')

diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index 98570210..ca9d0276 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -92,26 +92,26 @@ private:
 
 	typedef std::vector<SetPortValue*> SetEvents;
 
-	Event*                   _create_event;
-	SetEvents                _set_events;
-	std::vector<SpecialType> _types;
-	std::vector<SpecialType> _remove_types;
-	Raul::URI                _subject;
-	Resource::Properties     _properties;
-	Resource::Properties     _remove;
-	ClientUpdate             _update;
-	Ingen::Resource*         _object;
-	GraphImpl*               _graph;
-	CompiledGraph*           _compiled_graph;
-	LilvState*               _state;
-	Resource::Graph          _context;
-	ControlBindings::Key     _binding;
-	Type                     _type;
+	Event*                    _create_event;
+	SetEvents                 _set_events;
+	std::vector<SpecialType>  _types;
+	std::vector<SpecialType>  _remove_types;
+	Raul::URI                 _subject;
+	Resource::Properties      _properties;
+	Resource::Properties      _remove;
+	ClientUpdate              _update;
+	Ingen::Resource*          _object;
+	GraphImpl*                _graph;
+	CompiledGraph*            _compiled_graph;
+	ControlBindings::Binding* _binding;
+	LilvState*                _state;
+	Resource::Graph           _context;
+	Type                      _type;
 
 	Resource::Properties _added;
 	Resource::Properties _removed;
 
-	SPtr<ControlBindings::Bindings> _old_bindings;
+	std::vector<ControlBindings::Binding*> _removed_bindings;
 
 	boost::optional<Resource> _preset;
 
-- 
cgit v1.2.1