From 646889d772c327ed7e867af661581a991fd3ac2d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 21 Oct 2011 16:22:30 +0000 Subject: Begin moving shared headers to public include directory. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3558 a436a847-0d15-0410-975c-d299462d15a1 --- include/ingen/shared/Builder.hpp | 57 ++++++++++++++++++++ include/ingen/shared/ClashAvoider.hpp | 98 ++++++++++++++++++++++++++++++++++ include/ingen/shared/Configuration.hpp | 35 ++++++++++++ include/ingen/shared/LV2Atom.hpp | 45 ++++++++++++++++ include/ingen/shared/runtime_paths.hpp | 36 +++++++++++++ src/client/PluginUI.cpp | 2 +- src/gui/App.cpp | 40 +++++++------- src/gui/LoadPatchWindow.cpp | 2 +- src/gui/PatchCanvas.cpp | 4 +- src/gui/WidgetFactory.cpp | 7 ++- src/ingen/main.cpp | 4 +- src/server/PortImpl.cpp | 2 +- src/server/events/SetPortValue.cpp | 2 +- src/server/ingen_lv2.cpp | 4 +- src/shared/Builder.cpp | 2 +- src/shared/Builder.hpp | 57 -------------------- src/shared/ClashAvoider.cpp | 5 +- src/shared/ClashAvoider.hpp | 98 ---------------------------------- src/shared/Configuration.cpp | 2 +- src/shared/Configuration.hpp | 35 ------------ src/shared/LV2Atom.cpp | 9 ++-- src/shared/LV2Atom.hpp | 45 ---------------- src/shared/World.cpp | 2 +- src/shared/runtime_paths.cpp | 3 +- src/shared/runtime_paths.hpp | 36 ------------- 25 files changed, 322 insertions(+), 310 deletions(-) create mode 100644 include/ingen/shared/Builder.hpp create mode 100644 include/ingen/shared/ClashAvoider.hpp create mode 100644 include/ingen/shared/Configuration.hpp create mode 100644 include/ingen/shared/LV2Atom.hpp create mode 100644 include/ingen/shared/runtime_paths.hpp delete mode 100644 src/shared/Builder.hpp delete mode 100644 src/shared/ClashAvoider.hpp delete mode 100644 src/shared/Configuration.hpp delete mode 100644 src/shared/LV2Atom.hpp delete mode 100644 src/shared/runtime_paths.hpp diff --git a/include/ingen/shared/Builder.hpp b/include/ingen/shared/Builder.hpp new file mode 100644 index 00000000..8a21dee0 --- /dev/null +++ b/include/ingen/shared/Builder.hpp @@ -0,0 +1,57 @@ +/* This file is part of Ingen. + * Copyright 2008-2011 David Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef INGEN_SHARED_BUILDER_HPP +#define INGEN_SHARED_BUILDER_HPP + +#include "raul/SharedPtr.hpp" + +namespace Ingen { + +class CommonInterface; +class GraphObject; + +namespace Shared { + +class LV2URIMap; + +/** Wrapper for CommonInterface to create existing objects/models. + * + * \ingroup interface + */ +class Builder +{ +public: + Builder(SharedPtr uris, CommonInterface& interface); + virtual ~Builder() {} + + void build(SharedPtr object); + void connect(SharedPtr object); + +private: + void build_object(SharedPtr object); + + SharedPtr _uris; + CommonInterface& _interface; +}; + +} // namespace Shared +} // namespace Ingen + +#endif // INGEN_SHARED_BUILDER_HPP + + diff --git a/include/ingen/shared/ClashAvoider.hpp b/include/ingen/shared/ClashAvoider.hpp new file mode 100644 index 00000000..6c8e2018 --- /dev/null +++ b/include/ingen/shared/ClashAvoider.hpp @@ -0,0 +1,98 @@ +/* This file is part of Ingen. + * Copyright 2008-2011 David Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef INGEN_SHARED_CLASHAVOIDER_HPP +#define INGEN_SHARED_CLASHAVOIDER_HPP + +#include + +#include + +#include "ingen/CommonInterface.hpp" + +namespace Raul { class Atom; class Path; } + +namespace Ingen { +namespace Shared { + +class Store; + +/** A wrapper for a CommonInterface that creates objects but possibly maps + * symbol names to avoid clashes with the existing objects in a store. + */ +class ClashAvoider : public CommonInterface +{ +public: + ClashAvoider(Store& store, CommonInterface& target, Store* also_avoid=NULL) + : _store(store), _target(target), _also_avoid(also_avoid) {} + + void set_target(CommonInterface& target) { _target = target; } + + // Bundles + void bundle_begin() { _target.bundle_begin(); } + void bundle_end() { _target.bundle_end(); } + + // Object commands + + virtual void put(const Raul::URI& path, + const Resource::Properties& properties, + Resource::Graph ctx=Resource::DEFAULT); + + virtual void delta(const Raul::URI& path, + const Resource::Properties& remove, + const Resource::Properties& add); + + virtual void move(const Raul::Path& old_path, + const Raul::Path& new_path); + + virtual void connect(const Raul::Path& src_port_path, + const Raul::Path& dst_port_path); + + virtual void disconnect(const Raul::URI& src, + const Raul::URI& dst); + + virtual void disconnect_all(const Raul::Path& parent_patch_path, + const Raul::Path& path); + + virtual void set_property(const Raul::URI& subject_path, + const Raul::URI& predicate, + const Raul::Atom& value); + + virtual void del(const Raul::URI& uri); + +private: + const Raul::URI map_uri(const Raul::URI& in); + const Raul::Path map_path(const Raul::Path& in); + + Store& _store; + CommonInterface& _target; + + Store* _also_avoid; + bool exists(const Raul::Path& path) const; + + typedef std::map Offsets; + Offsets _offsets; + + typedef std::map SymbolMap; + SymbolMap _symbol_map; +}; + +} // namespace Shared +} // namespace Ingen + +#endif // INGEN_SHARED_CLASHAVOIDER_HPP + diff --git a/include/ingen/shared/Configuration.hpp b/include/ingen/shared/Configuration.hpp new file mode 100644 index 00000000..e51bdc71 --- /dev/null +++ b/include/ingen/shared/Configuration.hpp @@ -0,0 +1,35 @@ +/* This file is part of Ingen. + * Copyright 2010-2011 David Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef INGEN_SHARED_CONFIGURATION_HPP +#define INGEN_SHARED_CONFIGURATION_HPP + +#include "raul/Configuration.hpp" + +namespace Ingen { +namespace Shared { + +class Configuration : public Raul::Configuration { +public: + Configuration(); +}; + +} // namespace Shared +} // namespace Ingen + +#endif // INGEN_SHARED_CONFIGURATION_HPP + diff --git a/include/ingen/shared/LV2Atom.hpp b/include/ingen/shared/LV2Atom.hpp new file mode 100644 index 00000000..df9ffde9 --- /dev/null +++ b/include/ingen/shared/LV2Atom.hpp @@ -0,0 +1,45 @@ +/* This file is part of Ingen. + * Copyright 2009-2011 David Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef INGEN_SHARED_LV2ATOM_HPP +#define INGEN_SHARED_LV2ATOM_HPP + +#include "lv2/lv2plug.in/ns/ext/atom/atom.h" + +namespace Raul { class Atom; } + +namespace Ingen { +namespace Shared { + +class LV2URIMap; + +namespace LV2Atom { + +bool to_atom(const LV2URIMap& uris, + const LV2_Atom* object, + Raul::Atom& atom); + +bool from_atom(const LV2URIMap& uris, + const Raul::Atom& atom, + LV2_Atom* object); + +} // namespace LV2Atom + +} // namespace Shared +} // namespace Ingen + +#endif // INGEN_SHARED_LV2ATOM_HPP diff --git a/include/ingen/shared/runtime_paths.hpp b/include/ingen/shared/runtime_paths.hpp new file mode 100644 index 00000000..3ed48f00 --- /dev/null +++ b/include/ingen/shared/runtime_paths.hpp @@ -0,0 +1,36 @@ +/* This file is part of Ingen. + * Copyright 2008-2011 David Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef INGEN_SHARED_RUNTIME_PATHS_HPP +#define INGEN_SHARED_RUNTIME_PATHS_HPP + +#include + +namespace Ingen { +namespace Shared { + +void set_bundle_path(const char* path); +void set_bundle_path_from_code(void* function); + +std::string bundle_file_path(const std::string& name); +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 diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index cfcad147..cf93b8bb 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -21,7 +21,7 @@ #include "lv2/lv2plug.in/ns/ext/event/event.h" #include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" -#include "shared/LV2Atom.hpp" +#include "ingen/shared/LV2Atom.hpp" #include "shared/LV2URIMap.hpp" #include "ingen/client/NodeModel.hpp" diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 8e234031..1063ec39 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -15,40 +15,44 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "App.hpp" #include #include #include -#include -#include #include #include -#include "raul/log.hpp" -#include "raul/Path.hpp" -#include "lilv/lilv.h" + +#include +#include + #include "flowcanvas/Connection.hpp" -#include "shared/World.hpp" -#include "server/Engine.hpp" #include "ingen/ServerInterface.hpp" -#include "shared/runtime_paths.hpp" -#include "shared/LV2URIMap.hpp" +#include "ingen/client/ClientStore.hpp" #include "ingen/client/ObjectModel.hpp" #include "ingen/client/PatchModel.hpp" -#include "ingen/client/ClientStore.hpp" #include "ingen/client/SigClientInterface.hpp" -#include "NodeModule.hpp" +#include "ingen/shared/runtime_paths.hpp" +#include "lilv/lilv.h" +#include "raul/Path.hpp" +#include "raul/log.hpp" + +#include "server/Engine.hpp" +#include "shared/LV2URIMap.hpp" +#include "shared/World.hpp" + +#include "App.hpp" +#include "Configuration.hpp" +#include "ConnectWindow.hpp" #include "ControlPanel.hpp" -#include "SubpatchModule.hpp" #include "LoadPluginWindow.hpp" -#include "PatchWindow.hpp" #include "MessagesWindow.hpp" -#include "WidgetFactory.hpp" +#include "NodeModule.hpp" #include "PatchTreeWindow.hpp" -#include "Configuration.hpp" -#include "ConnectWindow.hpp" +#include "PatchWindow.hpp" +#include "Port.hpp" +#include "SubpatchModule.hpp" #include "ThreadedLoader.hpp" +#include "WidgetFactory.hpp" #include "WindowFactory.hpp" -#include "Port.hpp" #define LOG(s) s << "[GUI] " diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp index 1d4cb7c8..33363f0d 100644 --- a/src/gui/LoadPatchWindow.cpp +++ b/src/gui/LoadPatchWindow.cpp @@ -25,7 +25,7 @@ #include "ingen/client/NodeModel.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/ClientStore.hpp" -#include "shared/runtime_paths.hpp" +#include "ingen/shared/runtime_paths.hpp" #include "App.hpp" #include "LoadPatchWindow.hpp" #include "PatchView.hpp" diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index befb706d..dba64490 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -24,8 +24,8 @@ #include "flowcanvas/Ellipse.hpp" #include "ingen/ServerInterface.hpp" #include "shared/LV2URIMap.hpp" -#include "shared/Builder.hpp" -#include "shared/ClashAvoider.hpp" +#include "ingen/shared/Builder.hpp" +#include "ingen/shared/ClashAvoider.hpp" #include "ingen/serialisation/Serialiser.hpp" #include "ingen/client/PluginModel.hpp" #include "ingen/client/PatchModel.hpp" diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp index 68582fd3..f489d1db 100644 --- a/src/gui/WidgetFactory.cpp +++ b/src/gui/WidgetFactory.cpp @@ -15,10 +15,13 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "WidgetFactory.hpp" #include + #include "raul/log.hpp" -#include "shared/runtime_paths.hpp" + +#include "ingen/shared/runtime_paths.hpp" + +#include "WidgetFactory.hpp" using namespace std; using namespace Raul; diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index aae428c8..688a75ec 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -42,9 +42,9 @@ #include "ingen/EngineBase.hpp" #include "ingen/ServerInterface.hpp" #include "ingen/serialisation/Parser.hpp" -#include "shared/Configuration.hpp" +#include "ingen/shared/Configuration.hpp" #include "shared/World.hpp" -#include "shared/runtime_paths.hpp" +#include "ingen/shared/runtime_paths.hpp" #include "ingen/client/ThreadedSigClientInterface.hpp" #ifdef WITH_BINDINGS #include "bindings/ingen_bindings.hpp" diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index f89d1c53..90bf8e0b 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -21,7 +21,7 @@ #include "raul/Maid.hpp" #include "shared/LV2URIMap.hpp" -#include "shared/LV2Atom.hpp" +#include "ingen/shared/LV2Atom.hpp" #include "AudioBuffer.hpp" #include "BufferFactory.hpp" diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index e5877d47..d71a504a 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -20,7 +20,7 @@ #include "lv2/lv2plug.in/ns/ext/event/event.h" #include "shared/LV2URIMap.hpp" #include "shared/LV2Features.hpp" -#include "shared/LV2Atom.hpp" +#include "ingen/shared/LV2Atom.hpp" #include "shared/World.hpp" #include "AudioBuffer.hpp" #include "ClientBroadcaster.hpp" diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 02eed484..d61b2f40 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -43,8 +43,8 @@ #include "ingen/ServerInterface.hpp" #include "shared/World.hpp" #include "ingen/serialisation/Parser.hpp" -#include "shared/Configuration.hpp" -#include "shared/runtime_paths.hpp" +#include "ingen/shared/Configuration.hpp" +#include "ingen/shared/runtime_paths.hpp" /** Record of a patch in this Ingen LV2 bundle */ struct LV2Patch { diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp index cac4201d..5539e958 100644 --- a/src/shared/Builder.cpp +++ b/src/shared/Builder.cpp @@ -24,7 +24,7 @@ #include "ingen/Patch.hpp" #include "ingen/Plugin.hpp" #include "ingen/Port.hpp" -#include "shared/Builder.hpp" +#include "ingen/shared/Builder.hpp" #include "shared/LV2URIMap.hpp" using namespace std; diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp deleted file mode 100644 index 8a21dee0..00000000 --- a/src/shared/Builder.hpp +++ /dev/null @@ -1,57 +0,0 @@ -/* This file is part of Ingen. - * Copyright 2008-2011 David Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INGEN_SHARED_BUILDER_HPP -#define INGEN_SHARED_BUILDER_HPP - -#include "raul/SharedPtr.hpp" - -namespace Ingen { - -class CommonInterface; -class GraphObject; - -namespace Shared { - -class LV2URIMap; - -/** Wrapper for CommonInterface to create existing objects/models. - * - * \ingroup interface - */ -class Builder -{ -public: - Builder(SharedPtr uris, CommonInterface& interface); - virtual ~Builder() {} - - void build(SharedPtr object); - void connect(SharedPtr object); - -private: - void build_object(SharedPtr object); - - SharedPtr _uris; - CommonInterface& _interface; -}; - -} // namespace Shared -} // namespace Ingen - -#endif // INGEN_SHARED_BUILDER_HPP - - diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp index f2232554..b9135951 100644 --- a/src/shared/ClashAvoider.cpp +++ b/src/shared/ClashAvoider.cpp @@ -17,8 +17,11 @@ #include #include + #include "raul/log.hpp" -#include "ClashAvoider.hpp" + +#include "ingen/shared/ClashAvoider.hpp" + #include "Store.hpp" using namespace std; diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp deleted file mode 100644 index 6c8e2018..00000000 --- a/src/shared/ClashAvoider.hpp +++ /dev/null @@ -1,98 +0,0 @@ -/* This file is part of Ingen. - * Copyright 2008-2011 David Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INGEN_SHARED_CLASHAVOIDER_HPP -#define INGEN_SHARED_CLASHAVOIDER_HPP - -#include - -#include - -#include "ingen/CommonInterface.hpp" - -namespace Raul { class Atom; class Path; } - -namespace Ingen { -namespace Shared { - -class Store; - -/** A wrapper for a CommonInterface that creates objects but possibly maps - * symbol names to avoid clashes with the existing objects in a store. - */ -class ClashAvoider : public CommonInterface -{ -public: - ClashAvoider(Store& store, CommonInterface& target, Store* also_avoid=NULL) - : _store(store), _target(target), _also_avoid(also_avoid) {} - - void set_target(CommonInterface& target) { _target = target; } - - // Bundles - void bundle_begin() { _target.bundle_begin(); } - void bundle_end() { _target.bundle_end(); } - - // Object commands - - virtual void put(const Raul::URI& path, - const Resource::Properties& properties, - Resource::Graph ctx=Resource::DEFAULT); - - virtual void delta(const Raul::URI& path, - const Resource::Properties& remove, - const Resource::Properties& add); - - virtual void move(const Raul::Path& old_path, - const Raul::Path& new_path); - - virtual void connect(const Raul::Path& src_port_path, - const Raul::Path& dst_port_path); - - virtual void disconnect(const Raul::URI& src, - const Raul::URI& dst); - - virtual void disconnect_all(const Raul::Path& parent_patch_path, - const Raul::Path& path); - - virtual void set_property(const Raul::URI& subject_path, - const Raul::URI& predicate, - const Raul::Atom& value); - - virtual void del(const Raul::URI& uri); - -private: - const Raul::URI map_uri(const Raul::URI& in); - const Raul::Path map_path(const Raul::Path& in); - - Store& _store; - CommonInterface& _target; - - Store* _also_avoid; - bool exists(const Raul::Path& path) const; - - typedef std::map Offsets; - Offsets _offsets; - - typedef std::map SymbolMap; - SymbolMap _symbol_map; -}; - -} // namespace Shared -} // namespace Ingen - -#endif // INGEN_SHARED_CLASHAVOIDER_HPP - diff --git a/src/shared/Configuration.cpp b/src/shared/Configuration.cpp index fca13b05..4cfc41e9 100644 --- a/src/shared/Configuration.cpp +++ b/src/shared/Configuration.cpp @@ -17,7 +17,7 @@ #include "raul/Atom.hpp" -#include "Configuration.hpp" +#include "ingen/shared/Configuration.hpp" using namespace Raul; diff --git a/src/shared/Configuration.hpp b/src/shared/Configuration.hpp deleted file mode 100644 index e51bdc71..00000000 --- a/src/shared/Configuration.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/* This file is part of Ingen. - * Copyright 2010-2011 David Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INGEN_SHARED_CONFIGURATION_HPP -#define INGEN_SHARED_CONFIGURATION_HPP - -#include "raul/Configuration.hpp" - -namespace Ingen { -namespace Shared { - -class Configuration : public Raul::Configuration { -public: - Configuration(); -}; - -} // namespace Shared -} // namespace Ingen - -#endif // INGEN_SHARED_CONFIGURATION_HPP - diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp index 4f6afec4..4b4cbec5 100644 --- a/src/shared/LV2Atom.cpp +++ b/src/shared/LV2Atom.cpp @@ -15,12 +15,13 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "raul/log.hpp" -#include "raul/Atom.hpp" -#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" +#include "ingen/shared/LV2Atom.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" +#include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" +#include "raul/Atom.hpp" +#include "raul/log.hpp" + #include "LV2Features.hpp" -#include "LV2Atom.hpp" #include "LV2URIMap.hpp" using namespace std; diff --git a/src/shared/LV2Atom.hpp b/src/shared/LV2Atom.hpp deleted file mode 100644 index df9ffde9..00000000 --- a/src/shared/LV2Atom.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/* This file is part of Ingen. - * Copyright 2009-2011 David Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INGEN_SHARED_LV2ATOM_HPP -#define INGEN_SHARED_LV2ATOM_HPP - -#include "lv2/lv2plug.in/ns/ext/atom/atom.h" - -namespace Raul { class Atom; } - -namespace Ingen { -namespace Shared { - -class LV2URIMap; - -namespace LV2Atom { - -bool to_atom(const LV2URIMap& uris, - const LV2_Atom* object, - Raul::Atom& atom); - -bool from_atom(const LV2URIMap& uris, - const Raul::Atom& atom, - LV2_Atom* object); - -} // namespace LV2Atom - -} // namespace Shared -} // namespace Ingen - -#endif // INGEN_SHARED_LV2ATOM_HPP diff --git a/src/shared/World.cpp b/src/shared/World.cpp index e6742c85..19e85a15 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -26,7 +26,7 @@ #include "sord/sordmm.hpp" #include "ingen/EngineBase.hpp" -#include "shared/runtime_paths.hpp" +#include "ingen/shared/runtime_paths.hpp" #include "shared/LV2Features.hpp" #include "shared/LV2URIMap.hpp" #include "World.hpp" diff --git a/src/shared/runtime_paths.cpp b/src/shared/runtime_paths.cpp index d533c883..cf37d07b 100644 --- a/src/shared/runtime_paths.cpp +++ b/src/shared/runtime_paths.cpp @@ -25,8 +25,9 @@ #include "raul/log.hpp" +#include "ingen/shared/runtime_paths.hpp" + #include "ingen-config.h" -#include "runtime_paths.hpp" using namespace std; diff --git a/src/shared/runtime_paths.hpp b/src/shared/runtime_paths.hpp deleted file mode 100644 index 3ed48f00..00000000 --- a/src/shared/runtime_paths.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/* This file is part of Ingen. - * Copyright 2008-2011 David Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INGEN_SHARED_RUNTIME_PATHS_HPP -#define INGEN_SHARED_RUNTIME_PATHS_HPP - -#include - -namespace Ingen { -namespace Shared { - -void set_bundle_path(const char* path); -void set_bundle_path_from_code(void* function); - -std::string bundle_file_path(const std::string& name); -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 -- cgit v1.2.1