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 | |
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')
-rw-r--r-- | ingen/AtomReader.hpp (renamed from ingen/shared/AtomReader.hpp) | 12 | ||||
-rw-r--r-- | ingen/AtomSink.hpp (renamed from ingen/shared/AtomSink.hpp) | 8 | ||||
-rw-r--r-- | ingen/AtomWriter.hpp (renamed from ingen/shared/AtomWriter.hpp) | 10 | ||||
-rw-r--r-- | ingen/Builder.hpp (renamed from ingen/shared/Builder.hpp) | 20 | ||||
-rw-r--r-- | ingen/ClashAvoider.hpp (renamed from ingen/shared/ClashAvoider.hpp) | 8 | ||||
-rw-r--r-- | ingen/Configuration.hpp (renamed from ingen/shared/Configuration.hpp) | 8 | ||||
-rw-r--r-- | ingen/Forge.hpp (renamed from ingen/shared/Forge.hpp) | 10 | ||||
-rw-r--r-- | ingen/GraphObject.hpp | 7 | ||||
-rw-r--r-- | ingen/LV2Features.hpp (renamed from ingen/shared/LV2Features.hpp) | 18 | ||||
-rw-r--r-- | ingen/Module.hpp (renamed from ingen/shared/Module.hpp) | 12 | ||||
-rw-r--r-- | ingen/Plugin.hpp | 2 | ||||
-rw-r--r-- | ingen/Resource.hpp | 21 | ||||
-rw-r--r-- | ingen/Store.hpp (renamed from ingen/shared/Store.hpp) | 8 | ||||
-rw-r--r-- | ingen/URIMap.hpp (renamed from ingen/shared/URIMap.hpp) | 12 | ||||
-rw-r--r-- | ingen/URIs.hpp (renamed from ingen/shared/URIs.hpp) | 18 | ||||
-rw-r--r-- | ingen/World.hpp (renamed from ingen/shared/World.hpp) | 17 | ||||
-rw-r--r-- | ingen/client/ClientStore.hpp | 12 | ||||
-rw-r--r-- | ingen/client/NodeModel.hpp | 10 | ||||
-rw-r--r-- | ingen/client/ObjectModel.hpp | 4 | ||||
-rw-r--r-- | ingen/client/PatchModel.hpp | 2 | ||||
-rw-r--r-- | ingen/client/PluginModel.hpp | 19 | ||||
-rw-r--r-- | ingen/client/PluginUI.hpp | 17 | ||||
-rw-r--r-- | ingen/client/PortModel.hpp | 2 | ||||
-rw-r--r-- | ingen/runtime_paths.hpp (renamed from ingen/shared/runtime_paths.hpp) | 8 | ||||
-rw-r--r-- | ingen/serialisation/Parser.hpp | 7 | ||||
-rw-r--r-- | ingen/serialisation/Serialiser.hpp | 10 |
26 files changed, 120 insertions, 162 deletions
diff --git a/ingen/shared/AtomReader.hpp b/ingen/AtomReader.hpp index 38c89a2b..f14ebefd 100644 --- a/ingen/shared/AtomReader.hpp +++ b/ingen/AtomReader.hpp @@ -14,16 +14,15 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_ATOMREADER_HPP -#define INGEN_SHARED_ATOMREADER_HPP +#ifndef INGEN_ATOMREADER_HPP +#define INGEN_ATOMREADER_HPP #include "ingen/Interface.hpp" -#include "ingen/shared/AtomSink.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/AtomSink.hpp" +#include "ingen/URIs.hpp" #include "serd/serd.h" namespace Ingen { -namespace Shared { class AtomSink; class Forge; @@ -55,8 +54,7 @@ private: Interface& _iface; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_ATOMREADER_HPP +#endif // INGEN_ATOMREADER_HPP diff --git a/ingen/shared/AtomSink.hpp b/ingen/AtomSink.hpp index f25e6548..ae8fd07a 100644 --- a/ingen/shared/AtomSink.hpp +++ b/ingen/AtomSink.hpp @@ -14,13 +14,12 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_ATOMSINK_HPP -#define INGEN_SHARED_ATOMSINK_HPP +#ifndef INGEN_ATOMSINK_HPP +#define INGEN_ATOMSINK_HPP #include "lv2/lv2plug.in/ns/ext/atom/atom.h" namespace Ingen { -namespace Shared { /** A sink for LV2 Atoms. * @ingroup IngenShared @@ -35,8 +34,7 @@ public: virtual bool write(const LV2_Atom* msg) = 0; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_ATOMSINK_HPP +#endif // INGEN_ATOMSINK_HPP diff --git a/ingen/shared/AtomWriter.hpp b/ingen/AtomWriter.hpp index 7087bfd6..31a3c099 100644 --- a/ingen/shared/AtomWriter.hpp +++ b/ingen/AtomWriter.hpp @@ -14,18 +14,17 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_ATOMWRITER_HPP -#define INGEN_SHARED_ATOMWRITER_HPP +#ifndef INGEN_ATOMWRITER_HPP +#define INGEN_ATOMWRITER_HPP #include <string> #include "ingen/Interface.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/forge.h" #include "serd/serd.h" namespace Ingen { -namespace Shared { class AtomSink; class URIMap; @@ -93,8 +92,7 @@ private: int32_t _id; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_ATOMWRITER_HPP +#endif // INGEN_ATOMWRITER_HPP diff --git a/ingen/shared/Builder.hpp b/ingen/Builder.hpp index 1c57c871..168ab841 100644 --- a/ingen/shared/Builder.hpp +++ b/ingen/Builder.hpp @@ -14,16 +14,15 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_BUILDER_HPP -#define INGEN_SHARED_BUILDER_HPP +#ifndef INGEN_BUILDER_HPP +#define INGEN_BUILDER_HPP + +#include "raul/SharedPtr.hpp" namespace Ingen { -class Interface; class GraphObject; - -namespace Shared { - +class Interface; class URIs; /** Wrapper for Interface to create existing objects/models. @@ -33,19 +32,18 @@ class URIs; class Builder { public: - Builder(Shared::URIs& uris, Interface& interface); + Builder(URIs& uris, Interface& interface); virtual ~Builder() {} void build(SharedPtr<const GraphObject> object); void connect(SharedPtr<const GraphObject> object); private: - Shared::URIs& _uris; - Interface& _interface; + URIs& _uris; + Interface& _interface; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_BUILDER_HPP +#endif // INGEN_BUILDER_HPP diff --git a/ingen/shared/ClashAvoider.hpp b/ingen/ClashAvoider.hpp index e3f4faaf..66b860c2 100644 --- a/ingen/shared/ClashAvoider.hpp +++ b/ingen/ClashAvoider.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_CLASHAVOIDER_HPP -#define INGEN_SHARED_CLASHAVOIDER_HPP +#ifndef INGEN_CLASHAVOIDER_HPP +#define INGEN_CLASHAVOIDER_HPP #include <inttypes.h> @@ -30,7 +30,6 @@ class Path; } namespace Ingen { -namespace Shared { class Store; @@ -103,8 +102,7 @@ private: SymbolMap _symbol_map; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_CLASHAVOIDER_HPP +#endif // INGEN_CLASHAVOIDER_HPP diff --git a/ingen/shared/Configuration.hpp b/ingen/Configuration.hpp index 211184d0..f45f3869 100644 --- a/ingen/shared/Configuration.hpp +++ b/ingen/Configuration.hpp @@ -14,13 +14,12 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_CONFIGURATION_HPP -#define INGEN_SHARED_CONFIGURATION_HPP +#ifndef INGEN_CONFIGURATION_HPP +#define INGEN_CONFIGURATION_HPP #include "raul/Configuration.hpp" namespace Ingen { -namespace Shared { /** Ingen configuration (command line options). * @ingroup IngenShared @@ -30,8 +29,7 @@ public: Configuration(); }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_CONFIGURATION_HPP +#endif // INGEN_CONFIGURATION_HPP diff --git a/ingen/shared/Forge.hpp b/ingen/Forge.hpp index 1d820bc0..8e7df926 100644 --- a/ingen/shared/Forge.hpp +++ b/ingen/Forge.hpp @@ -14,15 +14,14 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_FORGE_HPP -#define INGEN_SHARED_FORGE_HPP +#ifndef INGEN_FORGE_HPP +#define INGEN_FORGE_HPP #include <string> #include "raul/Atom.hpp" namespace Ingen { -namespace Shared { class URIMap; @@ -31,12 +30,11 @@ class URIMap; */ class Forge : public Raul::Forge { public: - explicit Forge(Shared::URIMap& map); + explicit Forge(URIMap& map); std::string str(const Raul::Atom& atom); }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_FORGE_HPP +#endif // INGEN_FORGE_HPP diff --git a/ingen/GraphObject.hpp b/ingen/GraphObject.hpp index a8bee0b0..80da116e 100644 --- a/ingen/GraphObject.hpp +++ b/ingen/GraphObject.hpp @@ -17,10 +17,9 @@ #ifndef INGEN_GRAPHOBJECT_HPP #define INGEN_GRAPHOBJECT_HPP -#include "ingen/Resource.hpp" -#include "raul/Deletable.hpp" #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" +#include "ingen/Resource.hpp" namespace Raul { class Atom; @@ -40,8 +39,6 @@ class Plugin; class GraphObject : public Resource { public: - virtual void set_path(const Raul::Path& path) = 0; - enum GraphType { PATCH, NODE, @@ -67,7 +64,7 @@ public: virtual GraphObject* graph_parent() const = 0; protected: - GraphObject(Shared::URIs& uris, const Raul::Path& path) + GraphObject(URIs& uris, const Raul::Path& path) : Resource(uris, path) {} diff --git a/ingen/shared/LV2Features.hpp b/ingen/LV2Features.hpp index 822df818..b7b1395c 100644 --- a/ingen/shared/LV2Features.hpp +++ b/ingen/LV2Features.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_LV2FEATURES_HPP -#define INGEN_SHARED_LV2FEATURES_HPP +#ifndef INGEN_LV2FEATURES_HPP +#define INGEN_LV2FEATURES_HPP #include <vector> @@ -27,9 +27,6 @@ namespace Ingen { class GraphObject; - -namespace Shared { - class World; /** Features for use by LV2 plugins. @@ -43,8 +40,8 @@ public: public: virtual ~Feature() {} - virtual SharedPtr<LV2_Feature> feature(Shared::World* world, - GraphObject* node) = 0; + virtual SharedPtr<LV2_Feature> feature(World* world, + GraphObject* node) = 0; }; class FeatureArray : public Raul::Noncopyable { @@ -64,15 +61,14 @@ public: void add_feature(SharedPtr<Feature> feature); - SharedPtr<FeatureArray> lv2_features(Shared::World* world, - GraphObject* node) const; + SharedPtr<FeatureArray> lv2_features(World* world, + GraphObject* node) const; private: typedef std::vector< SharedPtr<Feature> > Features; Features _features; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_LV2FEATURES_HPP +#endif // INGEN_LV2FEATURES_HPP diff --git a/ingen/shared/Module.hpp b/ingen/Module.hpp index 81179426..3decc185 100644 --- a/ingen/shared/Module.hpp +++ b/ingen/Module.hpp @@ -14,13 +14,12 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_MODULE_HPP -#define INGEN_SHARED_MODULE_HPP +#ifndef INGEN_MODULE_HPP +#define INGEN_MODULE_HPP #include <glibmm/module.h> namespace Ingen { -namespace Shared { class World; @@ -33,8 +32,8 @@ struct Module { Module() : library(NULL) {} virtual ~Module() {} - virtual void load(Ingen::Shared::World* world) = 0; - virtual void run(Ingen::Shared::World* world) {} + virtual void load(Ingen::World* world) = 0; + virtual void run(Ingen::World* world) {} /** Library implementing this module. * @@ -49,7 +48,6 @@ private: Module& operator=(const Module& noncopyable); }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_MODULE_HPP +#endif // INGEN_MODULE_HPP diff --git a/ingen/Plugin.hpp b/ingen/Plugin.hpp index 30c70963..544a2aad 100644 --- a/ingen/Plugin.hpp +++ b/ingen/Plugin.hpp @@ -31,7 +31,7 @@ namespace Ingen { class Plugin : public Resource { public: - Plugin(Shared::URIs& uris, const Raul::URI& uri) + Plugin(URIs& uris, const Raul::URI& uri) : Resource(uris, uri) {} diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp index 4aed2f6d..1e94e1e8 100644 --- a/ingen/Resource.hpp +++ b/ingen/Resource.hpp @@ -20,13 +20,12 @@ #include <map> #include <string> +#include "ingen/URIs.hpp" #include "raul/Atom.hpp" #include "raul/Deletable.hpp" #include "raul/URI.hpp" #include "raul/log.hpp" -#include "ingen/shared/URIs.hpp" - #define NS_INGEN "http://drobilla.net/ns/ingen#" namespace Ingen { @@ -37,7 +36,7 @@ namespace Ingen { class Resource : public Raul::Deletable { public: - Resource(Shared::URIs& uris, const Raul::URI& uri) + Resource(URIs& uris, const Raul::URI& uri) : _uris(uris) , _uri(uri) {} @@ -94,7 +93,7 @@ public: virtual ~Resource() {} - Shared::URIs& uris() const { return _uris; } + URIs& uris() const { return _uris; } virtual void set_uri(const Raul::URI& uri) { _uri = uri; } virtual const Raul::URI& uri() const { return _uri; } @@ -137,17 +136,17 @@ public: * If some coherent ingen type is found, true is returned and the appropriate * output parameter set to true. Otherwise false is returned. */ - static bool type(const Shared::URIs& uris, - const Properties& properties, - bool& patch, - bool& node, - bool& port, - bool& is_output); + static bool type(const URIs& uris, + const Properties& properties, + bool& patch, + bool& node, + bool& port, + bool& is_output); protected: const Raul::Atom& set_property(const Raul::URI& uri, const Raul::Atom& value) const; - Shared::URIs& _uris; + URIs& _uris; private: Raul::URI _uri; diff --git a/ingen/shared/Store.hpp b/ingen/Store.hpp index af281b9a..2f5afa1e 100644 --- a/ingen/shared/Store.hpp +++ b/ingen/Store.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_STORE_HPP -#define INGEN_SHARED_STORE_HPP +#ifndef INGEN_STORE_HPP +#define INGEN_STORE_HPP #include <string> @@ -27,7 +27,6 @@ #include "ingen/GraphObject.hpp" namespace Ingen { -namespace Shared { /** Store of objects in the patch hierarchy. * @ingroup IngenShared @@ -56,7 +55,6 @@ private: Glib::RWLock _lock; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_STORE_HPP +#endif // INGEN_STORE_HPP diff --git a/ingen/shared/URIMap.hpp b/ingen/URIMap.hpp index d30b843d..c46f4197 100644 --- a/ingen/shared/URIMap.hpp +++ b/ingen/URIMap.hpp @@ -14,19 +14,18 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_URIMAP_HPP -#define INGEN_SHARED_URIMAP_HPP +#ifndef INGEN_URIMAP_HPP +#define INGEN_URIMAP_HPP #include <map> #include <utility> -#include "ingen/shared/LV2Features.hpp" +#include "ingen/LV2Features.hpp" #include "lv2/lv2plug.in/ns/ext/urid/urid.h" #include "raul/URI.hpp" #include "raul/Noncopyable.hpp" namespace Ingen { -namespace Shared { /** URI to integer map and implementation of LV2 URID extension. * @ingroup IngenShared @@ -46,7 +45,7 @@ public: _feature.data = data; } - SharedPtr<LV2_Feature> feature(Shared::World*, GraphObject*) { + SharedPtr<LV2_Feature> feature(World*, GraphObject*) { return SharedPtr<LV2_Feature>(&_feature, NullDeleter<LV2_Feature>); } @@ -76,7 +75,6 @@ private: SharedPtr<URIDUnmapFeature> _urid_unmap_feature; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_URIMAP_HPP +#endif // INGEN_URIMAP_HPP diff --git a/ingen/shared/URIs.hpp b/ingen/URIs.hpp index 9e604841..ace1652b 100644 --- a/ingen/shared/URIs.hpp +++ b/ingen/URIs.hpp @@ -14,10 +14,10 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_URIS_HPP -#define INGEN_SHARED_URIS_HPP +#ifndef INGEN_URIS_HPP +#define INGEN_URIS_HPP -#include "ingen/shared/Forge.hpp" +#include "ingen/Forge.hpp" #include "lv2/lv2plug.in/ns/ext/urid/urid.h" #include "raul/Atom.hpp" #include "raul/Noncopyable.hpp" @@ -28,7 +28,6 @@ namespace Raul { } namespace Ingen { -namespace Shared { class URIMap; @@ -38,21 +37,21 @@ class URIMap; * using the URIMap so they can be used quickly with the performance of * integers, but still be dynamic. * - * @ingroup IngenShared + * @ingroup ingen */ class URIs : public Raul::Noncopyable { public: - URIs(Ingen::Shared::Forge& forge, URIMap* map); + URIs(Ingen::Forge& forge, URIMap* map); struct Quark : public Raul::URI { - Quark(Ingen::Shared::Forge& forge, URIMap* map, const char* str); + Quark(Ingen::Forge& forge, URIMap* map, const char* str); operator LV2_URID() const { return id; } operator Raul::Atom() const { return atom; } uint32_t id; Raul::Atom atom; }; - Ingen::Shared::Forge& forge; + Ingen::Forge& forge; const Quark atom_AtomPort; const Quark atom_Blank; @@ -139,7 +138,6 @@ public: const Quark wildcard; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_LV2URIMAP_HPP +#endif // INGEN_LV2URIMAP_HPP diff --git a/ingen/shared/World.hpp b/ingen/World.hpp index 9ac0188b..5d2bddda 100644 --- a/ingen/shared/World.hpp +++ b/ingen/World.hpp @@ -14,8 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_WORLD_HPP -#define INGEN_SHARED_WORLD_HPP +#ifndef INGEN_WORLD_HPP +#define INGEN_WORLD_HPP #include <string> @@ -37,8 +37,6 @@ class Parser; class Serialiser; } -namespace Shared { - class Configuration; class Forge; class LV2Features; @@ -134,10 +132,10 @@ public: virtual Sord::World* rdf_world(); virtual LilvWorld* lilv_world(); - virtual LV2Features& lv2_features(); - virtual Ingen::Shared::Forge& forge(); - virtual URIMap& uri_map(); - virtual URIs& uris(); + virtual LV2Features& lv2_features(); + virtual Ingen::Forge& forge(); + virtual URIMap& uri_map(); + virtual URIs& uris(); virtual void set_jack_uuid(const std::string& uuid); virtual std::string jack_uuid(); @@ -148,7 +146,6 @@ private: Impl* _impl; }; -} // namespace Shared } // namespace Ingen -#endif // INGEN_SHARED_WORLD_HPP +#endif // INGEN_WORLD_HPP diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index b5a51a83..720164d0 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -23,7 +23,7 @@ #include "ingen/Interface.hpp" #include "ingen/client/signal.hpp" -#include "ingen/shared/Store.hpp" +#include "ingen/Store.hpp" #include "raul/Path.hpp" #include "raul/PathTable.hpp" #include "raul/SharedPtr.hpp" @@ -33,7 +33,7 @@ namespace Raul { class Atom; } namespace Ingen { -namespace Shared { class URIs; } +class URIs; class GraphObject; @@ -50,12 +50,12 @@ class SigClientInterface; * * @ingroup IngenClient */ -class ClientStore : public Shared::Store +class ClientStore : public Store , public Interface , public INGEN_TRACKABLE { public: ClientStore( - Shared::URIs& uris, + URIs& uris, SharedPtr<Interface> engine = SharedPtr<Interface>(), SharedPtr<SigClientInterface> emitter = SharedPtr<SigClientInterface>()); @@ -72,7 +72,7 @@ public: SharedPtr<Plugins> plugins() { return _plugins; } void set_plugins(SharedPtr<Plugins> p) { _plugins = p; } - Shared::URIs& uris() { return _uris; } + URIs& uris() { return _uris; } void put(const Raul::URI& uri, const Resource::Properties& properties, @@ -130,7 +130,7 @@ private: bool attempt_connection(const Raul::Path& tail_path, const Raul::Path& head_path); - Shared::URIs& _uris; + URIs& _uris; SharedPtr<Interface> _engine; SharedPtr<SigClientInterface> _emitter; diff --git a/ingen/client/NodeModel.hpp b/ingen/client/NodeModel.hpp index 07810eed..93a512f0 100644 --- a/ingen/client/NodeModel.hpp +++ b/ingen/client/NodeModel.hpp @@ -31,7 +31,7 @@ namespace Raul { class Path; } namespace Ingen { -namespace Shared { class URIs; } +class URIs; namespace Client { @@ -79,10 +79,10 @@ public: protected: friend class ClientStore; - NodeModel(Shared::URIs& uris, - const Raul::URI& plugin_uri, - const Raul::Path& path); - NodeModel(Shared::URIs& uris, + NodeModel(URIs& uris, + const Raul::URI& plugin_uri, + const Raul::Path& path); + NodeModel(URIs& uris, SharedPtr<PluginModel> plugin, const Raul::Path& path); explicit NodeModel(const Raul::Path& path); diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp index 2ff8f898..69ad3e22 100644 --- a/ingen/client/ObjectModel.hpp +++ b/ingen/client/ObjectModel.hpp @@ -35,7 +35,7 @@ namespace Ingen { -namespace Shared { class URIs; } +class URIs; namespace Client { @@ -80,7 +80,7 @@ public: protected: friend class ClientStore; - ObjectModel(Shared::URIs& uris, const Raul::Path& path); + ObjectModel(URIs& uris, const Raul::Path& path); ObjectModel(const ObjectModel& copy); virtual void set_path(const Raul::Path& p); diff --git a/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp index 1ad55c78..64ef3d18 100644 --- a/ingen/client/PatchModel.hpp +++ b/ingen/client/PatchModel.hpp @@ -53,7 +53,7 @@ public: private: friend class ClientStore; - PatchModel(Shared::URIs& uris, const Raul::Path& patch_path) + PatchModel(URIs& uris, const Raul::Path& patch_path) : NodeModel(uris, "http://drobilla.net/ns/ingen#Patch", patch_path) { } diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index 0449cb51..13375c95 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -21,20 +21,19 @@ #include <string> #include <utility> +#include "ingen/Plugin.hpp" +#include "ingen/Resource.hpp" +#include "ingen/Resource.hpp" +#include "ingen/World.hpp" +#include "ingen/client/signal.hpp" #include "lilv/lilv.h" #include "raul/SharedPtr.hpp" #include "raul/Symbol.hpp" #include "sord/sordmm.hpp" -#include "ingen/Interface.hpp" -#include "ingen/Plugin.hpp" -#include "ingen/Resource.hpp" -#include "ingen/client/signal.hpp" -#include "ingen/shared/World.hpp" - namespace Ingen { -namespace Shared { class URIs; } +class URIs; namespace Client { @@ -49,7 +48,7 @@ class PluginUI; class PluginModel : public Ingen::Plugin { public: - PluginModel(Shared::URIs& uris, + PluginModel(URIs& uris, const Raul::URI& uri, const Raul::URI& type_uri, const Ingen::Resource::Properties& properties); @@ -75,8 +74,8 @@ public: bool has_ui() const; - SharedPtr<PluginUI> ui(Ingen::Shared::World* world, - SharedPtr<const NodeModel> node) const; + SharedPtr<PluginUI> ui(Ingen::World* world, + SharedPtr<const NodeModel> node) const; const std::string& icon_path() const; static std::string get_lv2_icon_path(const LilvPlugin* plugin); 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 diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp index 99cd85be..1a5a31be 100644 --- a/ingen/client/PortModel.hpp +++ b/ingen/client/PortModel.hpp @@ -89,7 +89,7 @@ public: private: friend class ClientStore; - PortModel(Shared::URIs& uris, + PortModel(URIs& uris, const Raul::Path& path, uint32_t index, Direction dir) diff --git a/ingen/shared/runtime_paths.hpp b/ingen/runtime_paths.hpp index 5709370b..3d36e55e 100644 --- a/ingen/shared/runtime_paths.hpp +++ b/ingen/runtime_paths.hpp @@ -14,13 +14,12 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef INGEN_SHARED_RUNTIME_PATHS_HPP -#define INGEN_SHARED_RUNTIME_PATHS_HPP +#ifndef INGEN_RUNTIME_PATHS_HPP +#define INGEN_RUNTIME_PATHS_HPP #include <string> namespace Ingen { -namespace Shared { void set_bundle_path(const char* path); void set_bundle_path_from_code(void* function); @@ -30,6 +29,5 @@ std::string data_file_path(const std::string& name); std::string module_path(const std::string& name, std::string dir=""); } // namespace Ingen -} // namespace Shared -#endif // INGEN_SHARED_RUNTIME_PATHS_HPP +#endif // INGEN_RUNTIME_PATHS_HPP diff --git a/ingen/serialisation/Parser.hpp b/ingen/serialisation/Parser.hpp index 0240dc9d..666d9acb 100644 --- a/ingen/serialisation/Parser.hpp +++ b/ingen/serialisation/Parser.hpp @@ -33,8 +33,7 @@ namespace Ingen { class Interface; - -namespace Shared { class World; } +class World; namespace Serialisation { @@ -52,7 +51,7 @@ public: typedef GraphObject::Properties Properties; virtual bool parse_file( - Shared::World* world, + World* world, Interface* target, Glib::ustring path, boost::optional<Raul::Path> parent = boost::optional<Raul::Path>(), @@ -60,7 +59,7 @@ public: boost::optional<Properties> data = boost::optional<Properties>()); virtual bool parse_string( - Shared::World* world, + World* world, Interface* target, const Glib::ustring& str, const Glib::ustring& base_uri, diff --git a/ingen/serialisation/Serialiser.hpp b/ingen/serialisation/Serialiser.hpp index 2dbc99b7..b4c0dfd3 100644 --- a/ingen/serialisation/Serialiser.hpp +++ b/ingen/serialisation/Serialiser.hpp @@ -29,14 +29,10 @@ namespace Ingen { -class Plugin; -class GraphObject; class Edge; - -namespace Shared { -class World; +class GraphObject; class Store; -} +class World; namespace Serialisation { @@ -48,7 +44,7 @@ namespace Serialisation { class Serialiser { public: - explicit Serialiser(Shared::World& world); + explicit Serialiser(World& world); virtual ~Serialiser(); typedef GraphObject::Properties Properties; |