diff options
Diffstat (limited to 'src')
123 files changed, 502 insertions, 579 deletions
diff --git a/src/shared/AtomReader.cpp b/src/AtomReader.cpp index 862c61b1..0482cacd 100644 --- a/src/shared/AtomReader.cpp +++ b/src/AtomReader.cpp @@ -16,14 +16,13 @@ #include <utility> -#include "ingen/shared/AtomReader.hpp" -#include "ingen/shared/URIMap.hpp" +#include "ingen/AtomReader.hpp" +#include "ingen/URIMap.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/Path.hpp" #include "raul/log.hpp" namespace Ingen { -namespace Shared { AtomReader::AtomReader(URIMap& map, URIs& uris, Forge& forge, Interface& iface) : _map(map) @@ -272,5 +271,4 @@ AtomReader::write(const LV2_Atom* msg) return true; } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/AtomWriter.cpp b/src/AtomWriter.cpp index 80bd0156..f8156c89 100644 --- a/src/shared/AtomWriter.cpp +++ b/src/AtomWriter.cpp @@ -16,14 +16,13 @@ #include <string> -#include "ingen/shared/AtomSink.hpp" -#include "ingen/shared/AtomWriter.hpp" -#include "ingen/shared/URIMap.hpp" +#include "ingen/AtomSink.hpp" +#include "ingen/AtomWriter.hpp" +#include "ingen/URIMap.hpp" #include "raul/Path.hpp" #include "serd/serd.h" namespace Ingen { -namespace Shared { static LV2_Atom_Forge_Ref forge_sink(LV2_Atom_Forge_Sink_Handle handle, @@ -297,5 +296,4 @@ AtomWriter::error(const std::string& msg) { } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/Builder.cpp b/src/Builder.cpp index dadd2989..eab33cdf 100644 --- a/src/shared/Builder.cpp +++ b/src/Builder.cpp @@ -14,20 +14,19 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ +#include "ingen/Builder.hpp" #include "ingen/Edge.hpp" #include "ingen/GraphObject.hpp" #include "ingen/Interface.hpp" -#include "ingen/shared/Builder.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/Atom.hpp" #include "raul/Path.hpp" using namespace std; namespace Ingen { -namespace Shared { -Builder::Builder(Shared::URIs& uris, Interface& interface) +Builder::Builder(URIs& uris, Interface& interface) : _uris(uris) , _interface(interface) { @@ -51,5 +50,4 @@ Builder::connect(SharedPtr<const GraphObject> object) } } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/ClashAvoider.cpp b/src/ClashAvoider.cpp index 8e6683e8..b389f358 100644 --- a/src/shared/ClashAvoider.cpp +++ b/src/ClashAvoider.cpp @@ -21,13 +21,12 @@ #include "raul/log.hpp" -#include "ingen/shared/ClashAvoider.hpp" -#include "ingen/shared/Store.hpp" +#include "ingen/ClashAvoider.hpp" +#include "ingen/Store.hpp" using namespace std; namespace Ingen { -namespace Shared { const Raul::URI ClashAvoider::map_uri(const Raul::URI& in) @@ -202,5 +201,4 @@ ClashAvoider::del(const Raul::URI& uri) _target.del(map_path(Raul::Path(uri.str()))); } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/Configuration.cpp b/src/Configuration.cpp index 28038466..f3e57520 100644 --- a/src/shared/Configuration.cpp +++ b/src/Configuration.cpp @@ -14,10 +14,9 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/Configuration.hpp" +#include "ingen/Configuration.hpp" namespace Ingen { -namespace Shared { Configuration::Configuration() : Raul::Configuration( @@ -52,5 +51,4 @@ Configuration::Configuration() add("run", 'r', "Run script", STRING, Value()); } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/Forge.cpp b/src/Forge.cpp index b667cf1c..6495fadc 100644 --- a/src/shared/Forge.cpp +++ b/src/Forge.cpp @@ -17,14 +17,13 @@ #include <sstream> #include <string> -#include "ingen/shared/Forge.hpp" -#include "ingen/shared/URIMap.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIMap.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" namespace Ingen { -namespace Shared { -Forge::Forge(Shared::URIMap& map) +Forge::Forge(URIMap& map) { Int = map.map_uri(LV2_ATOM__Int); Float = map.map_uri(LV2_ATOM__Float); @@ -52,5 +51,4 @@ Forge::str(const Raul::Atom& atom) return ss.str(); } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/LV2Features.cpp b/src/LV2Features.cpp index 7061ff76..9846dd80 100644 --- a/src/shared/LV2Features.cpp +++ b/src/LV2Features.cpp @@ -16,12 +16,11 @@ #include <cstdlib> -#include "ingen/shared/LV2Features.hpp" +#include "ingen/LV2Features.hpp" using namespace std; namespace Ingen { -namespace Shared { LV2Features::LV2Features() { @@ -49,7 +48,7 @@ LV2Features::FeatureArray::~FeatureArray() } SharedPtr<LV2Features::FeatureArray> -LV2Features::lv2_features(Shared::World* world, GraphObject* node) const +LV2Features::lv2_features(World* world, GraphObject* node) const { FeatureArray::FeatureVector vec; for (Features::const_iterator f = _features.begin(); f != _features.end(); ++f) { @@ -61,5 +60,4 @@ LV2Features::lv2_features(Shared::World* world, GraphObject* node) const return SharedPtr<FeatureArray>(new FeatureArray(vec)); } -} // namespace Shared } // namespace Ingen diff --git a/src/Resource.cpp b/src/Resource.cpp index 13959a13..d8659596 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -17,7 +17,7 @@ #include <utility> #include "ingen/Resource.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/Atom.hpp" #include "raul/log.hpp" @@ -108,12 +108,12 @@ Resource::get_property(const Raul::URI& uri) const } bool -Resource::type(const Shared::URIs& uris, - const Properties& properties, - bool& patch, - bool& node, - bool& port, - bool& is_output) +Resource::type(const URIs& uris, + const Properties& properties, + bool& patch, + bool& node, + bool& port, + bool& is_output) { typedef Resource::Properties::const_iterator iterator; const std::pair<iterator, iterator> types_range = properties.equal_range(uris.rdf_type); diff --git a/src/shared/Store.cpp b/src/Store.cpp index ad950fd7..7036312b 100644 --- a/src/shared/Store.cpp +++ b/src/Store.cpp @@ -17,8 +17,7 @@ #include <sstream> #include <string> -#include "ingen/GraphObject.hpp" -#include "ingen/shared/Store.hpp" +#include "ingen/Store.hpp" #include "raul/PathTable.hpp" #include "raul/TableImpl.hpp" #include "raul/log.hpp" @@ -26,7 +25,6 @@ using namespace std; namespace Ingen { -namespace Shared { void Store::add(GraphObject* o) @@ -97,5 +95,4 @@ Store::child_name_offset(const Raul::Path& parent, return offset; } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/URIMap.cpp b/src/URIMap.cpp index b8981fd3..55a8d6a8 100644 --- a/src/shared/URIMap.cpp +++ b/src/URIMap.cpp @@ -18,12 +18,11 @@ #include <glib.h> -#include "ingen/shared/URIMap.hpp" +#include "ingen/URIMap.hpp" using namespace std; namespace Ingen { -namespace Shared { URIMap::URIMap(LV2_URID_Map* map, LV2_URID_Unmap* unmap) : _urid_map_feature(new URIDMapFeature(this, map)) @@ -93,5 +92,4 @@ URIMap::unmap_uri(uint32_t urid) const return _urid_unmap_feature->unmap(urid); } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/URIs.cpp b/src/URIs.cpp index 102c7b8b..f3e5c67d 100644 --- a/src/shared/URIs.cpp +++ b/src/URIs.cpp @@ -14,8 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "lv2/lv2plug.in/ns/ext/midi/midi.h" #include "lv2/lv2plug.in/ns/ext/patch/patch.h" @@ -23,9 +23,8 @@ #include "lv2/lv2plug.in/ns/lv2core/lv2.h" namespace Ingen { -namespace Shared { -URIs::Quark::Quark(Shared::Forge& forge, URIMap* map, const char* c_str) +URIs::Quark::Quark(Forge& forge, URIMap* map, const char* c_str) : Raul::URI(c_str) , id(map->map_uri(c_str)) , atom(forge.alloc_uri(c_str)) @@ -36,7 +35,7 @@ URIs::Quark::Quark(Shared::Forge& forge, URIMap* map, const char* c_str) #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" -URIs::URIs(Shared::Forge& f, URIMap* map) +URIs::URIs(Forge& f, URIMap* map) : forge(f) , atom_AtomPort (forge, map, LV2_ATOM__AtomPort) , atom_Blank (forge, map, LV2_ATOM__Blank) @@ -124,5 +123,4 @@ URIs::URIs(Shared::Forge& f, URIMap* map) { } -} // namespace Shared } // namespace Ingen diff --git a/src/shared/World.cpp b/src/World.cpp index 05a941e9..c7ce14ba 100644 --- a/src/shared/World.cpp +++ b/src/World.cpp @@ -21,13 +21,13 @@ #include <glibmm/miscutils.h> #include <glibmm/module.h> -#include "ingen/shared/Configuration.hpp" -#include "ingen/shared/LV2Features.hpp" -#include "ingen/shared/Module.hpp" -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/LV2Features.hpp" +#include "ingen/Module.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" +#include "ingen/runtime_paths.hpp" #include "lilv/lilv.h" #include "raul/log.hpp" #include "sord/sordmm.hpp" @@ -40,12 +40,10 @@ namespace Ingen { class EngineBase; class Interface; +class Store; namespace Serialisation { class Parser; class Serialiser; } -namespace Shared { - -class Store; /** Load a dynamic module from the default path. * @@ -67,7 +65,7 @@ ingen_load_module(const string& name) string dir; istringstream iss(module_path); while (getline(iss, dir, G_SEARCHPATH_SEPARATOR)) { - string filename = Shared::module_path(name, dir); + string filename = Ingen::module_path(name, dir); if (Glib::file_test(filename, Glib::FILE_TEST_EXISTS)) { module = new Glib::Module(filename); if (*module) { @@ -81,10 +79,10 @@ ingen_load_module(const string& name) } // Try default directory if not found - module = new Glib::Module(Shared::module_path(name)); + module = new Glib::Module(Ingen::module_path(name)); - if (module) { - LOG(Raul::info)(Raul::fmt("Loading %1%\n") % Shared::module_path(name)); + if (*module) { + LOG(Raul::info)(Raul::fmt("Loading %1%\n") % Ingen::module_path(name)); return module; } else if (!module_path_found) { LOG(Raul::error)(Raul::fmt("Unable to find %1% (%2%)\n") @@ -108,13 +106,13 @@ public: , argv(a_argv) , lv2_features(NULL) , rdf_world(new Sord::World()) - , uri_map(new Ingen::Shared::URIMap(map, unmap)) - , forge(new Ingen::Shared::Forge(*uri_map)) - , uris(new Shared::URIs(*forge, uri_map)) + , uri_map(new URIMap(map, unmap)) + , forge(new Forge(*uri_map)) + , uris(new URIs(*forge, uri_map)) , lilv_world(lilv_world_new()) { conf.parse(argc, argv); - lv2_features = new Ingen::Shared::LV2Features(); + lv2_features = new LV2Features(); lv2_features->add_feature(uri_map->urid_map_feature()); lv2_features->add_feature(uri_map->urid_unmap_feature()); lilv_world_load_all(lilv_world); @@ -176,11 +174,11 @@ public: int& argc; char**& argv; - Shared::Configuration conf; + Configuration conf; LV2Features* lv2_features; Sord::World* rdf_world; URIMap* uri_map; - Shared::Forge* forge; + Forge* forge; URIs* uris; SharedPtr<Interface> interface; SharedPtr<EngineBase> engine; @@ -216,17 +214,17 @@ SharedPtr<Serialisation::Parser> World::parser() { return _impl->parse SharedPtr<Serialisation::Serialiser> World::serialiser() { return _impl->serialiser; } SharedPtr<Store> World::store() { return _impl->store; } -int& World::argc() { return _impl->argc; } -char**& World::argv() { return _impl->argv; } -Shared::Configuration& World::conf() { return _impl->conf; } +int& World::argc() { return _impl->argc; } +char**& World::argv() { return _impl->argv; } +Configuration& World::conf() { return _impl->conf; } Sord::World* World::rdf_world() { return _impl->rdf_world; } LilvWorld* World::lilv_world() { return _impl->lilv_world; } -LV2Features& World::lv2_features() { return *_impl->lv2_features; } -Shared::Forge& World::forge() { return *_impl->forge; } -URIs& World::uris() { return *_impl->uris; } -URIMap& World::uri_map() { return *_impl->uri_map; } +LV2Features& World::lv2_features() { return *_impl->lv2_features; } +Forge& World::forge() { return *_impl->forge; } +URIs& World::uris() { return *_impl->uris; } +URIMap& World::uri_map() { return *_impl->uri_map; } bool World::load_module(const char* name) @@ -237,7 +235,7 @@ World::load_module(const char* name) return true; } Glib::Module* lib = ingen_load_module(name); - Ingen::Shared::Module* (*module_load)() = NULL; + Ingen::Module* (*module_load)() = NULL; if (lib && lib->get_symbol("ingen_module_load", (void*&)module_load)) { Module* module = module_load(); if (module) { @@ -319,5 +317,4 @@ World::jack_uuid() return _impl->jack_uuid; } -} // namespace Shared } // namespace Ingen diff --git a/src/bindings/ingen.i b/src/bindings/ingen.i index 6b39eb33..b29a61ce 100644 --- a/src/bindings/ingen.i +++ b/src/bindings/ingen.i @@ -9,8 +9,6 @@ #include "Client.hpp" %} -/*%ignore Ingen::Shared::EngineInterface;*/ - %include "../../ingen/CommonInterface.hpp" %include "../../ingen/ClientInterface.hpp" %include "../../ingen/EngineInterface.hpp" @@ -21,34 +19,29 @@ // generate directors for all classes that have virtual methods %feature("director"); %feature("director") Ingen::ClientInterface; -//%feature("director") Ingen::Shared::EngineInterface; -typedef Ingen::Shared::World World; -namespace Ingen { namespace Shared { +typedef Ingen::World World; +namespace Ingen { %extend World { World() { - if (!Ingen::Shared::ingen_world) { + if (!Ingen::ingen_world) { fprintf(stderr, "ERROR: World uninitialized (running within Ingen?)\n"); abort(); } else { - return Ingen::Shared::ingen_world; + return Ingen::ingen_world; } } void iteration() { - Ingen::Shared::script_iteration($self); + Ingen::script_iteration($self); } /*LILVWorld lilv() { return $self->me->lilv_world; }*/ }; -} } +} %include "Client.hpp" %feature("director") Client; - - -/*SharedPtr<Ingen::Shared::EngineInterface> engine() { return $self->me->engine; }*/ - diff --git a/src/bindings/ingen_bindings.cpp b/src/bindings/ingen_bindings.cpp index 6c92d7bb..39fd9fbf 100644 --- a/src/bindings/ingen_bindings.cpp +++ b/src/bindings/ingen_bindings.cpp @@ -18,10 +18,10 @@ #include "raul/log.hpp" #include "ingen_bindings.hpp" #include "server/Engine.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" bool -run(Ingen::Shared::World* world, const char* filename) +run(Ingen::World* world, const char* filename) { ingen_world = world; @@ -38,22 +38,22 @@ run(Ingen::Shared::World* world, const char* filename) } } -struct IngenBindingsModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenBindingsModule : public Ingen::Module { + void load(Ingen::World* world) { world->script_runners.insert(make_pair("application/x-python", &run)); } }; extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenBindingsModule(); } void -script_iteration(Ingen::Shared::World* world) +script_iteration(Ingen::World* world) { if (world->engine()) world->engine()->main_iteration(); diff --git a/src/bindings/ingen_bindings.hpp b/src/bindings/ingen_bindings.hpp index 90ac4b0b..90358cd8 100644 --- a/src/bindings/ingen_bindings.hpp +++ b/src/bindings/ingen_bindings.hpp @@ -18,7 +18,6 @@ #define INGEN_BINDINGS_HPP namespace Ingen { -namespace Shared { class World; extern World* ingen_world; @@ -28,7 +27,6 @@ extern "C" { void script_iteration(World* world); } -} // namespace Shared } // namespace Ingen #endif // INGEN_BINDINGS_HPP diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 56d94b2e..8844b320 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -32,12 +32,9 @@ using namespace std; namespace Ingen { - -using namespace Shared; - namespace Client { -ClientStore::ClientStore(Shared::URIs& uris, +ClientStore::ClientStore(URIs& uris, SharedPtr<Interface> engine, SharedPtr<SigClientInterface> emitter) : _uris(uris) diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index 2a88b4db..dbbb0258 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -19,13 +19,13 @@ #include <string> #include "ingen/client/NodeModel.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" namespace Ingen { namespace Client { -NodeModel::NodeModel(Shared::URIs& uris, +NodeModel::NodeModel(URIs& uris, SharedPtr<PluginModel> plugin, const Raul::Path& path) : ObjectModel(uris, path) @@ -37,7 +37,7 @@ NodeModel::NodeModel(Shared::URIs& uris, { } -NodeModel::NodeModel(Shared::URIs& uris, +NodeModel::NodeModel(URIs& uris, const Raul::URI& plugin_uri, const Raul::Path& path) : ObjectModel(uris, path) diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 9a5009ba..2679186b 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -16,13 +16,13 @@ #include "ingen/GraphObject.hpp" #include "ingen/client/ObjectModel.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/TableImpl.hpp" namespace Ingen { namespace Client { -ObjectModel::ObjectModel(Shared::URIs& uris, const Raul::Path& path) +ObjectModel::ObjectModel(URIs& uris, const Raul::Path& path) : GraphObject(uris, path) , _path(path) , _symbol((path == Raul::Path::root()) ? "root" : path.symbol()) diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp index 7acb8aec..bd2547b0 100644 --- a/src/client/PatchModel.cpp +++ b/src/client/PatchModel.cpp @@ -22,7 +22,7 @@ #include "ingen/client/EdgeModel.hpp" #include "ingen/client/NodeModel.hpp" #include "ingen/client/PatchModel.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" using namespace std; diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index f4df6d1c..ab1df485 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -40,7 +40,7 @@ const LilvPlugins* PluginModel::_lilv_plugins = NULL; Sord::World* PluginModel::_rdf_world = NULL; -PluginModel::PluginModel(Shared::URIs& uris, +PluginModel::PluginModel(URIs& uris, const Raul::URI& uri, const Raul::URI& type_uri, const Resource::Properties& properties) @@ -215,7 +215,7 @@ PluginModel::has_ui() const } SharedPtr<PluginUI> -PluginModel::ui(Ingen::Shared::World* world, +PluginModel::ui(Ingen::World* world, SharedPtr<const NodeModel> node) const { if (!_lilv_plugin) { diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index 0c597490..0f61924a 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -14,14 +14,14 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "raul/log.hpp" - +#include "ingen/Interface.hpp" +#include "ingen/URIs.hpp" #include "ingen/client/NodeModel.hpp" #include "ingen/client/PluginUI.hpp" #include "ingen/client/PortModel.hpp" -#include "ingen/shared/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" +#include "raul/log.hpp" using namespace std; @@ -48,7 +48,7 @@ lv2_ui_write(SuilController controller, SharedPtr<const PortModel> port = ports[port_index]; - const Shared::URIs& uris = ui->world()->uris(); + const URIs& uris = ui->world()->uris(); // float (special case, always 0) if (format == 0) { @@ -75,7 +75,7 @@ lv2_ui_write(SuilController controller, } } -PluginUI::PluginUI(Ingen::Shared::World* world, +PluginUI::PluginUI(Ingen::World* world, SharedPtr<const NodeModel> node, const LilvNode* ui_node) : _world(world) @@ -92,7 +92,7 @@ PluginUI::~PluginUI() } SharedPtr<PluginUI> -PluginUI::create(Ingen::Shared::World* world, +PluginUI::create(Ingen::World* world, SharedPtr<const NodeModel> node, const LilvPlugin* plugin) { diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp index 753917cf..46a14dc1 100644 --- a/src/client/ingen_client.cpp +++ b/src/client/ingen_client.cpp @@ -14,22 +14,22 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "raul/SharedPtr.hpp" #include "ingen_config.h" using namespace Ingen; -struct IngenClientModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenClientModule : public Ingen::Module { + void load(Ingen::World* world) { } }; extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenClientModule(); diff --git a/src/client/wscript b/src/client/wscript index c3830506..b0b0620e 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -8,7 +8,7 @@ def build(bld): name = 'libingen_client', target = 'ingen_client', install_path = '${LIBDIR}', - use = 'libingen_shared') + use = 'libingen') autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV SUIL RAUL SORD SIGCPP') obj.source = ''' diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 1d6381fb..2c561dfc 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -29,8 +29,8 @@ #include "ingen/client/ObjectModel.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/SigClientInterface.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/World.hpp" +#include "ingen/runtime_paths.hpp" #include "lilv/lilv.h" #include "raul/Path.hpp" #include "raul/log.hpp" @@ -62,7 +62,6 @@ namespace Ingen { namespace Client { class PluginModel; } using namespace Client; -using namespace Shared; namespace GUI { @@ -70,7 +69,7 @@ class Port; Gtk::Main* App::_main = 0; -App::App(Ingen::Shared::World* world) +App::App(Ingen::World* world) : _configuration(new Configuration(*this)) , _about_dialog(NULL) , _window_factory(new WindowFactory(*this)) @@ -102,7 +101,7 @@ App::~App() } SharedPtr<App> -App::create(Ingen::Shared::World* world) +App::create(Ingen::World* world) { _main = new Gtk::Main(&world->argc(), &world->argv()); diff --git a/src/gui/App.hpp b/src/gui/App.hpp index 1f611a13..5d93c805 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -27,7 +27,7 @@ #include <gtkmm/window.h> #include "ingen/Status.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" #include "raul/Atom.hpp" #include "raul/Deletable.hpp" #include "raul/SharedPtr.hpp" @@ -36,9 +36,7 @@ namespace Ingen { class Interface; class Port; - namespace Shared { - class World; - } + class World; namespace Client { class ClientStore; class PatchModel; @@ -107,7 +105,7 @@ public: Glib::RefPtr<Gdk::Pixbuf> icon_from_path(const std::string& path, int size); - Ingen::Shared::Forge& forge() const { return _world->forge(); } + Ingen::Forge& forge() const { return _world->forge(); } SharedPtr<Ingen::Interface> interface() const { return _world->interface(); } SharedPtr<Client::SigClientInterface> client() const { return _client; } SharedPtr<Client::ClientStore> store() const { return _store; } @@ -115,11 +113,11 @@ public: SharedPtr<Serialisation::Serialiser> serialiser(); - static SharedPtr<App> create(Ingen::Shared::World* world); + static SharedPtr<App> create(Ingen::World* world); void run(); - inline Ingen::Shared::World* world() const { return _world; } - inline Ingen::Shared::URIs& uris() const { return _world->uris(); } + inline Ingen::World* world() const { return _world; } + inline Ingen::URIs& uris() const { return _world->uris(); } protected: @@ -137,7 +135,7 @@ protected: LexicalCompare<std::string, int> > Icons; Icons _icons; - explicit App(Ingen::Shared::World* world); + explicit App(Ingen::World* world); bool animate(); void response(int32_t id, Ingen::Status status, const std::string& subject); @@ -162,7 +160,7 @@ protected: Gtk::AboutDialog* _about_dialog; WindowFactory* _window_factory; - Ingen::Shared::World* _world; + Ingen::World* _world; uint32_t _sample_rate; diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp index f3b1351b..c6737fe7 100644 --- a/src/gui/Configuration.cpp +++ b/src/gui/Configuration.cpp @@ -85,7 +85,7 @@ uint32_t Configuration::get_port_color(const Client::PortModel* p) { assert(p != NULL); - const Shared::URIs& uris = _app.uris(); + const URIs& uris = _app.uris(); if (p->is_a(uris.lv2_AudioPort)) { return _audio_port_color; } else if (p->supports(uris.atom_String)) { diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 0c3dde27..81426620 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -28,8 +28,8 @@ #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/ThreadedSigClientInterface.hpp" -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "App.hpp" #include "ConnectWindow.hpp" @@ -72,7 +72,7 @@ ConnectWindow::ConnectWindow(BaseObjectType* cobject, } void -ConnectWindow::start(App& app, Ingen::Shared::World* world) +ConnectWindow::start(App& app, Ingen::World* world) { _app = &app; @@ -160,7 +160,7 @@ ConnectWindow::connect(bool existing) _connect_stage = 0; set_connecting_widget_states(); - Ingen::Shared::World* world = _app->world(); + Ingen::World* world = _app->world(); #ifdef HAVE_SOCKET if (_mode == CONNECT_REMOTE) { diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index ca27787e..2f7a43e7 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -50,7 +50,7 @@ public: const Glib::RefPtr<Gtk::Builder>& xml); void set_connected_to(SharedPtr<Ingen::Interface> engine); - void start(App& app, Ingen::Shared::World* world); + void start(App& app, Ingen::World* world); void ingen_response(int32_t id, Status status, const std::string& subject) { _attached = true; } diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp index 94142868..7d23f5d9 100644 --- a/src/gui/LoadPatchWindow.cpp +++ b/src/gui/LoadPatchWindow.cpp @@ -25,7 +25,7 @@ #include "ingen/client/ClientStore.hpp" #include "ingen/client/NodeModel.hpp" #include "ingen/client/PatchModel.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/runtime_paths.hpp" #include "App.hpp" #include "Configuration.hpp" @@ -39,7 +39,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { @@ -89,7 +88,7 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, property_select_multiple() = true; // Add global examples directory to "shortcut folders" (bookmarks) - const string examples_dir = Shared::data_file_path("patches"); + const string examples_dir = Ingen::data_file_path("patches"); if (Glib::file_test(examples_dir, Glib::FILE_TEST_IS_DIR)) { add_shortcut_folder(examples_dir); } diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 18d1a63c..cac404df 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -39,7 +39,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 1d3f6801..8e9f88e0 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -47,7 +47,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { @@ -405,7 +404,7 @@ NodeModule::store_location(double ax, double ay) void NodeModule::property_changed(const URI& key, const Atom& value) { - const Shared::URIs& uris = app().uris(); + const URIs& uris = app().uris(); if (value.type() == uris.forge.Float) { if (key == uris.ingen_canvasX) { move_to(value.get_float(), get_y()); diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index 5698bd7f..4fa99677 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -29,7 +29,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp index ce2d23db..7c9483f2 100644 --- a/src/gui/PatchBox.cpp +++ b/src/gui/PatchBox.cpp @@ -453,7 +453,7 @@ PatchBox::message_dialog(const Glib::ustring& message, void PatchBox::event_save_as() { - const Shared::URIs& uris = _app->uris(); + const URIs& uris = _app->uris(); while (true) { Gtk::FileChooserDialog dialog("Save Patch", Gtk::FILE_CHOOSER_ACTION_SAVE); if (_window) { diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index f9e65390..fbbe88b1 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -30,9 +30,9 @@ #include "ingen/client/PatchModel.hpp" #include "ingen/client/PluginModel.hpp" #include "ingen/serialisation/Serialiser.hpp" -#include "ingen/shared/Builder.hpp" -#include "ingen/shared/ClashAvoider.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Builder.hpp" +#include "ingen/ClashAvoider.hpp" +#include "ingen/World.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "raul/log.hpp" @@ -62,7 +62,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index 3c04d29e..5e57adb5 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -39,7 +39,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index 29dc3721..b6c67211 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -32,7 +32,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 5e847400..7a4ed0c8 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -36,7 +36,6 @@ using namespace std; using namespace Raul; namespace Ingen { -using namespace Shared; namespace GUI { Port* @@ -146,7 +145,7 @@ Port::on_value_changed(GVariant* value) const Raul::Atom atom = _app.forge().make(float(g_variant_get_double(value))); if (atom != model()->value()) { - Ingen::Shared::World* const world = _app.world(); + Ingen::World* const world = _app.world(); _app.interface()->set_property(model()->path(), world->uris().ingen_value, atom); diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index cd611199..9b1f8aa0 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -28,7 +28,6 @@ namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp index 668aaa88..56996011 100644 --- a/src/gui/PortPropertiesWindow.cpp +++ b/src/gui/PortPropertiesWindow.cpp @@ -96,8 +96,7 @@ PortPropertiesWindow::present(SharedPtr<const PortModel> pm) void PortPropertiesWindow::property_changed(const URI& key, const Atom& value) { - const Shared::URIs& uris = _app->uris(); - + const URIs& uris = _app->uris(); if (value.type() == uris.forge.Float) { if (key == uris.lv2_minimum) _min_spinner->set_value(value.get_float()); @@ -151,7 +150,7 @@ PortPropertiesWindow::cancel() void PortPropertiesWindow::ok() { - const Shared::URIs& uris = _app->uris(); + const URIs& uris = _app->uris(); Resource::Properties props; props.insert( make_pair(uris.lv2_minimum, diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 6f92d0d3..1a4228b8 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -22,12 +22,13 @@ #include <gtkmm/label.h> #include <gtkmm/spinbutton.h> -#include "raul/log.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/client/NodeModel.hpp" -#include "ingen/client/PluginModel.hpp" #include "App.hpp" #include "PropertiesWindow.hpp" +#include "ingen/Interface.hpp" +#include "ingen/World.hpp" +#include "ingen/client/NodeModel.hpp" +#include "ingen/client/PluginModel.hpp" +#include "raul/log.hpp" #define LOG(s) s << "[PropertiesWindow] " @@ -37,7 +38,6 @@ using namespace Raul; namespace Ingen { using namespace Client; -using namespace Shared; namespace GUI { @@ -105,7 +105,7 @@ PropertiesWindow::present(SharedPtr<const ObjectModel> model) /** Get all the types which this model is an instance of */ static URISet -get_types(Shared::World* world, SharedPtr<const ObjectModel> model) +get_types(World* world, SharedPtr<const ObjectModel> model) { typedef Resource::Properties::const_iterator PropIter; typedef std::pair<PropIter, PropIter> PropRange; @@ -152,7 +152,7 @@ get_types(Shared::World* world, SharedPtr<const ObjectModel> model) /** Get all the properties with domains appropriate to this model */ static URISet -get_properties(Shared::World* world, SharedPtr<const ObjectModel> model) +get_properties(World* world, SharedPtr<const ObjectModel> model) { URISet properties; URISet types = get_types(world, model); @@ -197,7 +197,7 @@ get_properties(Shared::World* world, SharedPtr<const ObjectModel> model) } static Glib::ustring -get_label(Shared::World* world, const LilvNode* node) +get_label(World* world, const LilvNode* node) { LilvNode* rdfs_label = lilv_new_uri( world->lilv_world(), LILV_NS_RDFS "label"); @@ -215,7 +215,7 @@ get_label(Shared::World* world, const LilvNode* node) void PropertiesWindow::add_property(const Raul::URI& uri, const Raul::Atom& value) { - Shared::World* world = _app->world(); + World* world = _app->world(); const unsigned n_rows = _table->property_n_rows() + 1; _table->property_n_rows() = n_rows; @@ -256,7 +256,7 @@ PropertiesWindow::set_object(SharedPtr<const ObjectModel> model) set_title(model->path().chop_scheme() + " Properties - Ingen"); - Shared::World* world = _app->world(); + World* world = _app->world(); LilvNode* rdfs_range = lilv_new_uri( world->lilv_world(), LILV_NS_RDFS "range"); @@ -308,7 +308,7 @@ PropertiesWindow::set_object(SharedPtr<const ObjectModel> model) Gtk::Widget* PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& value) { - Ingen::Shared::Forge& forge = _app->forge(); + Ingen::Forge& forge = _app->forge(); if (value.type() == forge.Int) { Gtk::SpinButton* widget = manage(new Gtk::SpinButton(0.0, 0)); widget->property_numeric() = true; @@ -449,7 +449,7 @@ bad_type: void PropertiesWindow::key_changed() { - Shared::World* world = _app->world(); + World* world = _app->world(); const Gtk::ListStore::Row row = *(_key_combo->get_active()); Glib::ustring prop_uri = row[_combo_columns.uri_col]; diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index 097b9aea..c8e72168 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -117,8 +117,7 @@ RenameWindow::cancel_clicked() void RenameWindow::ok_clicked() { - const Shared::URIs& uris = _app->uris(); - + const URIs& uris = _app->uris(); const string& symbol_str = _symbol_entry->get_text(); const string& label = _label_entry->get_text(); Path path = _object->path(); diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index dcc55e20..8b9dfe5e 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -66,7 +66,7 @@ SubpatchModule::store_location(double ax, double ay) const Atom x(app().forge().make(static_cast<float>(ax))); const Atom y(app().forge().make(static_cast<float>(ay))); - const Shared::URIs& uris = app().uris(); + const URIs& uris = app().uris(); const Atom& existing_x = _node->get_property(uris.ingen_canvasX); const Atom& existing_y = _node->get_property(uris.ingen_canvasY); diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 1867b8d5..054838c6 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -16,8 +16,8 @@ #include <string> #include "raul/log.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/Module.hpp" +#include "ingen/World.hpp" +#include "ingen/Module.hpp" #include "App.hpp" #include "ThreadedLoader.hpp" #include "ingen/client/PatchModel.hpp" @@ -43,7 +43,7 @@ ThreadedLoader::ThreadedLoader(App& app, SharedPtr<Interface> engine) SharedPtr<Serialisation::Parser> ThreadedLoader::parser() { - Ingen::Shared::World* world = _app.world(); + Ingen::World* world = _app.world(); if (!world->parser()) world->load_module("serialisation"); @@ -73,7 +73,7 @@ ThreadedLoader::load_patch(bool merge, { _mutex.lock(); - Ingen::Shared::World* world = _app.world(); + Ingen::World* world = _app.world(); Glib::ustring engine_base = ""; if (engine_parent) { diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp index 572b3870..5e5b987a 100644 --- a/src/gui/WidgetFactory.cpp +++ b/src/gui/WidgetFactory.cpp @@ -19,7 +19,7 @@ #include "raul/log.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/runtime_paths.hpp" #include "WidgetFactory.hpp" @@ -44,7 +44,7 @@ void WidgetFactory::find_ui_file() { // Try file in bundle (directory where executable resides) - ui_filename = Shared::bundle_file_path("ingen_gui.ui"); + ui_filename = Ingen::bundle_file_path("ingen_gui.ui"); if (is_readable(ui_filename)) return; @@ -56,7 +56,7 @@ WidgetFactory::find_ui_file() } // Try the default system installed path - ui_filename = Shared::data_file_path("ingen_gui.ui"); + ui_filename = Ingen::data_file_path("ingen_gui.ui"); if (is_readable(ui_filename)) return; diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp index a2aa906e..d5c15ca9 100644 --- a/src/gui/ingen_gui.cpp +++ b/src/gui/ingen_gui.cpp @@ -14,14 +14,14 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/Module.hpp" +#include "ingen/Module.hpp" #include "App.hpp" -struct IngenGUIModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenGUIModule : public Ingen::Module { + void load(Ingen::World* world) { app = Ingen::GUI::App::create(world); } - void run(Ingen::Shared::World* world) { + void run(Ingen::World* world) { app->run(); } @@ -30,7 +30,7 @@ struct IngenGUIModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenGUIModule(); diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index cead2acb..a9eff24d 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -17,11 +17,11 @@ #include "ingen/client/ClientStore.hpp" #include "ingen/client/PatchModel.hpp" #include "ingen/client/SigClientInterface.hpp" -#include "ingen/shared/AtomReader.hpp" -#include "ingen/shared/AtomSink.hpp" -#include "ingen/shared/AtomWriter.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/AtomReader.hpp" +#include "ingen/AtomSink.hpp" +#include "ingen/AtomWriter.hpp" +#include "ingen/World.hpp" +#include "ingen/runtime_paths.hpp" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" #include "App.hpp" @@ -30,8 +30,8 @@ #define INGEN_LV2_UI_URI "http://drobilla.net/ns/ingen#PatchUIGtk2" /** A sink that writes atoms to a port via the UI extension. */ -struct IngenLV2AtomSink : public Ingen::Shared::AtomSink { - IngenLV2AtomSink(Ingen::Shared::URIs& uris, +struct IngenLV2AtomSink : public Ingen::AtomSink { + IngenLV2AtomSink(Ingen::URIs& uris, LV2UI_Write_Function ui_write, LV2UI_Controller ui_controller) : _uris(uris) @@ -48,7 +48,7 @@ struct IngenLV2AtomSink : public Ingen::Shared::AtomSink { return true; } - Ingen::Shared::URIs& _uris; + Ingen::URIs& _uris; LV2UI_Write_Function _ui_write; LV2UI_Controller _ui_controller; }; @@ -64,13 +64,13 @@ struct IngenLV2UI { int argc; char** argv; - Ingen::Shared::Forge* forge; - Ingen::Shared::World* world; + Ingen::Forge* forge; + Ingen::World* world; IngenLV2AtomSink* sink; SharedPtr<Ingen::GUI::App> app; SharedPtr<Ingen::GUI::PatchBox> view; SharedPtr<Ingen::Interface> engine; - SharedPtr<Ingen::Shared::AtomReader> reader; + SharedPtr<Ingen::AtomReader> reader; SharedPtr<Ingen::Client::SigClientInterface> client; }; @@ -83,7 +83,7 @@ instantiate(const LV2UI_Descriptor* descriptor, LV2UI_Widget* widget, const LV2_Feature* const* features) { - Ingen::Shared::set_bundle_path(bundle_path); + Ingen::set_bundle_path(bundle_path); IngenLV2UI* ui = new IngenLV2UI(); @@ -97,10 +97,9 @@ instantiate(const LV2UI_Descriptor* descriptor, } } - ui->world = new Ingen::Shared::World( - ui->argc, ui->argv, map, unmap); + ui->world = new Ingen::World(ui->argc, ui->argv, map, unmap); - ui->forge = new Ingen::Shared::Forge(ui->world->uri_map()); + ui->forge = new Ingen::Forge(ui->world->uri_map()); if (!ui->world->load_module("client")) { delete ui; @@ -112,7 +111,7 @@ instantiate(const LV2UI_Descriptor* descriptor, // Set up an engine interface that writes LV2 atoms ui->engine = SharedPtr<Ingen::Interface>( - new Ingen::Shared::AtomWriter( + new Ingen::AtomWriter( ui->world->uri_map(), ui->world->uris(), *ui->sink)); ui->world->set_interface(ui->engine); @@ -123,11 +122,11 @@ instantiate(const LV2UI_Descriptor* descriptor, new Ingen::Client::SigClientInterface()); ui->app->attach(ui->client); - ui->reader = SharedPtr<Ingen::Shared::AtomReader>( - new Ingen::Shared::AtomReader(ui->world->uri_map(), - ui->world->uris(), - ui->world->forge(), - *ui->client.get())); + ui->reader = SharedPtr<Ingen::AtomReader>( + new Ingen::AtomReader(ui->world->uri_map(), + ui->world->uris(), + ui->world->forge(), + *ui->client.get())); // Create empty root patch model Ingen::Resource::Properties props; diff --git a/src/gui/wscript b/src/gui/wscript index 6aa80389..5b5ae362 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -9,7 +9,7 @@ def build(bld): name = 'libingen_gui', target = 'ingen_gui', install_path = '${LIBDIR}', - use = 'libingen_shared libingen_client libingen_serialisation') + use = 'libingen libingen_client libingen_serialisation') autowaf.use_lib(bld, obj, ''' GANV GLADEMM @@ -73,5 +73,5 @@ def build(bld): name = 'ingen_gui_lv2', target = 'ingen_gui_lv2', install_path = '${LV2DIR}/ingen.lv2/', - use = 'libingen_gui libingen_shared') + use = 'libingen libingen_gui') autowaf.use_lib(bld, obj, 'LV2') diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 847a08f5..651c7ad0 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -33,9 +33,9 @@ #include "ingen/EngineBase.hpp" #include "ingen/Interface.hpp" #include "ingen/serialisation/Parser.hpp" -#include "ingen/shared/Configuration.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/World.hpp" +#include "ingen/runtime_paths.hpp" #include "ingen/client/ThreadedSigClientInterface.hpp" #ifdef WITH_BINDINGS #include "bindings/ingen_bindings.hpp" @@ -44,7 +44,7 @@ using namespace std; using namespace Ingen; -Ingen::Shared::World* world = NULL; +Ingen::World* world = NULL; void ingen_interrupt(int signal) @@ -75,11 +75,11 @@ int main(int argc, char** argv) { Glib::thread_init(); - Shared::set_bundle_path_from_code((void*)&main); + Ingen::set_bundle_path_from_code((void*)&main); // Create world try { - world = new Ingen::Shared::World(argc, argv, NULL, NULL); + world = new Ingen::World(argc, argv, NULL, NULL); if (argc <= 1) { world->conf().print_usage("ingen", cout); return EXIT_FAILURE; @@ -92,7 +92,7 @@ main(int argc, char** argv) return EXIT_FAILURE; } - Shared::Configuration& conf = world->conf(); + Configuration& conf = world->conf(); if (conf.option("uuid").is_valid()) { world->set_jack_uuid(conf.option("uuid").get_string()); } diff --git a/src/shared/runtime_paths.cpp b/src/runtime_paths.cpp index 8439b248..352afa42 100644 --- a/src/shared/runtime_paths.cpp +++ b/src/runtime_paths.cpp @@ -26,14 +26,13 @@ #include "raul/log.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/runtime_paths.hpp" #include "ingen_config.h" using namespace std; namespace Ingen { -namespace Shared { static std::string bundle_path; @@ -112,5 +111,4 @@ module_path(const std::string& name, std::string dir) } } // namespace Ingen -} // namespace Shared diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 3033f538..f124722c 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -26,9 +26,9 @@ #include "ingen/Interface.hpp" #include "ingen/serialisation/Parser.hpp" -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" #include "raul/Atom.hpp" #include "raul/log.hpp" #include "serd/serd.h" @@ -42,7 +42,6 @@ using namespace std; using namespace Raul; -using namespace Ingen::Shared; typedef set<Sord::Node> RDFNodes; @@ -95,9 +94,9 @@ skip_property(const Sord::Node& predicate) } static Resource::Properties -get_properties(Ingen::Shared::World* world, - Sord::Model& model, - const Sord::Node& subject) +get_properties(Ingen::World* world, + Sord::Model& model, + const Sord::Node& subject) { SerdChunk out = { NULL, 0 }; LV2_URID_Map* map = &world->uri_map().urid_map_feature()->urid_map; @@ -136,11 +135,11 @@ get_properties(Ingen::Shared::World* world, typedef std::pair<Path, Resource::Properties> PortRecord; static int -get_port(Ingen::Shared::World* world, - Sord::Model& model, - const Sord::Node& subject, - const Raul::Path& parent, - PortRecord& record) +get_port(Ingen::World* world, + Sord::Model& model, + const Sord::Node& subject, + const Raul::Path& parent, + PortRecord& record) { const URIs& uris = world->uris(); @@ -172,7 +171,7 @@ get_port(Ingen::Shared::World* world, static boost::optional<Raul::Path> parse( - Shared::World* world, + World* world, Interface* target, Sord::Model& model, Glib::ustring document_uri, @@ -183,7 +182,7 @@ parse( static boost::optional<Raul::Path> parse_patch( - Shared::World* world, + World* world, Interface* target, Sord::Model& model, const Sord::Node& subject, @@ -193,7 +192,7 @@ parse_patch( static boost::optional<Raul::Path> parse_node( - Shared::World* world, + World* world, Interface* target, Sord::Model& model, const Sord::Node& subject, @@ -202,7 +201,7 @@ parse_node( static bool parse_properties( - Shared::World* world, + World* world, Interface* target, Sord::Model& model, const Sord::Node& subject, @@ -211,14 +210,14 @@ parse_properties( static bool parse_edges( - Shared::World* world, + World* world, Interface* target, Sord::Model& model, const Sord::Node& subject, const Raul::Path& patch); static boost::optional<Path> -parse_node(Ingen::Shared::World* world, +parse_node(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, const Sord::Node& subject, @@ -281,7 +280,7 @@ parse_node(Ingen::Shared::World* world, } static boost::optional<Path> -parse_patch(Ingen::Shared::World* world, +parse_patch(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, const Sord::Node& subject_node, @@ -402,11 +401,11 @@ parse_patch(Ingen::Shared::World* world, } static bool -parse_edge(Ingen::Shared::World* world, - Ingen::Interface* target, - Sord::Model& model, - const Sord::Node& subject, - const Raul::Path& parent) +parse_edge(Ingen::World* world, + Ingen::Interface* target, + Sord::Model& model, + const Sord::Node& subject, + const Raul::Path& parent) { const Sord::URI ingen_tail(*world->rdf_world(), NS_INGEN "tail"); const Sord::URI ingen_head(*world->rdf_world(), NS_INGEN "head"); @@ -444,11 +443,11 @@ parse_edge(Ingen::Shared::World* world, } static bool -parse_edges(Ingen::Shared::World* world, - Ingen::Interface* target, - Sord::Model& model, - const Sord::Node& subject, - const Raul::Path& parent) +parse_edges(Ingen::World* world, + Ingen::Interface* target, + Sord::Model& model, + const Sord::Node& subject, + const Raul::Path& parent) { const Sord::URI ingen_edge(*world->rdf_world(), NS_INGEN "edge"); const Sord::Node nil; @@ -461,7 +460,7 @@ parse_edges(Ingen::Shared::World* world, } static bool -parse_properties(Ingen::Shared::World* world, +parse_properties(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, const Sord::Node& subject, @@ -480,7 +479,7 @@ parse_properties(Ingen::Shared::World* world, } static boost::optional<Path> -parse(Ingen::Shared::World* world, +parse(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, Glib::ustring document_uri, @@ -562,7 +561,7 @@ parse(Ingen::Shared::World* world, * @return whether or not load was successful. */ bool -Parser::parse_file(Ingen::Shared::World* world, +Parser::parse_file(Ingen::World* world, Ingen::Interface* target, Glib::ustring path, boost::optional<Raul::Path> parent, @@ -617,7 +616,7 @@ Parser::parse_file(Ingen::Shared::World* world, } bool -Parser::parse_string(Ingen::Shared::World* world, +Parser::parse_string(Ingen::World* world, Ingen::Interface* target, const Glib::ustring& str, const Glib::ustring& base_uri, diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index d0ed16ca..c1842022 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -32,10 +32,10 @@ #include "ingen/Plugin.hpp" #include "ingen/Resource.hpp" #include "ingen/serialisation/Serialiser.hpp" -#include "ingen/shared/Store.hpp" -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Store.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" #include "lv2/lv2plug.in/ns/ext/state/state.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" #include "raul/Path.hpp" @@ -49,13 +49,12 @@ using namespace std; using namespace Raul; using namespace Sord; using namespace Ingen; -using namespace Ingen::Shared; namespace Ingen { namespace Serialisation { struct Serialiser::Impl { - explicit Impl(Shared::World& world) + explicit Impl(World& world) : _root_path("/") , _world(world) , _model(NULL) @@ -99,16 +98,16 @@ struct Serialiser::Impl { std::string finish(); - Raul::Path _root_path; - SharedPtr<Shared::Store> _store; - Mode _mode; - std::string _base_uri; - Shared::World& _world; - Sord::Model* _model; - Sratom* _sratom; + Raul::Path _root_path; + SharedPtr<Store> _store; + Mode _mode; + std::string _base_uri; + World& _world; + Sord::Model* _model; + Sratom* _sratom; }; -Serialiser::Serialiser(Shared::World& world) +Serialiser::Serialiser(World& world) : me(new Impl(world)) {} diff --git a/src/serialisation/serialisation.cpp b/src/serialisation/serialisation.cpp index b425e4ad..3c650dc6 100644 --- a/src/serialisation/serialisation.cpp +++ b/src/serialisation/serialisation.cpp @@ -14,16 +14,16 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "ingen/serialisation/Parser.hpp" #include "ingen/serialisation/Serialiser.hpp" using namespace Ingen; -struct IngenSerialisationModule : public Ingen::Shared::Module { - virtual void load(Ingen::Shared::World* world) { +struct IngenSerialisationModule : public Ingen::Module { + virtual void load(Ingen::World* world) { world->set_parser(SharedPtr<Serialisation::Parser>( new Serialisation::Parser())); world->set_serialiser(SharedPtr<Serialisation::Serialiser>( @@ -33,7 +33,7 @@ struct IngenSerialisationModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenSerialisationModule(); } diff --git a/src/serialisation/wscript b/src/serialisation/wscript index 23924970..190b1aee 100644 --- a/src/serialisation/wscript +++ b/src/serialisation/wscript @@ -11,7 +11,7 @@ def build(bld): name = 'libingen_serialisation', target = 'ingen_serialisation', install_path = '${LIBDIR}', - use = 'libingen_shared') + use = 'libingen') autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SORD SRATOM') if bld.env['BUILD_TESTS']: @@ -24,7 +24,7 @@ def build(bld): name = 'libingen_serialisation_profiled', target = 'ingen_serialisation_profiled', install_path = '', - use = 'libingen_shared_profiled', + use = 'libingen_profiled', lib = bld.env['INGEN_TEST_LIBS'], cxxflags = bld.env['INGEN_TEST_CXXFLAGS']) autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SORD SRATOM') diff --git a/src/server/AudioBuffer.hpp b/src/server/AudioBuffer.hpp index 4836b05b..69558a1f 100644 --- a/src/server/AudioBuffer.hpp +++ b/src/server/AudioBuffer.hpp @@ -23,7 +23,7 @@ #include <boost/utility.hpp> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index 32a1ab92..85b133b3 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -32,8 +32,6 @@ namespace Ingen { namespace Server { -class GraphObjectImpl; - /** Broadcaster for all clients. * * This is an Interface that forwards all messages to all registered diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp index 5438b4ce..e877533a 100644 --- a/src/server/Buffer.cpp +++ b/src/server/Buffer.cpp @@ -22,9 +22,9 @@ #include <new> -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" #include "ingen_config.h" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/log.hpp" diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index 2bcf8201..59da152f 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/log.hpp" #include "AudioBuffer.hpp" @@ -27,7 +27,7 @@ namespace Server { static const size_t EVENT_BYTES_PER_FRAME = 4; // FIXME -BufferFactory::BufferFactory(Engine& engine, Shared::URIs& uris) +BufferFactory::BufferFactory(Engine& engine, URIs& uris) : _engine(engine) , _uris(uris) , _silent_buffer(NULL) @@ -42,7 +42,7 @@ BufferFactory::~BufferFactory() free_list(_free_object.get()); } -Shared::Forge& +Forge& BufferFactory::forge() { return _engine.world()->forge(); diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp index 366c2ffa..11d31b2d 100644 --- a/src/server/BufferFactory.hpp +++ b/src/server/BufferFactory.hpp @@ -26,8 +26,8 @@ #include "raul/AtomicPtr.hpp" #include "raul/RingBuffer.hpp" #include "raul/SharedPtr.hpp" -#include "ingen/shared/Forge.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIs.hpp" #include "Buffer.hpp" #include "BufferRef.hpp" @@ -36,7 +36,7 @@ namespace Ingen { -namespace Shared { class URIs; } +class URIs; namespace Server { @@ -45,7 +45,7 @@ class Engine; class BufferFactory { public: - BufferFactory(Engine& engine, Shared::URIs& uris); + BufferFactory(Engine& engine, URIs& uris); ~BufferFactory(); static uint32_t audio_buffer_size(SampleCount nframes); @@ -60,9 +60,9 @@ public: void set_block_length(SampleCount block_length); - Shared::Forge& forge(); - Shared::URIs& uris() { return _uris; } - Engine& engine() { return _engine; } + Forge& forge(); + URIs& uris() { return _uris; } + Engine& engine() { return _engine; } private: friend class Buffer; @@ -86,9 +86,9 @@ private: Raul::AtomicPtr<Buffer> _free_control; Raul::AtomicPtr<Buffer> _free_object; - Glib::Mutex _mutex; - Engine& _engine; - Shared::URIs& _uris; + Glib::Mutex _mutex; + Engine& _engine; + URIs& _uris; BufferRef _silent_buffer; }; diff --git a/src/server/Context.cpp b/src/server/Context.cpp index 7d47800f..cd42b8d1 100644 --- a/src/server/Context.cpp +++ b/src/server/Context.cpp @@ -14,8 +14,8 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/Forge.hpp" -#include "ingen/shared/URIMap.hpp" +#include "ingen/Forge.hpp" +#include "ingen/URIMap.hpp" #include "raul/log.hpp" #include "Context.hpp" diff --git a/src/server/Context.hpp b/src/server/Context.hpp index 70bf9949..2311f7d2 100644 --- a/src/server/Context.hpp +++ b/src/server/Context.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_ENGINE_CONTEXT_HPP #define INGEN_ENGINE_CONTEXT_HPP -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" #include "raul/Atom.hpp" #include "raul/RingBuffer.hpp" diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 023f38c1..cec5a83c 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -16,9 +16,9 @@ #include <math.h> -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/log.hpp" #include "raul/midi_events.h" @@ -59,7 +59,7 @@ ControlBindings::Key ControlBindings::port_binding(PortImpl* port) const { ThreadManager::assert_thread(THREAD_PRE_PROCESS); - const Ingen::Shared::URIs& uris = _engine.world()->uris(); + const Ingen::URIs& uris = _engine.world()->uris(); const Raul::Atom& binding = port->get_property(uris.ingen_controlBinding); return binding_key(binding); } @@ -67,7 +67,7 @@ ControlBindings::port_binding(PortImpl* port) const ControlBindings::Key ControlBindings::binding_key(const Raul::Atom& binding) const { - const Ingen::Shared::URIs& uris = _engine.world()->uris(); + const Ingen::URIs& uris = _engine.world()->uris(); Key key; LV2_Atom* num = NULL; if (binding.type() == uris.atom_Blank) { @@ -141,8 +141,8 @@ ControlBindings::port_value_changed(ProcessContext& context, Key key, const Raul::Atom& value_atom) { - Ingen::Shared::World* world = context.engine().world(); - const Ingen::Shared::URIs& uris = world->uris(); + Ingen::World* world = context.engine().world(); + const Ingen::URIs& uris = world->uris(); if (key) { int16_t value = port_value_to_control( context, port, key.type, value_atom); @@ -279,7 +279,7 @@ ControlBindings::port_value_to_control(ProcessContext& context, } static void -forge_binding(const Shared::URIs& uris, +forge_binding(const URIs& uris, LV2_Atom_Forge* forge, ControlBindings::Type binding_type, int32_t value) @@ -329,7 +329,7 @@ ControlBindings::set_port_value(ProcessContext& context, reinterpret_cast<AudioBuffer*>(port->buffer(v).get())->set_value( port_value.get_float(), context.start(), context.start()); - Shared::URIs& uris = context.engine().world()->uris(); + URIs& uris = context.engine().world()->uris(); context.notify(uris.ingen_value, context.start(), port, port_value.size(), port_value.type(), port_value.get_body()); } @@ -337,7 +337,7 @@ ControlBindings::set_port_value(ProcessContext& context, bool ControlBindings::bind(ProcessContext& context, Key key) { - const Ingen::Shared::URIs& uris = context.engine().world()->uris(); + const Ingen::URIs& uris = context.engine().world()->uris(); assert(_learn_port); if (key.type == MIDI_NOTE) { if (!_learn_port->is_toggled()) @@ -410,8 +410,8 @@ ControlBindings::pre_process(ProcessContext& context, Buffer* buffer) SharedPtr<Bindings> bindings = _bindings; _feedback->clear(); - Ingen::Shared::World* world = context.engine().world(); - const Ingen::Shared::URIs& uris = world->uris(); + Ingen::World* world = context.engine().world(); + const Ingen::URIs& uris = world->uris(); if (!_learn_port && bindings->empty()) { // Don't bother reading input diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index 6d332ad6..c3b1a6b7 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -16,7 +16,7 @@ #include <string> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "Buffer.hpp" #include "DuplexPort.hpp" diff --git a/src/server/EdgeImpl.cpp b/src/server/EdgeImpl.cpp index 46d45f27..7fad4e94 100644 --- a/src/server/EdgeImpl.cpp +++ b/src/server/EdgeImpl.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/log.hpp" @@ -106,7 +106,7 @@ EdgeImpl::queue(Context& context) if (!must_queue()) return; - const Ingen::Shared::URIs& uris = _tail->bufs().uris(); + const Ingen::URIs& uris = _tail->bufs().uris(); BufferRef src_buf = _tail->buffer(0); if (src_buf->atom()->type != uris.atom_Sequence) { @@ -152,7 +152,7 @@ EdgeImpl::must_queue() const bool EdgeImpl::can_connect(const OutputPort* src, const InputPort* dst) { - const Ingen::Shared::URIs& uris = src->bufs().uris(); + const Ingen::URIs& uris = src->bufs().uris(); return ( // (Audio | Control | CV) => (Audio | Control | CV) ( (src->is_a(PortType::CONTROL) || diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 30350d52..3e7ab4d0 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -17,10 +17,10 @@ #include <sys/mman.h> #include "events/CreatePort.hpp" -#include "ingen/shared/Configuration.hpp" -#include "ingen/shared/Store.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/Store.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" #include "raul/Maid.hpp" #include "raul/SharedPtr.hpp" @@ -50,7 +50,7 @@ namespace Server { Raul::ThreadVar<unsigned> ThreadManager::flags(0); bool ThreadManager::single_threaded(true); -Engine::Engine(Ingen::Shared::World* a_world) +Engine::Engine(Ingen::World* a_world) : _world(a_world) , _broadcaster(new Broadcaster()) , _control_bindings(NULL) @@ -72,7 +72,7 @@ Engine::Engine(Ingen::Shared::World* a_world) } else { _buffer_factory = new BufferFactory(*this, a_world->uris()); a_world->set_store( - SharedPtr<Ingen::Shared::Store>( + SharedPtr<Ingen::Store>( new EngineStore(SharedPtr<BufferFactory>(_buffer_factory)))); } @@ -88,7 +88,7 @@ Engine::~Engine() SharedPtr<EngineStore> store = engine_store(); if (store) for (EngineStore::iterator i = store->begin(); i != store->end(); ++i) - if ( ! PtrCast<GraphObjectImpl>(i->second)->parent() ) + if (!PtrCast<GraphObjectImpl>(i->second)->parent()) i->second.reset(); delete _maid; @@ -181,8 +181,8 @@ Engine::activate() _pre_processor->start(); _message_context.Thread::start(); - const Ingen::Shared::URIs& uris = world()->uris(); - Shared::Forge& forge = world()->forge(); + const Ingen::URIs& uris = world()->uris(); + Forge& forge = world()->forge(); // Create root patch if (!_root_patch) { diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 4ee14988..c4290d60 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -30,7 +30,7 @@ namespace Raul { class Maid; } namespace Ingen { -namespace Shared { class World; } +class World; namespace Server { @@ -54,14 +54,14 @@ class Worker; This is a simple class that provides pointers to the various components that make up the engine implementation. In processes with a local engine, - it can be accessed via the Ingen::Shared::World. + it can be accessed via the Ingen::World. @ingroup engine */ class Engine : public boost::noncopyable, public EngineBase { public: - explicit Engine(Ingen::Shared::World* world); + explicit Engine(Ingen::World* world); virtual ~Engine(); @@ -91,7 +91,7 @@ public: return &context == &_process_context; } - Ingen::Shared::World* world() const { return _world; } + Ingen::World* world() const { return _world; } EventWriter* interface() const { return _event_writer; } Broadcaster* broadcaster() const { return _broadcaster; } @@ -112,7 +112,7 @@ public: size_t event_queue_size() const; private: - Ingen::Shared::World* _world; + Ingen::World* _world; Broadcaster* _broadcaster; BufferFactory* _buffer_factory; diff --git a/src/server/EngineStore.hpp b/src/server/EngineStore.hpp index ccac2b74..8b16335f 100644 --- a/src/server/EngineStore.hpp +++ b/src/server/EngineStore.hpp @@ -19,7 +19,7 @@ #include "raul/SharedPtr.hpp" -#include "ingen/shared/Store.hpp" +#include "ingen/Store.hpp" namespace Ingen { @@ -28,10 +28,10 @@ class GraphObject; namespace Server { class BufferFactory; -class GraphObjectImpl; class NodeImpl; class PatchImpl; class PortImpl; +class GraphObjectImpl; /** Storage for all GraphObjects (tree of GraphObject's sorted by path). * @@ -42,7 +42,7 @@ class PortImpl; * Searching with find*() is fast (O(log(n)) binary search on contiguous * memory) and realtime safe, but modification (add or remove) are neither. */ -class EngineStore : public Ingen::Shared::Store +class EngineStore : public Ingen::Store { public: explicit EngineStore(SharedPtr<BufferFactory> f) : _factory(f) {} diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp index 43cf25ac..c913c17a 100644 --- a/src/server/EventWriter.cpp +++ b/src/server/EventWriter.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "Engine.hpp" #include "EventWriter.hpp" diff --git a/src/server/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp index 050992c8..0d07b510 100644 --- a/src/server/GraphObjectImpl.cpp +++ b/src/server/GraphObjectImpl.cpp @@ -25,9 +25,9 @@ using namespace std; namespace Ingen { namespace Server { -GraphObjectImpl::GraphObjectImpl(Ingen::Shared::URIs& uris, - GraphObjectImpl* parent, - const Raul::Symbol& symbol) +GraphObjectImpl::GraphObjectImpl(Ingen::URIs& uris, + GraphObjectImpl* parent, + const Raul::Symbol& symbol) : GraphObject(uris, parent ? parent->path().child(symbol) : "/") , _parent(parent) , _path(parent ? parent->path().child(symbol) : "/") diff --git a/src/server/GraphObjectImpl.hpp b/src/server/GraphObjectImpl.hpp index 5df7b565..45a9e979 100644 --- a/src/server/GraphObjectImpl.hpp +++ b/src/server/GraphObjectImpl.hpp @@ -93,9 +93,9 @@ public: ProcessContext& context, Raul::Maid& maid, uint32_t poly) = 0; protected: - GraphObjectImpl(Ingen::Shared::URIs& uris, - GraphObjectImpl* parent, - const Raul::Symbol& symbol); + GraphObjectImpl(Ingen::URIs& uris, + GraphObjectImpl* parent, + const Raul::Symbol& symbol); GraphObjectImpl* _parent; Raul::Path _path; diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 90d01cca..796bfe52 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -24,7 +24,7 @@ #include "NodeImpl.hpp" #include "OutputPort.hpp" #include "ProcessContext.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "mix.hpp" using namespace std; @@ -44,7 +44,7 @@ InputPort::InputPort(BufferFactory& bufs, : PortImpl(bufs, parent, symbol, index, poly, type, buffer_type, value, buffer_size) , _num_edges(0) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); if (parent->graph_type() != GraphObject::PATCH) { add_property(uris.rdf_type, uris.lv2_InputPort); diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index f88b696e..587acaf6 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -16,7 +16,7 @@ #include <cassert> #include <string> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "internals/Controller.hpp" #include "internals/Delay.hpp" #include "internals/Note.hpp" @@ -32,7 +32,7 @@ namespace Server { using namespace Internals; -InternalPlugin::InternalPlugin(Shared::URIs& uris, +InternalPlugin::InternalPlugin(URIs& uris, const std::string& uri, const std::string& symbol) : PluginImpl(uris, Plugin::Internal, uri) diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp index 79669420..5c89e3c0 100644 --- a/src/server/InternalPlugin.hpp +++ b/src/server/InternalPlugin.hpp @@ -38,7 +38,7 @@ class BufferFactory; class InternalPlugin : public PluginImpl { public: - InternalPlugin(Shared::URIs& uris, + InternalPlugin(URIs& uris, const std::string& uri, const std::string& symbol); diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 3dcf6072..db535a0f 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -26,9 +26,9 @@ #include "ingen/serialisation/Serialiser.hpp" #endif -#include "ingen/shared/Configuration.hpp" -#include "ingen/shared/LV2Features.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/LV2Features.hpp" +#include "ingen/World.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/List.hpp" #include "raul/log.hpp" @@ -262,7 +262,7 @@ JackDriver::attach(const std::string& server_name, void JackDriver::activate() { - Shared::World* world = _engine.world(); + World* world = _engine.world(); if (_is_activated) { LOG(Raul::warn)("Jack driver already activated\n"); diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp index b2554dfe..b7474b76 100644 --- a/src/server/LV2Info.cpp +++ b/src/server/LV2Info.cpp @@ -23,8 +23,8 @@ #include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h" #include "lv2/lv2plug.in/ns/ext/worker/worker.h" -#include "ingen/shared/World.hpp" -#include "ingen/shared/LV2Features.hpp" +#include "ingen/World.hpp" +#include "ingen/LV2Features.hpp" #include "LV2Info.hpp" #include "LV2ResizeFeature.hpp" @@ -32,7 +32,7 @@ namespace Ingen { namespace Server { -LV2Info::LV2Info(Ingen::Shared::World* world) +LV2Info::LV2Info(Ingen::World* world) : atom_AtomPort(lilv_new_uri(world->lilv_world(), LV2_ATOM__AtomPort)) , atom_bufferType(lilv_new_uri(world->lilv_world(), LV2_ATOM__bufferType)) , atom_supports(lilv_new_uri(world->lilv_world(), LV2_ATOM__supports)) @@ -54,7 +54,7 @@ LV2Info::LV2Info(Ingen::Shared::World* world) assert(world); world->lv2_features().add_feature( - SharedPtr<Shared::LV2Features::Feature>(new ResizeFeature())); + SharedPtr<LV2Features::Feature>(new ResizeFeature())); } LV2Info::~LV2Info() diff --git a/src/server/LV2Info.hpp b/src/server/LV2Info.hpp index 321561e7..9b6ea9db 100644 --- a/src/server/LV2Info.hpp +++ b/src/server/LV2Info.hpp @@ -18,19 +18,16 @@ #define INGEN_ENGINE_LV2INFO_HPP #include "lilv/lilv.h" -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" namespace Ingen { - -class Node; - namespace Server { /** Stuff that may need to be passed to an LV2 plugin (i.e. LV2 features). */ class LV2Info { public: - explicit LV2Info(Ingen::Shared::World* world); + explicit LV2Info(Ingen::World* world); ~LV2Info(); LilvNode* atom_AtomPort; @@ -50,11 +47,11 @@ public: LilvNode* rsz_minimumSize; LilvNode* work_schedule; - Ingen::Shared::World& world() { return *_world; } - LilvWorld* lv2_world() { return _world->lilv_world(); } + Ingen::World& world() { return *_world; } + LilvWorld* lv2_world() { return _world->lilv_world(); } private: - Ingen::Shared::World* _world; + Ingen::World* _world; }; } // namespace Server diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp index a3c0faa4..5861a068 100644 --- a/src/server/LV2Node.cpp +++ b/src/server/LV2Node.cpp @@ -27,8 +27,8 @@ #include "raul/Maid.hpp" #include "raul/Array.hpp" -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" #include "AudioBuffer.hpp" #include "Driver.hpp" @@ -69,10 +69,10 @@ LV2Node::~LV2Node() } SharedPtr<LilvInstance> -LV2Node::make_instance(Shared::URIs& uris, - SampleRate rate, - uint32_t voice, - bool preparing) +LV2Node::make_instance(URIs& uris, + SampleRate rate, + uint32_t voice, + bool preparing) { LilvInstance* inst = lilv_plugin_instantiate( _lv2_plugin->lilv_plugin(), rate, _features->array()); @@ -192,11 +192,11 @@ LV2Node::apply_poly(ProcessContext& context, Raul::Maid& maid, uint32_t poly) bool LV2Node::instantiate(BufferFactory& bufs) { - const Ingen::Shared::URIs& uris = bufs.uris(); - SharedPtr<LV2Info> info = _lv2_plugin->lv2_info(); - const LilvPlugin* plug = _lv2_plugin->lilv_plugin(); - Ingen::Shared::Forge& forge = bufs.forge(); - const uint32_t num_ports = lilv_plugin_get_num_ports(plug); + const Ingen::URIs& uris = bufs.uris(); + SharedPtr<LV2Info> info = _lv2_plugin->lv2_info(); + const LilvPlugin* plug = _lv2_plugin->lilv_plugin(); + Ingen::Forge& forge = bufs.forge(); + const uint32_t num_ports = lilv_plugin_get_num_ports(plug); _ports = new Raul::Array<PortImpl*>(num_ports, NULL); diff --git a/src/server/LV2Node.hpp b/src/server/LV2Node.hpp index 60d412c8..f4d20658 100644 --- a/src/server/LV2Node.hpp +++ b/src/server/LV2Node.hpp @@ -24,7 +24,7 @@ #include "BufferRef.hpp" #include "NodeImpl.hpp" -#include "ingen/shared/LV2Features.hpp" +#include "ingen/LV2Features.hpp" #include "types.hpp" namespace Ingen { @@ -65,10 +65,10 @@ public: SampleCount offset); protected: - SharedPtr<LilvInstance> make_instance(Shared::URIs& uris, - SampleRate rate, - uint32_t voice, - bool preparing); + SharedPtr<LilvInstance> make_instance(URIs& uris, + SampleRate rate, + uint32_t voice, + bool preparing); inline LilvInstance* instance(uint32_t voice) { return (LilvInstance*)(*_instances)[voice].get(); @@ -103,12 +103,12 @@ protected: static LV2_Worker_Status work_respond( LV2_Worker_Respond_Handle handle, uint32_t size, const void* data); - LV2Plugin* _lv2_plugin; - Instances* _instances; - Instances* _prepared_instances; - LV2_Worker_Interface* _worker_iface; - Responses _responses; - SharedPtr<Shared::LV2Features::FeatureArray> _features; + LV2Plugin* _lv2_plugin; + Instances* _instances; + Instances* _prepared_instances; + LV2_Worker_Interface* _worker_iface; + Responses _responses; + SharedPtr<LV2Features::FeatureArray> _features; }; } // namespace Server diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index 9280d520..c5fcd6cc 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -16,7 +16,7 @@ #include <string> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "Driver.hpp" #include "Engine.hpp" diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp index 978a1c8f..d9a9330f 100644 --- a/src/server/LV2ResizeFeature.hpp +++ b/src/server/LV2ResizeFeature.hpp @@ -19,14 +19,14 @@ #include "raul/log.hpp" #include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h" -#include "ingen/shared/LV2Features.hpp" +#include "ingen/LV2Features.hpp" #include "NodeImpl.hpp" #include "PortImpl.hpp" namespace Ingen { namespace Server { -struct ResizeFeature : public Ingen::Shared::LV2Features::Feature { +struct ResizeFeature : public Ingen::LV2Features::Feature { static LV2_Resize_Port_Status resize_port( LV2_Resize_Port_Feature_Data data, uint32_t index, @@ -46,7 +46,7 @@ struct ResizeFeature : public Ingen::Shared::LV2Features::Feature { free(feature); } - SharedPtr<LV2_Feature> feature(Shared::World* w, GraphObject* n) { + SharedPtr<LV2_Feature> feature(World* w, GraphObject* n) { NodeImpl* node = dynamic_cast<NodeImpl*>(n); if (!node) return SharedPtr<LV2_Feature>(); diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp index f42d32c8..616a1b35 100644 --- a/src/server/NodeFactory.cpp +++ b/src/server/NodeFactory.cpp @@ -24,7 +24,7 @@ #include "internals/Delay.hpp" #include "internals/Note.hpp" #include "internals/Trigger.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" #include "InternalPlugin.hpp" #include "LV2Plugin.hpp" @@ -38,7 +38,7 @@ namespace Server { using namespace Internals; -NodeFactory::NodeFactory(Ingen::Shared::World* world) +NodeFactory::NodeFactory(Ingen::World* world) : _world(world) , _lv2_info(new LV2Info(world)) , _has_loaded(false) @@ -91,7 +91,7 @@ NodeFactory::load_plugins() void NodeFactory::load_internal_plugins() { - Ingen::Shared::URIs& uris = _world->uris(); + Ingen::URIs& uris = _world->uris(); InternalPlugin* controller_plug = ControllerNode::internal_plugin(uris); _plugins.insert(make_pair(controller_plug->uri(), controller_plug)); diff --git a/src/server/NodeFactory.hpp b/src/server/NodeFactory.hpp index 2188266b..a6811c9c 100644 --- a/src/server/NodeFactory.hpp +++ b/src/server/NodeFactory.hpp @@ -22,7 +22,7 @@ #include "raul/SharedPtr.hpp" #include "raul/URI.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" namespace Ingen { namespace Server { @@ -39,7 +39,7 @@ class LV2Info; class NodeFactory { public: - explicit NodeFactory(Ingen::Shared::World* world); + explicit NodeFactory(Ingen::World* world); ~NodeFactory(); void load_plugin(const Raul::URI& uri); @@ -54,10 +54,10 @@ private: void load_lv2_plugins(); void load_internal_plugins(); - Plugins _plugins; - Ingen::Shared::World* _world; - SharedPtr<LV2Info> _lv2_info; - bool _has_loaded; + Plugins _plugins; + Ingen::World* _world; + SharedPtr<LV2Info> _lv2_info; + bool _has_loaded; }; } // namespace Server diff --git a/src/server/OutputPort.cpp b/src/server/OutputPort.cpp index 30650f90..4c790c0b 100644 --- a/src/server/OutputPort.cpp +++ b/src/server/OutputPort.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "Buffer.hpp" #include "BufferFactory.hpp" diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp index 95bb2132..359122fa 100644 --- a/src/server/PatchImpl.cpp +++ b/src/server/PatchImpl.cpp @@ -17,8 +17,8 @@ #include <cassert> #include <string> -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" #include "raul/log.hpp" #include "EdgeImpl.hpp" diff --git a/src/server/PatchPlugin.hpp b/src/server/PatchPlugin.hpp index 8f5ca07a..860ddd78 100644 --- a/src/server/PatchPlugin.hpp +++ b/src/server/PatchPlugin.hpp @@ -32,7 +32,7 @@ class NodeImpl; class PatchPlugin : public PluginImpl { public: - PatchPlugin(Shared::URIs& uris, + PatchPlugin(URIs& uris, const std::string& uri, const std::string& symbol, const std::string& name) diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp index 968c43f6..1031c8e3 100644 --- a/src/server/PluginImpl.hpp +++ b/src/server/PluginImpl.hpp @@ -27,7 +27,7 @@ namespace Ingen { -namespace Shared { class URIs; } +class URIs; namespace Server { @@ -44,9 +44,9 @@ class PluginImpl : public Plugin , public boost::noncopyable { public: - PluginImpl(Ingen::Shared::URIs& uris, - Type type, - const std::string& uri) + PluginImpl(Ingen::URIs& uris, + Type type, + const std::string& uri) : Plugin(uris, uri) , _type(type) {} diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index 671c8ae2..8c044d7b 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/Array.hpp" #include "raul/Maid.hpp" @@ -65,7 +65,7 @@ PortImpl::PortImpl(BufferFactory& bufs, assert(node != NULL); assert(_poly > 0); - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); set_type(type, buffer_type); @@ -232,8 +232,8 @@ PortImpl::clear_buffers() void PortImpl::broadcast_value(Context& context, bool force) { - Shared::Forge& forge = context.engine().world()->forge(); - Shared::URIs& uris = context.engine().world()->uris(); + Forge& forge = context.engine().world()->forge(); + URIs& uris = context.engine().world()->uris(); LV2_URID key = 0; Raul::Atom val; switch (_type.symbol()) { diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 63efb64f..459c1858 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -25,9 +25,9 @@ #include "Buffer.hpp" #include "BufferRef.hpp" -#include "Context.hpp" #include "GraphObjectImpl.hpp" #include "PortType.hpp" +#include "ProcessContext.hpp" #include "types.hpp" namespace Raul { class Maid; } diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp index 58cf6104..da0b2047 100644 --- a/src/server/Worker.cpp +++ b/src/server/Worker.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/LV2Features.hpp" +#include "ingen/LV2Features.hpp" #include "lv2/lv2plug.in/ns/ext/worker/worker.h" #include "raul/log.hpp" @@ -80,7 +80,7 @@ delete_feature(LV2_Feature* feature) } SharedPtr<LV2_Feature> -Worker::Schedule::feature(Shared::World* world, GraphObject* n) +Worker::Schedule::feature(World* world, GraphObject* n) { LV2Node* node = dynamic_cast<LV2Node*>(n); if (!node) { diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp index 785c8fa2..f23597e6 100644 --- a/src/server/Worker.hpp +++ b/src/server/Worker.hpp @@ -17,7 +17,7 @@ #ifndef INGEN_ENGINE_WORKER_HPP #define INGEN_ENGINE_WORKER_HPP -#include "ingen/shared/LV2Features.hpp" +#include "ingen/LV2Features.hpp" #include "lv2/lv2plug.in/ns/ext/worker/worker.h" #include "raul/RingBuffer.hpp" #include "raul/Semaphore.hpp" @@ -33,8 +33,8 @@ class Worker : public Raul::Thread public: Worker(uint32_t buffer_size); - struct Schedule : public Shared::LV2Features::Feature { - SharedPtr<LV2_Feature> feature(Shared::World* world, GraphObject* n); + struct Schedule : public LV2Features::Feature { + SharedPtr<LV2_Feature> feature(World* world, GraphObject* n); }; LV2_Worker_Status request(LV2Node* node, diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp index f7e570f0..f1b65fa3 100644 --- a/src/server/events/CreateNode.cpp +++ b/src/server/events/CreateNode.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/Maid.hpp" #include "raul/Path.hpp" @@ -49,7 +49,7 @@ CreateNode::CreateNode(Engine& engine, bool CreateNode::pre_process() { - Ingen::Shared::URIs& uris = _engine.world()->uris(); + Ingen::URIs& uris = _engine.world()->uris(); typedef Resource::Properties::const_iterator iterator; diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp index 602fe2a4..476ccccb 100644 --- a/src/server/events/CreatePatch.cpp +++ b/src/server/events/CreatePatch.cpp @@ -14,7 +14,7 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/Maid.hpp" #include "raul/Path.hpp" @@ -58,7 +58,7 @@ CreatePatch::pre_process() return Event::pre_process_done(PARENT_NOT_FOUND, path.parent()); } - const Ingen::Shared::URIs& uris = _engine.world()->uris(); + const Ingen::URIs& uris = _engine.world()->uris(); typedef Resource::Properties::const_iterator iterator; diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index b89a90cc..c62e858c 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -16,8 +16,8 @@ #include <utility> -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/URIs.hpp" #include "raul/Array.hpp" #include "raul/Atom.hpp" #include "raul/Path.hpp" @@ -54,7 +54,7 @@ CreatePort::CreatePort(Engine& engine, , _properties(properties) , _is_output(is_output) { - const Ingen::Shared::URIs& uris = _engine.world()->uris(); + const Ingen::URIs& uris = _engine.world()->uris(); typedef Resource::Properties::const_iterator Iterator; typedef std::pair<Iterator, Iterator> Range; @@ -96,7 +96,7 @@ CreatePort::pre_process() return Event::pre_process_done(PARENT_NOT_FOUND, _path.parent()); } - const Shared::URIs& uris = _engine.world()->uris(); + const URIs& uris = _engine.world()->uris(); const BufferFactory& buffer_factory = *_engine.buffer_factory(); const uint32_t buf_size = buffer_factory.default_size(_buf_type); diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 4e9ca791..a497bb37 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -18,7 +18,7 @@ #include <glibmm/thread.h> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/Maid.hpp" #include "Broadcaster.hpp" @@ -29,7 +29,6 @@ #include "Delta.hpp" #include "Engine.hpp" #include "EngineStore.hpp" -#include "GraphObjectImpl.hpp" #include "PatchImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" @@ -39,7 +38,7 @@ #define LOG(s) s << "[Delta] " // #define DUMP 1 -// #include "ingen/shared/URIMap.hpp" +// #include "ingen/URIMap.hpp" namespace Ingen { namespace Server { @@ -115,7 +114,7 @@ Delta::pre_process() return Event::pre_process_done(NOT_FOUND, _subject); } - const Ingen::Shared::URIs& uris = _engine.world()->uris(); + const Ingen::URIs& uris = _engine.world()->uris(); if (is_graph_object && !_object) { Raul::Path path(_subject.str()); @@ -146,16 +145,6 @@ Delta::pre_process() GraphObjectImpl* obj = dynamic_cast<GraphObjectImpl*>(_object); -#if 0 - // If we're replacing (i.e. this is a PUT, not a POST), first remove all properties - // with keys we will later set. This must be done first so a PUT with several properties - // of the same predicate (e.g. rdf:type) retains the multiple values. Only previously - // existing properties should be replaced - if (_replace) - for (Properties::iterator p = _properties.begin(); p != _properties.end(); ++p) - obj->properties().erase(p->first); -#endif - for (Properties::const_iterator p = _remove.begin(); p != _remove.end(); ++p) { const Raul::URI& key = p->first; const Raul::Atom& value = p->second; @@ -260,7 +249,7 @@ Delta::execute(ProcessContext& context) return; } - const Ingen::Shared::URIs& uris = _engine.world()->uris(); + const Ingen::URIs& uris = _engine.world()->uris(); if (_create_event) { _create_event->set_time(_time); diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index 33cd236b..6632750f 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -59,9 +59,9 @@ DisconnectAll::DisconnectAll(Engine& engine, /** Internal version for use by other events. */ -DisconnectAll::DisconnectAll(Engine& engine, - PatchImpl* parent, - GraphObjectImpl* object) +DisconnectAll::DisconnectAll(Engine& engine, + PatchImpl* parent, + GraphObject* object) : Event(engine) , _parent_path(parent->path()) , _path(object->path()) diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index a6d5d3d6..12c04ffa 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -50,9 +50,9 @@ public: const Raul::Path& parent, const Raul::Path& object); - DisconnectAll(Engine& engine, - PatchImpl* parent, - GraphObjectImpl* object); + DisconnectAll(Engine& engine, + PatchImpl* parent, + GraphObject* object); ~DisconnectAll(); diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index cc64aaef..f2204e67 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -134,7 +134,7 @@ Get::post_process() _engine.broadcaster()->send_plugins_to(_request_client.get(), _plugins); } else if (_uri == "ingen:engine") { // TODO: Keep a proper RDF model of the engine - Shared::URIs& uris = _engine.world()->uris(); + URIs& uris = _engine.world()->uris(); _request_client->set_property( uris.ingen_engine, uris.ingen_sampleRate, diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index adc3f0bb..fd1059ad 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -26,7 +26,7 @@ namespace Ingen { namespace Server { -class GraphObjectImpl; +class GraphObject; class PluginImpl; namespace Events { diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index e0a56489..52d17c32 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -14,9 +14,9 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/LV2Features.hpp" -#include "ingen/shared/URIs.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/LV2Features.hpp" +#include "ingen/URIs.hpp" +#include "ingen/World.hpp" #include "raul/log.hpp" #include "AudioBuffer.hpp" @@ -96,8 +96,8 @@ SetPortValue::apply(Context& context) return; } - Ingen::Shared::URIs& uris = _engine.world()->uris(); - Buffer* const buf = _port->buffer(0).get(); + Ingen::URIs& uris = _engine.world()->uris(); + Buffer* const buf = _port->buffer(0).get(); AudioBuffer* const abuf = dynamic_cast<AudioBuffer*>(buf); if (abuf) { diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp index 6e5665cb..3a0d4324 100644 --- a/src/server/ingen_engine.cpp +++ b/src/server/ingen_engine.cpp @@ -14,16 +14,16 @@ along with Ingen. If not, see <http://www.gnu.org/licenses/>. */ -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "Engine.hpp" #include "EventWriter.hpp" #include "util.hpp" using namespace Ingen; -struct IngenEngineModule : public Ingen::Shared::Module { - virtual void load(Ingen::Shared::World* world) { +struct IngenEngineModule : public Ingen::Module { + virtual void load(Ingen::World* world) { Server::set_denormal_flags(); SharedPtr<Server::Engine> engine(new Server::Engine(world)); world->set_engine(engine); @@ -36,7 +36,7 @@ struct IngenEngineModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenEngineModule(); diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index 415a57a2..6019d1d8 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -16,9 +16,9 @@ #include <string> -#include "ingen/shared/Configuration.hpp" -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "raul/Configuration.hpp" #include "raul/log.hpp" @@ -28,8 +28,8 @@ using namespace std; using namespace Ingen; -struct IngenJackModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenJackModule : public Ingen::Module { + void load(Ingen::World* world) { if (((Server::Engine*)world->engine().get())->driver()) { Raul::warn << "Engine already has a driver" << std::endl; return; @@ -49,7 +49,7 @@ struct IngenJackModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenJackModule(); diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index aadb0914..88db9b24 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -33,11 +33,11 @@ #include "ingen/Interface.hpp" #include "ingen/serialisation/Parser.hpp" #include "ingen/serialisation/Serialiser.hpp" -#include "ingen/shared/AtomReader.hpp" -#include "ingen/shared/AtomWriter.hpp" -#include "ingen/shared/Store.hpp" -#include "ingen/shared/World.hpp" -#include "ingen/shared/runtime_paths.hpp" +#include "ingen/AtomReader.hpp" +#include "ingen/AtomWriter.hpp" +#include "ingen/Store.hpp" +#include "ingen/World.hpp" +#include "ingen/runtime_paths.hpp" #include "raul/SharedPtr.hpp" #include "raul/Thread.hpp" #include "raul/log.hpp" @@ -109,7 +109,7 @@ public: LV2_Atom_Sequence* seq = (LV2_Atom_Sequence*)_buffer; bool enqueued = false; Buffer* patch_buf = _patch_port->buffer(0).get(); - Shared::URIs& uris = _patch_port->bufs().uris(); + URIs& uris = _patch_port->bufs().uris(); patch_buf->prepare_write(context); LV2_ATOM_SEQUENCE_FOREACH(seq, ev) { if (!patch_buf->append_event( @@ -118,7 +118,7 @@ public: Raul::warn("Failed to write to buffer, event lost!\n"); } - if (Shared::AtomReader::is_message(uris, &ev->body)) { + if (AtomReader::is_message(uris, &ev->body)) { enqueue_message(context, _driver, &ev->body); enqueued = true; } @@ -146,7 +146,7 @@ private: }; class LV2Driver : public Ingen::Server::Driver - , public Ingen::Shared::AtomSink + , public Ingen::AtomSink { private: typedef std::vector<LV2Port*> Ports; @@ -333,26 +333,26 @@ public: virtual SampleCount sample_rate() const { return _sample_rate; } virtual SampleCount frame_time() const { return _frame_time; } - virtual bool is_realtime() const { return true; } - Shared::AtomReader& reader() { return _reader; } - Shared::AtomWriter& writer() { return _writer; } + virtual bool is_realtime() const { return true; } + AtomReader& reader() { return _reader; } + AtomWriter& writer() { return _writer; } Ports& ports() { return _ports; } private: - Engine& _engine; - Raul::Semaphore _main_sem; - Shared::AtomReader _reader; - Shared::AtomWriter _writer; - Raul::RingBuffer _from_ui; - Raul::RingBuffer _to_ui; - PatchImpl* _root_patch; - SampleCount _block_length; - SampleCount _sample_rate; - SampleCount _frame_time; - Ports _ports; - Raul::Semaphore _to_ui_overflow_sem; - bool _to_ui_overflow; + Engine& _engine; + Raul::Semaphore _main_sem; + AtomReader _reader; + AtomWriter _writer; + Raul::RingBuffer _from_ui; + Raul::RingBuffer _to_ui; + PatchImpl* _root_patch; + SampleCount _block_length; + SampleCount _sample_rate; + SampleCount _frame_time; + Ports _ports; + Raul::Semaphore _to_ui_overflow_sem; + bool _to_ui_overflow; }; void @@ -414,11 +414,11 @@ struct IngenPlugin { , argv(NULL) {} - Ingen::Shared::World* world; - MainThread* main; - LV2_URID_Map* map; - int argc; - char** argv; + Ingen::World* world; + MainThread* main; + LV2_URID_Map* map; + int argc; + char** argv; }; static Lib::Patches @@ -465,10 +465,9 @@ ingen_instantiate(const LV2_Descriptor* descriptor, Glib::thread_init(); } - Shared::set_bundle_path(bundle_path); + set_bundle_path(bundle_path); Lib::Patches patches = find_patches( - Glib::filename_to_uri( - Shared::bundle_file_path("manifest.ttl"))); + Glib::filename_to_uri(Ingen::bundle_file_path("manifest.ttl"))); const LV2Patch* patch = NULL; for (Lib::Patches::iterator i = patches.begin(); i != patches.end(); ++i) { @@ -506,7 +505,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, Raul::warn("Warning: No buffer size access, guessing 4096 frames.\n"); } - plugin->world = new Ingen::Shared::World( + plugin->world = new Ingen::World( plugin->argc, plugin->argv, plugin->map, unmap); if (!plugin->world->load_module("serialisation")) { delete plugin->world; @@ -650,7 +649,7 @@ ingen_save(LV2_Handle instance, char* real_path = make_path->path(make_path->handle, "patch.ttl"); char* state_path = map_path->abstract_path(map_path->handle, real_path); - Ingen::Shared::Store::iterator root = plugin->world->store()->find("/"); + Ingen::Store::iterator root = plugin->world->store()->find("/"); plugin->world->serialiser()->to_file(root->second, real_path); store(handle, @@ -731,10 +730,9 @@ LV2Patch::LV2Patch(const std::string& u, const std::string& f) Lib::Lib(const char* bundle_path) { - Ingen::Shared::set_bundle_path(bundle_path); + Ingen::set_bundle_path(bundle_path); patches = find_patches( - Glib::filename_to_uri( - Ingen::Shared::bundle_file_path("manifest.ttl"))); + Glib::filename_to_uri(Ingen::bundle_file_path("manifest.ttl"))); } static void diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 76183e85..85f69442 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -18,7 +18,7 @@ #include <string> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "internals/Controller.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/midi_events.h" @@ -38,7 +38,7 @@ namespace Ingen { namespace Server { namespace Internals { -InternalPlugin* ControllerNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* ControllerNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Controller", "controller"); } @@ -51,7 +51,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, : NodeImpl(plugin, path, false, parent, srate) , _learning(false) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array<PortImpl*>(6); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index 5672d8ab..e4717247 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -52,7 +52,7 @@ public: void learn() { _learning = true; } - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); private: InputPort* _midi_in_port; diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp index d7cbcfb9..9e7f0afd 100644 --- a/src/server/internals/Delay.cpp +++ b/src/server/internals/Delay.cpp @@ -19,7 +19,7 @@ #include <cmath> #include <string> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/Array.hpp" #include "raul/Maid.hpp" #include "raul/log.hpp" @@ -49,7 +49,7 @@ namespace Internals { static const float MAX_DELAY_SECONDS = 8.0f; -InternalPlugin* DelayNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* DelayNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Delay", "delay"); } @@ -65,7 +65,7 @@ DelayNode::DelayNode(InternalPlugin* plugin, , _buffer_mask(0) , _write_phase(0) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array<PortImpl*>(3); const float default_delay = 1.0f; diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp index e9695ecc..4609eaa0 100644 --- a/src/server/internals/Delay.hpp +++ b/src/server/internals/Delay.hpp @@ -48,7 +48,7 @@ public: void process(ProcessContext& context); - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); float delay_samples() const { return _delay_samples; } diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 923b70c0..1292686d 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -17,7 +17,7 @@ #include <cmath> #include <string> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/Array.hpp" #include "raul/Maid.hpp" @@ -45,7 +45,7 @@ namespace Ingen { namespace Server { namespace Internals { -InternalPlugin* NoteNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* NoteNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Note", "note"); } @@ -60,7 +60,7 @@ NoteNode::NoteNode(InternalPlugin* plugin, , _prepared_voices(NULL) , _sustain(false) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array<PortImpl*>(5); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index 591214ce..ed7fd6b0 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -60,7 +60,7 @@ public: void sustain_on(ProcessContext& context, FrameTime time); void sustain_off(ProcessContext& context, FrameTime time); - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); private: /** Key, one for each key on the keyboard */ diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 36f80dd6..699c31f1 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -17,7 +17,7 @@ #include <cmath> #include <string> -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/log.hpp" #include "raul/midi_events.h" @@ -39,7 +39,7 @@ namespace Ingen { namespace Server { namespace Internals { -InternalPlugin* TriggerNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* TriggerNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Trigger", "trigger"); } @@ -52,7 +52,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, : NodeImpl(plugin, path, false, parent, srate) , _learning(false) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array<PortImpl*>(5); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index 5bbae82d..a9a561ee 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -56,7 +56,7 @@ public: void learn() { _learning = true; } - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); private: bool _learning; diff --git a/src/server/mix.cpp b/src/server/mix.cpp index e1e03063..be1a9f9f 100644 --- a/src/server/mix.cpp +++ b/src/server/mix.cpp @@ -16,7 +16,7 @@ #include "lv2/lv2plug.in/ns/ext/atom/util.h" -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/log.hpp" #include "AudioBuffer.hpp" @@ -53,7 +53,7 @@ audio_accumulate(Context& context, AudioBuffer* dst, const AudioBuffer* src) } static inline bool -is_audio(Shared::URIs& uris, LV2_URID type) +is_audio(URIs& uris, LV2_URID type) { return type == uris.atom_Float || type == uris.atom_Sound; } @@ -69,7 +69,7 @@ is_end(const Buffer* buf, LV2_Atom_Event* ev) void mix(Context& context, - Shared::URIs& uris, + URIs& uris, Buffer* dst, const Buffer*const* srcs, uint32_t num_srcs) diff --git a/src/server/mix.hpp b/src/server/mix.hpp index 65dd8de2..320019a0 100644 --- a/src/server/mix.hpp +++ b/src/server/mix.hpp @@ -21,7 +21,7 @@ namespace Ingen { -namespace Shared { class URIs; } +class URIs; namespace Server { @@ -30,7 +30,7 @@ class Buffer; void mix(Context& context, - Shared::URIs& uris, + URIs& uris, Buffer* dst, const Buffer*const* srcs, uint32_t num_srcs); diff --git a/src/server/wscript b/src/server/wscript index fbdf78fa..7f048828 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -57,7 +57,7 @@ def build(bld): name = 'libingen_server', target = 'ingen_server', install_path = '${LIBDIR}', - use = 'libingen_shared') + use = 'libingen') core_libs = 'GLIBMM GTHREAD LV2 LILV RAUL SORD' autowaf.use_lib(bld, obj, core_libs) @@ -69,7 +69,7 @@ def build(bld): name = 'libingen_server_profiled', target = 'ingen_server_profiled', install_path = '${LIBDIR}', - use = 'libingen_shared_profiled', + use = 'libingen_profiled', lib = bld.env['INGEN_TEST_LIBS'], cxxflags = bld.env['INGEN_TEST_CXXFLAGS']) autowaf.use_lib(bld, obj, core_libs) @@ -91,5 +91,5 @@ def build(bld): name = 'libingen_lv2', target = 'ingen_lv2', install_path = '${LV2DIR}/ingen.lv2/', - use = 'libingen_server libingen_shared') + use = 'libingen libingen_server') autowaf.use_lib(bld, obj, core_libs) diff --git a/src/socket/SocketClient.hpp b/src/socket/SocketClient.hpp index a58f92a5..c316e4a4 100644 --- a/src/socket/SocketClient.hpp +++ b/src/socket/SocketClient.hpp @@ -29,7 +29,7 @@ namespace Socket { class SocketClient : public SocketWriter { public: - SocketClient(Shared::World& world, + SocketClient(World& world, const std::string& uri, SharedPtr<Socket> sock, SharedPtr<Interface> respondee) diff --git a/src/socket/SocketListener.cpp b/src/socket/SocketListener.cpp index a2dcaba0..f79c055a 100644 --- a/src/socket/SocketListener.cpp +++ b/src/socket/SocketListener.cpp @@ -21,9 +21,9 @@ #include <string> #include "ingen/Interface.hpp" -#include "ingen/shared/AtomReader.hpp" -#include "ingen/shared/Configuration.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/AtomReader.hpp" +#include "ingen/Configuration.hpp" +#include "ingen/World.hpp" #include "sord/sordmm.hpp" #include "sratom/sratom.h" @@ -37,7 +37,7 @@ namespace Ingen { namespace Socket { -SocketListener::SocketListener(Ingen::Shared::World& world) +SocketListener::SocketListener(Ingen::World& world) : Raul::Thread("SocketListener") , _world(world) , _unix_sock(Socket::UNIX) diff --git a/src/socket/SocketListener.hpp b/src/socket/SocketListener.hpp index e9c27d85..c4700ed4 100644 --- a/src/socket/SocketListener.hpp +++ b/src/socket/SocketListener.hpp @@ -24,24 +24,23 @@ namespace Ingen { class Interface; - -namespace Shared { class World; } +class World; namespace Socket { class SocketListener : public Raul::Thread { public: - explicit SocketListener(Ingen::Shared::World& world); + explicit SocketListener(Ingen::World& world); ~SocketListener(); private: virtual void _run(); - Ingen::Shared::World& _world; - std::string _unix_path; - Socket _unix_sock; - Socket _net_sock; + Ingen::World& _world; + std::string _unix_path; + Socket _unix_sock; + Socket _net_sock; }; } // namespace Ingen diff --git a/src/socket/SocketReader.cpp b/src/socket/SocketReader.cpp index 1a3e5475..9d28b405 100644 --- a/src/socket/SocketReader.cpp +++ b/src/socket/SocketReader.cpp @@ -18,9 +18,9 @@ #include <poll.h> #include "ingen/Interface.hpp" -#include "ingen/shared/AtomReader.hpp" -#include "ingen/shared/URIMap.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/AtomReader.hpp" +#include "ingen/URIMap.hpp" +#include "ingen/World.hpp" #include "sord/sordmm.hpp" #include "sratom/sratom.h" @@ -31,9 +31,9 @@ namespace Ingen { namespace Socket { -SocketReader::SocketReader(Ingen::Shared::World& world, - Interface& iface, - SharedPtr<Socket> sock) +SocketReader::SocketReader(Ingen::World& world, + Interface& iface, + SharedPtr<Socket> sock) : Raul::Thread("SocketReader") , _world(world) , _iface(iface) @@ -132,8 +132,7 @@ SocketReader::_run() serd_reader_start_stream(reader, f, (const uint8_t*)"(socket)", false); // Make an AtomReader to call Ingen Interface methods based on Atom - Shared::AtomReader ar( - _world.uri_map(), _world.uris(), _world.forge(), _iface); + AtomReader ar(_world.uri_map(), _world.uris(), _world.forge(), _iface); struct pollfd pfd; pfd.fd = _socket->fd(); diff --git a/src/socket/SocketReader.hpp b/src/socket/SocketReader.hpp index 5e205186..51435368 100644 --- a/src/socket/SocketReader.hpp +++ b/src/socket/SocketReader.hpp @@ -25,8 +25,7 @@ namespace Ingen { class Interface; - -namespace Shared { class World; } +class World; namespace Socket { @@ -34,7 +33,7 @@ namespace Socket { class SocketReader : public Raul::Thread { public: - SocketReader(Shared::World& world, + SocketReader(World& world, Interface& iface, SharedPtr<Socket> sock); @@ -59,7 +58,7 @@ private: const SerdNode* object_datatype, const SerdNode* object_lang); - Shared::World& _world; + World& _world; Interface& _iface; SerdEnv* _env; SordInserter* _inserter; diff --git a/src/socket/SocketServer.hpp b/src/socket/SocketServer.hpp index 6732ed4e..6bbd792d 100644 --- a/src/socket/SocketServer.hpp +++ b/src/socket/SocketServer.hpp @@ -29,7 +29,7 @@ namespace Socket { class SocketServer : public Server::EventWriter, public SocketReader { public: - SocketServer(Shared::World& world, + SocketServer(World& world, Server::Engine& engine, SharedPtr<Socket> sock) : Server::EventWriter(engine) diff --git a/src/socket/SocketWriter.cpp b/src/socket/SocketWriter.cpp index c375ae16..ae815aea 100644 --- a/src/socket/SocketWriter.cpp +++ b/src/socket/SocketWriter.cpp @@ -18,7 +18,7 @@ #include <sys/types.h> #include <sys/socket.h> -#include "ingen/shared/URIMap.hpp" +#include "ingen/URIMap.hpp" #include "SocketWriter.hpp" @@ -40,8 +40,8 @@ socket_sink(const void* buf, size_t len, void* stream) return ret; } -SocketWriter::SocketWriter(Shared::URIMap& map, - Shared::URIs& uris, +SocketWriter::SocketWriter(URIMap& map, + URIs& uris, const Raul::URI& uri, SharedPtr<Socket> sock) : AtomWriter(map, uris, *this) diff --git a/src/socket/SocketWriter.hpp b/src/socket/SocketWriter.hpp index 2a17d843..cbdb2602 100644 --- a/src/socket/SocketWriter.hpp +++ b/src/socket/SocketWriter.hpp @@ -20,8 +20,8 @@ #include <stdint.h> #include "ingen/Interface.hpp" -#include "ingen/shared/AtomSink.hpp" -#include "ingen/shared/AtomWriter.hpp" +#include "ingen/AtomSink.hpp" +#include "ingen/AtomWriter.hpp" #include "raul/URI.hpp" #include "raul/SharedPtr.hpp" #include "sratom/sratom.h" @@ -33,11 +33,11 @@ namespace Socket { /** An Interface that writes Turtle messages to a socket. */ -class SocketWriter : public Shared::AtomWriter, public Shared::AtomSink +class SocketWriter : public AtomWriter, public AtomSink { public: - SocketWriter(Shared::URIMap& map, - Shared::URIs& uris, + SocketWriter(URIMap& map, + URIs& uris, const Raul::URI& uri, SharedPtr<Socket> sock); @@ -49,7 +49,7 @@ public: Raul::URI uri() const { return _uri; } protected: - Shared::URIMap& _map; + URIMap& _map; Sratom* _sratom; SerdNode _base; SerdURI _base_uri; diff --git a/src/socket/ingen_socket_client.cpp b/src/socket/ingen_socket_client.cpp index b10d598e..8819ea2c 100644 --- a/src/socket/ingen_socket_client.cpp +++ b/src/socket/ingen_socket_client.cpp @@ -16,15 +16,15 @@ #include <string> -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "raul/log.hpp" #include "Socket.hpp" #include "SocketClient.hpp" static SharedPtr<Ingen::Interface> -new_socket_interface(Ingen::Shared::World* world, +new_socket_interface(Ingen::World* world, const std::string& url, SharedPtr<Ingen::Interface> respondee) { @@ -41,8 +41,8 @@ new_socket_interface(Ingen::Shared::World* world, return SharedPtr<Ingen::Interface>(client); } -struct IngenSocketClientModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenSocketClientModule : public Ingen::Module { + void load(Ingen::World* world) { world->add_interface_factory("unix", &new_socket_interface); world->add_interface_factory("tcp", &new_socket_interface); } @@ -50,7 +50,7 @@ struct IngenSocketClientModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenSocketClientModule(); diff --git a/src/socket/ingen_socket_server.cpp b/src/socket/ingen_socket_server.cpp index 5bf679bb..aa13eebd 100644 --- a/src/socket/ingen_socket_server.cpp +++ b/src/socket/ingen_socket_server.cpp @@ -16,8 +16,8 @@ #include "raul/log.hpp" -#include "ingen/shared/Module.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/Module.hpp" +#include "ingen/World.hpp" #include "../server/Engine.hpp" #include "../server/EventWriter.hpp" @@ -26,8 +26,8 @@ using namespace Ingen; -struct IngenSocketServerModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenSocketServerModule : public Ingen::Module { + void load(Ingen::World* world) { listener = SharedPtr<Ingen::Socket::SocketListener>( new Ingen::Socket::SocketListener(*world)); } @@ -37,7 +37,7 @@ struct IngenSocketServerModule : public Ingen::Shared::Module { extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenSocketServerModule(); diff --git a/src/shared/wscript b/src/wscript index 8a873653..243e9fa2 100644 --- a/src/shared/wscript +++ b/src/wscript @@ -9,6 +9,7 @@ sources = [ 'Configuration.cpp', 'Forge.cpp', 'LV2Features.cpp', + 'Resource.cpp', 'Store.cpp', 'URIMap.cpp', 'URIs.cpp', @@ -19,11 +20,10 @@ sources = [ def build(bld): obj = bld(features = 'cxx cxxshlib', source = sources, - export_includes = ['../..'], - includes = ['../..'], - name = 'libingen_shared', - target = 'ingen_shared', - use = 'libingen', + export_includes = ['..'], + includes = ['..'], + name = 'libingen', + target = 'ingen', vnum = '0.0.0', install_path = '${LIBDIR}', lib = ['dl']) @@ -32,11 +32,10 @@ def build(bld): if bld.env['BUILD_TESTS']: obj = bld(features = 'cxx cxxshlib', source = sources, - export_includes = ['../..'], - includes = ['../..'], - name = 'libingen_shared_profiled', - target = 'ingen_shared_profiled', - use = 'libingen', + export_includes = ['..'], + includes = ['..'], + name = 'libingen_profiled', + target = 'ingen_profiled', install_path = '', lib = ['dl'] + bld.env['INGEN_TEST_LIBS'], cxxflags = bld.env['INGEN_TEST_CXXFLAGS']) |