diff options
Diffstat (limited to 'src/server')
59 files changed, 226 insertions, 244 deletions
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) |