diff options
author | David Robillard <d@drobilla.net> | 2012-07-30 23:22:44 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-07-30 23:22:44 +0000 |
commit | 9088edb2534a616b757197662d77abcb0291470b (patch) | |
tree | fc3c86d6a7af39642768d4b864dd38438f9a2e48 /src/server/events/Delta.hpp | |
parent | 0e1bf6ddfc77866ff6477a3f394c030c2a5e1b39 (diff) | |
download | ingen-9088edb2534a616b757197662d77abcb0291470b.tar.gz ingen-9088edb2534a616b757197662d77abcb0291470b.tar.bz2 ingen-9088edb2534a616b757197662d77abcb0291470b.zip |
Merge Resource and ResourceImpl, eliminating more virtual inheritance.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4577 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/Delta.hpp')
-rw-r--r-- | src/server/events/Delta.hpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index e7d708ae..6bb6508a 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -26,7 +26,7 @@ namespace Ingen { -namespace Shared { class ResourceImpl; } +class Resource; namespace Server { @@ -97,19 +97,19 @@ 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; - Ingen::Shared::ResourceImpl* _object; - PatchImpl* _patch; - CompiledPatch* _compiled_patch; - Resource::Graph _context; - ControlBindings::Key _binding; - bool _create; + Event* _create_event; + SetEvents _set_events; + std::vector<SpecialType> _types; + std::vector<SpecialType> _remove_types; + Raul::URI _subject; + Resource::Properties _properties; + Resource::Properties _remove; + Ingen::Resource* _object; + PatchImpl* _patch; + CompiledPatch* _compiled_patch; + Resource::Graph _context; + ControlBindings::Key _binding; + bool _create; SharedPtr<ControlBindings::Bindings> _old_bindings; }; |