diff options
author | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
commit | 629fb50716083c71146340de97eb8651679ca9fb (patch) | |
tree | 9c5f25fdfd24f3cdb89924062f291a6647580878 /ingen/client/PluginUI.hpp | |
parent | 6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff) | |
download | ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2 ingen-629fb50716083c71146340de97eb8651679ca9fb.zip |
Merge Ingen::Shared namespace into Ingen namespace and core libingen library.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client/PluginUI.hpp')
-rw-r--r-- | ingen/client/PluginUI.hpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp index 25422fe8..1c45bd56 100644 --- a/ingen/client/PluginUI.hpp +++ b/ingen/client/PluginUI.hpp @@ -23,13 +23,12 @@ #include "suil/suil.h" -#include "ingen/shared/LV2Features.hpp" +#include "ingen/LV2Features.hpp" namespace Ingen { class Interface; - -namespace Shared { class World; } +class World; namespace Client { @@ -43,7 +42,7 @@ class PluginUI { public: ~PluginUI(); - static SharedPtr<PluginUI> create(Ingen::Shared::World* world, + static SharedPtr<PluginUI> create(Ingen::World* world, SharedPtr<const NodeModel> node, const LilvPlugin* plugin); @@ -56,22 +55,22 @@ public: bool is_resizable() const; - Ingen::Shared::World* world() const { return _world; } - SharedPtr<const NodeModel> node() const { return _node; } + Ingen::World* world() const { return _world; } + SharedPtr<const NodeModel> node() const { return _node; } private: - PluginUI(Ingen::Shared::World* world, + PluginUI(Ingen::World* world, SharedPtr<const NodeModel> node, const LilvNode* ui_node); - Ingen::Shared::World* _world; + Ingen::World* _world; SharedPtr<const NodeModel> _node; SuilInstance* _instance; LilvNode* _ui_node; static SuilHost* ui_host; - SharedPtr<Shared::LV2Features::FeatureArray> _features; + SharedPtr<LV2Features::FeatureArray> _features; }; } // namespace Client |