diff options
Diffstat (limited to 'src/server')
119 files changed, 697 insertions, 697 deletions
diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp index a4889890..b92f817d 100644 --- a/src/server/ArcImpl.cpp +++ b/src/server/ArcImpl.cpp @@ -26,8 +26,8 @@ #include "OutputPort.hpp" #include "PortImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Constructor for an arc from a block's output port. * @@ -80,7 +80,7 @@ ArcImpl::must_mix() const bool ArcImpl::can_connect(const PortImpl* src, const InputPort* dst) { - const Ingen::URIs& uris = src->bufs().uris(); + const ingen::URIs& uris = src->bufs().uris(); return ( // (Audio | Control | CV) => (Audio | Control | CV) ( (src->is_a(PortType::ID::CONTROL) || @@ -110,5 +110,5 @@ ArcImpl::can_connect(const PortImpl* src, const InputPort* dst) || (src->supports(uris.atom_Sound) && dst->is_a(PortType::ID::AUDIO))); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp index c907a424..e42571d0 100644 --- a/src/server/ArcImpl.hpp +++ b/src/server/ArcImpl.hpp @@ -28,8 +28,8 @@ #include "BufferRef.hpp" #include "RunContext.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class PortImpl; class InputPort; @@ -78,7 +78,7 @@ protected: PortImpl* const _head; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_ARC_IMPL_HPP diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp index 7dcfd6af..de983df6 100644 --- a/src/server/BlockFactory.cpp +++ b/src/server/BlockFactory.cpp @@ -32,12 +32,12 @@ #include "LV2Plugin.hpp" #include "ThreadManager.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { -using namespace Internals; +using namespace internals; -BlockFactory::BlockFactory(Ingen::World* world) +BlockFactory::BlockFactory(ingen::World* world) : _world(world) , _has_loaded(false) { @@ -109,7 +109,7 @@ BlockFactory::plugin(const URI& uri) void BlockFactory::load_internal_plugins() { - Ingen::URIs& uris = _world->uris(); + ingen::URIs& uris = _world->uris(); InternalPlugin* block_delay_plug = BlockDelayNode::internal_plugin(uris); _plugins.emplace(block_delay_plug->uri(), block_delay_plug); @@ -225,5 +225,5 @@ BlockFactory::load_lv2_plugins() _world->log().info(fmt("Loaded %1% plugins\n") % _plugins.size()); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp index 25885f75..47309f69 100644 --- a/src/server/BlockFactory.hpp +++ b/src/server/BlockFactory.hpp @@ -24,8 +24,8 @@ #include "ingen/types.hpp" #include "raul/Noncopyable.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class PluginImpl; @@ -36,7 +36,7 @@ class PluginImpl; class BlockFactory : public Raul::Noncopyable { public: - explicit BlockFactory(Ingen::World* world); + explicit BlockFactory(ingen::World* world); ~BlockFactory(); /** Reload plugin list. @@ -57,11 +57,11 @@ private: void load_internal_plugins(); Plugins _plugins; - Ingen::World* _world; + ingen::World* _world; bool _has_loaded; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BLOCKFACTORY_HPP diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp index e95645f9..17462ab4 100644 --- a/src/server/BlockImpl.cpp +++ b/src/server/BlockImpl.cpp @@ -28,8 +28,8 @@ #include "RunContext.hpp" #include "ThreadManager.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { BlockImpl::BlockImpl(PluginImpl* plugin, const Raul::Symbol& symbol, @@ -299,5 +299,5 @@ BlockImpl::set_port_buffer(uint32_t voice, << " buffer " << buf << " offset " << offset << std::endl;*/ } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index d663e319..fe20c1ec 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -37,8 +37,8 @@ namespace Raul { class Maid; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Buffer; class BufferFactory; @@ -201,7 +201,7 @@ protected: bool _enabled; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BLOCKIMPL_HPP diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp index 00fefddd..f8b58beb 100644 --- a/src/server/Broadcaster.cpp +++ b/src/server/Broadcaster.cpp @@ -22,8 +22,8 @@ #include "PluginImpl.hpp" #include "BlockFactory.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { Broadcaster::Broadcaster() : _must_broadcast(false) @@ -93,5 +93,5 @@ Broadcaster::send_plugins_to(Interface* client, client->bundle_end(); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index 3981b265..1d5dd16e 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -28,8 +28,8 @@ #include "BlockFactory.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Broadcaster for all clients. * @@ -112,7 +112,7 @@ private: SPtr<Interface> _ignore_client; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BROADCASTER_HPP diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp index 023de393..eef594a3 100644 --- a/src/server/Buffer.cpp +++ b/src/server/Buffer.cpp @@ -37,8 +37,8 @@ #include "Engine.hpp" #include "RunContext.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { Buffer::Buffer(BufferFactory& bufs, LV2_URID type, @@ -464,5 +464,5 @@ intrusive_ptr_release(Buffer* b) b->deref(); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp index 8d1f29ae..d9b4e7ad 100644 --- a/src/server/Buffer.hpp +++ b/src/server/Buffer.hpp @@ -30,8 +30,8 @@ #include "PortType.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BufferFactory; class Engine; @@ -238,7 +238,7 @@ private: bool _external; ///< Buffer is externally allocated }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BUFFER_HPP diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index d5d947d0..c9eeed49 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -22,8 +22,8 @@ #include "BufferFactory.hpp" #include "Engine.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { BufferFactory::BufferFactory(Engine& engine, URIs& uris) : _free_audio(nullptr) @@ -186,5 +186,5 @@ BufferFactory::recycle(Buffer* buf) } while (!head_ptr.compare_exchange_weak(try_head, buf)); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp index 8265fc98..e8f05864 100644 --- a/src/server/BufferFactory.hpp +++ b/src/server/BufferFactory.hpp @@ -34,11 +34,11 @@ namespace Raul { class Maid; } -namespace Ingen { +namespace ingen { class URIs; -namespace Server { +namespace server { class Engine; @@ -112,7 +112,7 @@ private: BufferRef _silent_buffer; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BUFFERFACTORY_HPP diff --git a/src/server/BufferRef.hpp b/src/server/BufferRef.hpp index 2a1cbc27..f3a2ef5c 100644 --- a/src/server/BufferRef.hpp +++ b/src/server/BufferRef.hpp @@ -21,8 +21,8 @@ #include "ingen/ingen.h" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Buffer; @@ -32,7 +32,7 @@ typedef boost::intrusive_ptr<Buffer> BufferRef; INGEN_API void intrusive_ptr_add_ref(Buffer* b); INGEN_API void intrusive_ptr_release(Buffer* b); -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BUFFER_REF_HPP diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp index 60dd02e3..3273c399 100644 --- a/src/server/ClientUpdate.cpp +++ b/src/server/ClientUpdate.cpp @@ -23,8 +23,8 @@ #include "GraphImpl.hpp" #include "PortImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { void ClientUpdate::put(const URI& uri, @@ -151,5 +151,5 @@ ClientUpdate::send(Interface& dest) } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/ClientUpdate.hpp b/src/server/ClientUpdate.hpp index f1a361f7..514997a1 100644 --- a/src/server/ClientUpdate.hpp +++ b/src/server/ClientUpdate.hpp @@ -23,12 +23,12 @@ #include "ingen/Resource.hpp" #include "raul/Path.hpp" -namespace Ingen { +namespace ingen { class Interface; class URIs; -namespace Server { +namespace server { class PortImpl; class BlockImpl; @@ -74,7 +74,7 @@ struct ClientUpdate { std::vector<Connect> connects; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_CLIENTUPDATE_HPP diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index 35b07935..67752340 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -26,8 +26,8 @@ #include "GraphImpl.hpp" #include "ThreadManager.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Graph contains ambiguous feedback with no delay nodes. */ class FeedbackException : public std::exception { @@ -270,5 +270,5 @@ CompiledGraph::dump(const std::string& name) const sink(")\n"); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp index 6b802611..664fea85 100644 --- a/src/server/CompiledGraph.hpp +++ b/src/server/CompiledGraph.hpp @@ -27,8 +27,8 @@ #include "Task.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class GraphImpl; @@ -78,7 +78,7 @@ inline MPtr<CompiledGraph> compile(Raul::Maid& maid, GraphImpl& graph) return CompiledGraph::compile(maid, graph); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_COMPILEDGRAPH_HPP diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 24503155..45df0e8f 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -30,8 +30,8 @@ #include "RunContext.hpp" #include "ThreadManager.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { ControlBindings::ControlBindings(Engine& engine) : _engine(engine) @@ -56,7 +56,7 @@ ControlBindings::Key ControlBindings::port_binding(PortImpl* port) const { ThreadManager::assert_thread(THREAD_PRE_PROCESS); - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); const Atom& binding = port->get_property(uris.midi_binding); return binding_key(binding); } @@ -64,7 +64,7 @@ ControlBindings::port_binding(PortImpl* port) const ControlBindings::Key ControlBindings::binding_key(const Atom& binding) const { - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); Key key; LV2_Atom* num = nullptr; if (binding.type() == uris.atom_Object) { @@ -145,8 +145,8 @@ ControlBindings::port_value_changed(RunContext& ctx, Key key, const Atom& value_atom) { - Ingen::World* world = ctx.engine().world(); - const Ingen::URIs& uris = world->uris(); + ingen::World* world = ctx.engine().world(); + const ingen::URIs& uris = world->uris(); if (!!key) { int16_t value = port_value_to_control( ctx, port, key.type, value_atom); @@ -338,7 +338,7 @@ ControlBindings::set_port_value(RunContext& context, bool ControlBindings::finish_learn(RunContext& context, Key key) { - const Ingen::URIs& uris = context.engine().world()->uris(); + const ingen::URIs& uris = context.engine().world()->uris(); Binding* binding = _learn_binding.exchange(nullptr); if (!binding || (key.type == Type::MIDI_NOTE && !binding->port->is_toggled())) { return false; @@ -384,8 +384,8 @@ void ControlBindings::pre_process(RunContext& ctx, Buffer* buffer) { uint16_t value = 0; - Ingen::World* world = ctx.engine().world(); - const Ingen::URIs& uris = world->uris(); + ingen::World* world = ctx.engine().world(); + const ingen::URIs& uris = world->uris(); _feedback->clear(); if ((!_learn_binding && _bindings->empty()) || !buffer->get<LV2_Atom>()) { @@ -421,5 +421,5 @@ ControlBindings::post_process(RunContext& context, Buffer* buffer) } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp index ad5aa7bd..ea170f81 100644 --- a/src/server/ControlBindings.hpp +++ b/src/server/ControlBindings.hpp @@ -32,8 +32,8 @@ #include "BufferFactory.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; class RunContext; @@ -142,7 +142,7 @@ private: LV2_Atom_Forge _forge; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_CONTROLBINDINGS_HPP diff --git a/src/server/DirectDriver.hpp b/src/server/DirectDriver.hpp index 58b4f898..27ae322c 100644 --- a/src/server/DirectDriver.hpp +++ b/src/server/DirectDriver.hpp @@ -22,8 +22,8 @@ #include "Driver.hpp" #include "Engine.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Driver for running Ingen directly as a library. * \ingroup engine @@ -102,7 +102,7 @@ private: size_t _seq_size; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_DIRECT_DRIVER_HPP diff --git a/src/server/Driver.hpp b/src/server/Driver.hpp index 9ae4b836..dbb67bf3 100644 --- a/src/server/Driver.hpp +++ b/src/server/Driver.hpp @@ -24,8 +24,8 @@ namespace Raul { class Path; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class DuplexPort; class EnginePort; @@ -104,7 +104,7 @@ public: virtual int real_time_priority() = 0; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_DRIVER_HPP diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index 1b62ff38..2823da05 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -22,8 +22,8 @@ #include "Engine.hpp" #include "GraphImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { DuplexPort::DuplexPort(BufferFactory& bufs, GraphImpl* parent, @@ -232,5 +232,5 @@ DuplexPort::next_value_offset(SampleCount offset, SampleCount end) const return PortImpl::next_value_offset(offset, end); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/DuplexPort.hpp b/src/server/DuplexPort.hpp index b0066164..db97e7fb 100644 --- a/src/server/DuplexPort.hpp +++ b/src/server/DuplexPort.hpp @@ -22,8 +22,8 @@ #include "BufferRef.hpp" #include "InputPort.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; @@ -92,7 +92,7 @@ public: SampleCount next_value_offset(SampleCount offset, SampleCount end) const; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_DUPLEXPORT_HPP diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index dd87500e..b880abf7 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -58,13 +58,13 @@ #include "SocketListener.hpp" #endif -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { INGEN_THREAD_LOCAL unsigned ThreadManager::flags(0); bool ThreadManager::single_threaded(true); -Engine::Engine(Ingen::World* world) +Engine::Engine(ingen::World* world) : _world(world) , _options(new LV2Options(world->uris())) , _buffer_factory(new BufferFactory(*this, world->uris())) @@ -92,7 +92,7 @@ Engine::Engine(Ingen::World* world) , _activated(false) { if (!world->store()) { - world->set_store(SPtr<Ingen::Store>(new Store())); + world->set_store(SPtr<ingen::Store>(new Store())); } for (int i = 0; i < world->conf().option("threads").get<int32_t>(); ++i) { @@ -167,7 +167,7 @@ Engine::~Engine() store->clear(); } - _world->set_store(SPtr<Ingen::Store>()); + _world->set_store(SPtr<ingen::Store>()); } void @@ -310,7 +310,7 @@ Engine::quit() Properties Engine::load_properties() const { - const Ingen::URIs& uris = world()->uris(); + const ingen::URIs& uris = world()->uris(); return { { uris.ingen_meanRunLoad, uris.forge.make(floorf(_run_load.mean) / 100.0f) }, @@ -392,7 +392,7 @@ Engine::activate() ThreadManager::single_threaded = true; - const Ingen::URIs& uris = world()->uris(); + const ingen::URIs& uris = world()->uris(); if (!_root_graph) { // No root graph has been loaded, create an empty one @@ -403,7 +403,7 @@ Engine::activate() Resource::Graph::INTERNAL)}}; enqueue_event( - new Events::CreateGraph( + new events::CreateGraph( *this, SPtr<Interface>(), -1, 0, Raul::Path("/"), properties)); flush_events(std::chrono::milliseconds(10)); @@ -522,5 +522,5 @@ Engine::unregister_client(SPtr<Interface> client) return _broadcaster->unregister_client(client); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index f5ba1feb..9a6534fc 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -36,7 +36,7 @@ class Maid; class RingBuffer; } -namespace Ingen { +namespace ingen { class AtomReader; class Interface; @@ -44,7 +44,7 @@ class Log; class Store; class World; -namespace Server { +namespace server { class BlockFactory; class Broadcaster; @@ -67,14 +67,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::World. + it can be accessed via the ingen::World. @ingroup engine */ class INGEN_API Engine : public EngineBase { public: - explicit Engine(Ingen::World* world); + explicit Engine(ingen::World* world); virtual ~Engine(); Engine(const Engine&) = delete; @@ -129,7 +129,7 @@ public: /** Process all events (no RT limits). */ unsigned process_all_events(); - Ingen::World* world() const { return _world; } + ingen::World* world() const { return _world; } Log& log() const; const SPtr<Interface>& interface() const { return _interface; } @@ -176,7 +176,7 @@ public: Properties load_properties() const; private: - Ingen::World* _world; + ingen::World* _world; SPtr<LV2Options> _options; UPtr<BufferFactory> _buffer_factory; @@ -215,7 +215,7 @@ private: bool _activated; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_ENGINE_HPP diff --git a/src/server/EnginePort.hpp b/src/server/EnginePort.hpp index c14f363c..294bf45a 100644 --- a/src/server/EnginePort.hpp +++ b/src/server/EnginePort.hpp @@ -24,8 +24,8 @@ #include "DuplexPort.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** A "system" port (e.g. a Jack port, an external port on Ingen). * @@ -60,7 +60,7 @@ protected: uint32_t _driver_index; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_ENGINE_PORT_HPP diff --git a/src/server/Event.hpp b/src/server/Event.hpp index d9095def..9cd97a35 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -30,8 +30,8 @@ #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; class RunContext; @@ -157,7 +157,7 @@ protected: Mode _mode; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_EVENT_HPP diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp index ebdf7562..695be88e 100644 --- a/src/server/EventWriter.cpp +++ b/src/server/EventWriter.cpp @@ -22,8 +22,8 @@ #include "EventWriter.hpp" #include "events.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { EventWriter::EventWriter(Engine& engine) : _engine(engine) @@ -46,56 +46,56 @@ EventWriter::message(const Message& msg) void EventWriter::operator()(const BundleBegin& msg) { - _engine.enqueue_event(new Events::Mark(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Mark(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const BundleEnd& msg) { - _engine.enqueue_event(new Events::Mark(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Mark(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Put& msg) { - _engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Delta(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Delta& msg) { - _engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Delta(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Copy& msg) { - _engine.enqueue_event(new Events::Copy(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Copy(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Move& msg) { - _engine.enqueue_event(new Events::Move(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Move(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Del& msg) { - _engine.enqueue_event(new Events::Delete(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Delete(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Connect& msg) { - _engine.enqueue_event(new Events::Connect(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Connect(_engine, _respondee, now(), msg), _event_mode); } @@ -103,7 +103,7 @@ void EventWriter::operator()(const Disconnect& msg) { _engine.enqueue_event( - new Events::Disconnect(_engine, _respondee, now(), msg), + new events::Disconnect(_engine, _respondee, now(), msg), _event_mode); } @@ -111,37 +111,37 @@ void EventWriter::operator()(const DisconnectAll& msg) { _engine.enqueue_event( - new Events::DisconnectAll(_engine, _respondee, now(), msg), + new events::DisconnectAll(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const SetProperty& msg) { - _engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Delta(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Undo& msg) { - _engine.enqueue_event(new Events::Undo(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Undo(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Redo& msg) { - _engine.enqueue_event(new Events::Undo(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Undo(_engine, _respondee, now(), msg), _event_mode); } void EventWriter::operator()(const Get& msg) { - _engine.enqueue_event(new Events::Get(_engine, _respondee, now(), msg), + _engine.enqueue_event(new events::Get(_engine, _respondee, now(), msg), _event_mode); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp index 2d4b9724..aad15a76 100644 --- a/src/server/EventWriter.hpp +++ b/src/server/EventWriter.hpp @@ -27,8 +27,8 @@ #include "Event.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; @@ -80,7 +80,7 @@ private: SampleCount now() const; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_EVENTWRITER_HPP diff --git a/src/server/FrameTimer.hpp b/src/server/FrameTimer.hpp index 367ac900..57acbaa5 100644 --- a/src/server/FrameTimer.hpp +++ b/src/server/FrameTimer.hpp @@ -21,8 +21,8 @@ #include <cmath> #include <cstdint> -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Delay-locked loop for monotonic sample time. * @@ -104,7 +104,7 @@ private: bool initialized; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_FRAMETIMER_HPP diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index f9c4cb54..ae9b8f6e 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -32,8 +32,8 @@ #include "PortImpl.hpp" #include "ThreadManager.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { GraphImpl::GraphImpl(Engine& engine, const Raul::Symbol& symbol, @@ -375,5 +375,5 @@ GraphImpl::build_ports_array(Raul::Maid& maid) return result; } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp index 3f11a84a..d0dd8b7d 100644 --- a/src/server/GraphImpl.hpp +++ b/src/server/GraphImpl.hpp @@ -28,11 +28,11 @@ #include "PortType.hpp" #include "ThreadManager.hpp" -namespace Ingen { +namespace ingen { class Arc; -namespace Server { +namespace server { class ArcImpl; class CompiledGraph; @@ -194,7 +194,7 @@ private: bool _process; ///< True iff graph is enabled }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_GRAPHIMPL_HPP diff --git a/src/server/GraphPlugin.hpp b/src/server/GraphPlugin.hpp index 308ed91a..ae59b986 100644 --- a/src/server/GraphPlugin.hpp +++ b/src/server/GraphPlugin.hpp @@ -20,8 +20,8 @@ #include <string> #include "PluginImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; @@ -57,7 +57,7 @@ private: const std::string _name; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_GRAPHPLUGIN_HPP diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 2f22491f..a9ff1738 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -30,8 +30,8 @@ #include "RunContext.hpp" #include "mix.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { InputPort::InputPort(BufferFactory& bufs, BlockImpl* parent, @@ -45,7 +45,7 @@ InputPort::InputPort(BufferFactory& bufs, : PortImpl(bufs, parent, symbol, index, poly, type, buffer_type, value, buffer_size, false) , _num_arcs(0) { - const Ingen::URIs& uris = bufs.uris(); + const ingen::URIs& uris = bufs.uris(); if (parent->graph_type() != Node::GraphType::GRAPH) { add_property(uris.rdf_type, uris.lv2_InputPort.urid); @@ -257,5 +257,5 @@ InputPort::direct_connect() const && buffer(0)->type() != _bufs.uris().atom_Sequence; } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp index 708f7ea2..92756b57 100644 --- a/src/server/InputPort.hpp +++ b/src/server/InputPort.hpp @@ -27,8 +27,8 @@ #include "ArcImpl.hpp" #include "PortImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class ArcImpl; class BlockImpl; @@ -122,7 +122,7 @@ protected: Arcs _arcs; ///< Audio thread }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_INPUTPORT_HPP diff --git a/src/server/InternalBlock.cpp b/src/server/InternalBlock.cpp index 3d8f7390..04cb32dc 100644 --- a/src/server/InternalBlock.cpp +++ b/src/server/InternalBlock.cpp @@ -20,8 +20,8 @@ #include "InternalPlugin.hpp" #include "PortImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { InternalBlock::InternalBlock(PluginImpl* plugin, const Raul::Symbol& symbol, @@ -69,5 +69,5 @@ InternalBlock::pre_process(RunContext& context) } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/InternalBlock.hpp b/src/server/InternalBlock.hpp index a57bd89f..5b3270c3 100644 --- a/src/server/InternalBlock.hpp +++ b/src/server/InternalBlock.hpp @@ -19,8 +19,8 @@ #include "BlockImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** An internal Block implemented inside Ingen. * @@ -42,7 +42,7 @@ public: virtual void pre_process(RunContext& context); }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_BLOCKIMPL_HPP diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index 6529b9c0..49590b24 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -24,10 +24,10 @@ #include "Engine.hpp" #include "InternalPlugin.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { -using namespace Internals; +using namespace internals; InternalPlugin::InternalPlugin(URIs& uris, const URI& uri, @@ -63,5 +63,5 @@ InternalPlugin::instantiate(BufferFactory& bufs, } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp index 79309beb..403db02e 100644 --- a/src/server/InternalPlugin.hpp +++ b/src/server/InternalPlugin.hpp @@ -23,8 +23,8 @@ #define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class BufferFactory; @@ -51,7 +51,7 @@ private: const Raul::Symbol _symbol; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_INTERNALPLUGIN_HPP diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 9e95b796..a331811e 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -49,8 +49,8 @@ typedef jack_default_audio_sample_t jack_sample_t; -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { JackDriver::JackDriver(Engine& engine) : _engine(engine) @@ -580,5 +580,5 @@ JackDriver::_session_cb(jack_session_event_t* event) } #endif -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index b2871fa6..fcda8edd 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -38,8 +38,8 @@ namespace Raul { class Path; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class DuplexPort; class Engine; @@ -163,7 +163,7 @@ protected: bool _old_rolling; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_JACKAUDIODRIVER_HPP diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index 9ebf7dcf..c2b8e973 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -45,8 +45,8 @@ #include "RunContext.hpp" #include "Worker.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Partially construct a LV2Block. * @@ -217,10 +217,10 @@ LV2Block::apply_poly(RunContext& context, uint32_t poly) bool LV2Block::instantiate(BufferFactory& bufs, const LilvState* state) { - const Ingen::URIs& uris = bufs.uris(); - Ingen::World* world = bufs.engine().world(); + const ingen::URIs& uris = bufs.uris(); + ingen::World* world = bufs.engine().world(); const LilvPlugin* plug = _lv2_plugin->lilv_plugin(); - Ingen::Forge& forge = bufs.forge(); + ingen::Forge& forge = bufs.forge(); const uint32_t num_ports = lilv_plugin_get_num_ports(plug); LilvNode* lv2_connectionOptional = lilv_new_uri( @@ -738,5 +738,5 @@ LV2Block::set_port_buffer(uint32_t voice, buf ? buf->port_data(_ports->at(port_num)->type(), offset) : nullptr); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index c9bbabf3..27287c5e 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -28,8 +28,8 @@ #include "ingen/LV2Features.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class LV2Plugin; @@ -146,7 +146,7 @@ protected: SPtr<LV2Features::FeatureArray> _features; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_LV2BLOCK_HPP diff --git a/src/server/LV2Options.hpp b/src/server/LV2Options.hpp index 75dbd41e..f5f18f3d 100644 --- a/src/server/LV2Options.hpp +++ b/src/server/LV2Options.hpp @@ -21,10 +21,10 @@ #include "ingen/URIs.hpp" #include "lv2/options/options.h" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { -class LV2Options : public Ingen::LV2Features::Feature { +class LV2Options : public ingen::LV2Features::Feature { public: explicit LV2Options(const URIs& uris) : _uris(uris) @@ -65,7 +65,7 @@ private: int32_t _seq_size; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_LV2OPTIONS_HPP diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index bc10755a..4b97e9f1 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -26,8 +26,8 @@ #include "LV2Block.hpp" #include "LV2Plugin.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { LV2Plugin::LV2Plugin(World* world, const LilvPlugin* lplugin) : PluginImpl(world->uris(), @@ -139,5 +139,5 @@ LV2Plugin::load_presets() PluginImpl::load_presets(); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp index 43d0fba9..9608b4e5 100644 --- a/src/server/LV2Plugin.hpp +++ b/src/server/LV2Plugin.hpp @@ -24,11 +24,11 @@ #include "PluginImpl.hpp" -namespace Ingen { +namespace ingen { class World; -namespace Server { +namespace server { class GraphImpl; class BlockImpl; @@ -66,7 +66,7 @@ private: const LilvPlugin* _lilv_plugin; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_LV2PLUGIN_HPP diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp index 8ef84896..4d7dd1f8 100644 --- a/src/server/LV2ResizeFeature.hpp +++ b/src/server/LV2ResizeFeature.hpp @@ -24,10 +24,10 @@ #include "Buffer.hpp" #include "PortImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { -struct ResizeFeature : public Ingen::LV2Features::Feature { +struct ResizeFeature : public ingen::LV2Features::Feature { static LV2_Resize_Port_Status resize_port( LV2_Resize_Port_Feature_Data data, uint32_t index, @@ -59,7 +59,7 @@ struct ResizeFeature : public Ingen::LV2Features::Feature { } }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_LV2RESIZEFEATURE_HPP diff --git a/src/server/Load.hpp b/src/server/Load.hpp index ed9ee406..b94a8fed 100644 --- a/src/server/Load.hpp +++ b/src/server/Load.hpp @@ -17,8 +17,8 @@ #ifndef INGEN_ENGINE_LOAD_HPP #define INGEN_ENGINE_LOAD_HPP -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { struct Load { @@ -51,7 +51,7 @@ struct Load bool changed = false; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_LOAD_HPP diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp index 778ba15a..a28d7baf 100644 --- a/src/server/NodeImpl.cpp +++ b/src/server/NodeImpl.cpp @@ -18,10 +18,10 @@ #include "NodeImpl.hpp" #include "ThreadManager.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { -NodeImpl::NodeImpl(const Ingen::URIs& uris, +NodeImpl::NodeImpl(const ingen::URIs& uris, NodeImpl* parent, const Raul::Symbol& symbol) : Node(uris, parent ? parent->path().child(symbol) : Raul::Path("/")) @@ -46,5 +46,5 @@ NodeImpl::parent_graph() const return dynamic_cast<GraphImpl*>((BlockImpl*)_parent); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp index 614801eb..9a9f1c95 100644 --- a/src/server/NodeImpl.hpp +++ b/src/server/NodeImpl.hpp @@ -28,11 +28,11 @@ namespace Raul { class Maid; } -namespace Ingen { +namespace ingen { -namespace Shared { class URIs; } +class URIs; -namespace Server { +namespace server { class BufferFactory; class GraphImpl; @@ -94,7 +94,7 @@ public: bool is_main() const { return !_parent; } protected: - NodeImpl(const Ingen::URIs& uris, + NodeImpl(const ingen::URIs& uris, NodeImpl* parent, const Raul::Symbol& symbol); @@ -103,7 +103,7 @@ protected: Raul::Symbol _symbol; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_NODEIMPL_HPP diff --git a/src/server/OutputPort.hpp b/src/server/OutputPort.hpp index 1058defb..0437c367 100644 --- a/src/server/OutputPort.hpp +++ b/src/server/OutputPort.hpp @@ -19,8 +19,8 @@ #include "PortImpl.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** An output port. * @@ -45,7 +45,7 @@ public: {} }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_OUTPUTPORT_HPP diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp index ebd4b3e5..fd1fcc66 100644 --- a/src/server/PluginImpl.hpp +++ b/src/server/PluginImpl.hpp @@ -22,11 +22,11 @@ #include "ingen/Resource.hpp" #include "raul/Symbol.hpp" -namespace Ingen { +namespace ingen { class URIs; -namespace Server { +namespace server { class BlockImpl; class BufferFactory; @@ -40,7 +40,7 @@ class GraphImpl; class PluginImpl : public Resource { public: - PluginImpl(Ingen::URIs& uris, const Atom& type, const URI& uri) + PluginImpl(ingen::URIs& uris, const Atom& type, const URI& uri) : Resource(uris, uri) , _type(type) , _presets_loaded(false) @@ -90,7 +90,7 @@ private: PluginImpl& operator=(const PluginImpl&) = delete; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_PLUGINIMPL_HPP diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp index 56be43e8..f67a62bb 100644 --- a/src/server/PortAudioDriver.cpp +++ b/src/server/PortAudioDriver.cpp @@ -38,8 +38,8 @@ #include "ThreadManager.hpp" #include "util.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { static bool pa_error(const char* msg, PaError err) @@ -293,5 +293,5 @@ PortAudioDriver::process_cb(const void* inputs, return 0; } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp index 127fe5f3..21a81180 100644 --- a/src/server/PortAudioDriver.hpp +++ b/src/server/PortAudioDriver.hpp @@ -34,8 +34,8 @@ namespace Raul { class Path; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class DuplexPort; class Engine; @@ -126,7 +126,7 @@ protected: bool _is_activated; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_PORTAUDIODRIVER_HPP diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index 355774dd..f03939d3 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -28,8 +28,8 @@ #include "PortType.hpp" #include "ThreadManager.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { static const uint32_t monitor_rate = 25.0; // Hz @@ -79,7 +79,7 @@ PortImpl::PortImpl(BufferFactory& bufs, assert(block != nullptr); assert(_poly > 0); - const Ingen::URIs& uris = bufs.uris(); + const ingen::URIs& uris = bufs.uris(); set_type(type, buffer_type); @@ -128,8 +128,8 @@ PortImpl::setup_buffers(RunContext& ctx, BufferFactory& bufs, uint32_t poly) void PortImpl::set_type(PortType port_type, LV2_URID buffer_type) { - const Ingen::URIs& uris = _bufs.uris(); - Ingen::World* world = _bufs.engine().world(); + const ingen::URIs& uris = _bufs.uris(); + ingen::World* world = _bufs.engine().world(); // Update type properties so clients are aware of current type remove_property(uris.rdf_type, uris.lv2_AudioPort); @@ -565,5 +565,5 @@ PortImpl::post_process(RunContext& context) monitor(context); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 70d90d0a..9afcca53 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -30,8 +30,8 @@ namespace Raul { class Maid; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class BufferFactory; @@ -306,7 +306,7 @@ protected: bool _is_output; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_PORTIMPL_HPP diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp index 710c5aa0..d5fd0238 100644 --- a/src/server/PortType.hpp +++ b/src/server/PortType.hpp @@ -22,7 +22,7 @@ #include "lv2/atom/atom.h" #include "lv2/core/lv2.h" -namespace Ingen { +namespace ingen { /** The type of a port. * @@ -86,6 +86,6 @@ private: ID _id; }; -} // namespace Ingen +} // namespace ingen #endif // INGEN_INTERFACE_PORTTYPE_HPP diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp index b275c36a..e644734b 100644 --- a/src/server/PostProcessor.cpp +++ b/src/server/PostProcessor.cpp @@ -21,8 +21,8 @@ #include "PostProcessor.hpp" #include "RunContext.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Sentinel : public Event { public: @@ -110,5 +110,5 @@ PostProcessor::process() _engine.emit_notifications(end_time); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/PostProcessor.hpp b/src/server/PostProcessor.hpp index 5a3ffa62..affb343f 100644 --- a/src/server/PostProcessor.hpp +++ b/src/server/PostProcessor.hpp @@ -23,8 +23,8 @@ #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; class Event; @@ -68,7 +68,7 @@ private: std::atomic<FrameTime> _max_time; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_POSTPROCESSOR_HPP diff --git a/src/server/PreProcessContext.hpp b/src/server/PreProcessContext.hpp index 1b57c013..1cfa1931 100644 --- a/src/server/PreProcessContext.hpp +++ b/src/server/PreProcessContext.hpp @@ -23,8 +23,8 @@ namespace Raul { class Maid; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Event pre-processing context. * @@ -78,7 +78,7 @@ private: bool _in_bundle = false; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_PREPROCESSCONTEXT_HPP diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp index f674284e..a9d9cf2d 100644 --- a/src/server/PreProcessor.cpp +++ b/src/server/PreProcessor.cpp @@ -30,8 +30,8 @@ #include "ThreadManager.hpp" #include "UndoStack.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { PreProcessor::PreProcessor(Engine& engine) : _engine(engine) @@ -244,5 +244,5 @@ PreProcessor::run() } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp index eb72328e..9ee20255 100644 --- a/src/server/PreProcessor.hpp +++ b/src/server/PreProcessor.hpp @@ -23,8 +23,8 @@ #include "raul/Semaphore.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; class Event; @@ -81,7 +81,7 @@ private: std::thread _thread; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_PREPROCESSOR_HPP diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp index 3ab9d15c..ee272d46 100644 --- a/src/server/RunContext.cpp +++ b/src/server/RunContext.cpp @@ -25,8 +25,8 @@ #include "RunContext.hpp" #include "Task.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { struct Notification { @@ -191,5 +191,5 @@ RunContext::run() } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp index fe3ce850..78580fd7 100644 --- a/src/server/RunContext.hpp +++ b/src/server/RunContext.hpp @@ -25,8 +25,8 @@ #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; class PortImpl; @@ -155,7 +155,7 @@ protected: bool _realtime; ///< True iff context is hard realtime }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_RUNCONTEXT_HPP diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp index a6faa863..9a0ce346 100644 --- a/src/server/SocketListener.cpp +++ b/src/server/SocketListener.cpp @@ -36,8 +36,8 @@ #include "SocketListener.hpp" #include "SocketServer.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { static constexpr const char* const unix_scheme = "unix://"; @@ -82,7 +82,7 @@ SocketListener::~SocketListener() { static void ingen_listen(Engine* engine, Raul::Socket* unix_sock, Raul::Socket* net_sock) { - Ingen::World* world = engine->world(); + ingen::World* world = engine->world(); const std::string link_path(world->conf().option("socket").ptr<char>()); const std::string unix_path(link_path + "." + std::to_string(getpid())); @@ -186,5 +186,5 @@ ingen_listen(Engine* engine, Raul::Socket* unix_sock, Raul::Socket* net_sock) } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/SocketListener.hpp b/src/server/SocketListener.hpp index e74629ad..b3b5931e 100644 --- a/src/server/SocketListener.hpp +++ b/src/server/SocketListener.hpp @@ -19,8 +19,8 @@ #include "raul/Socket.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; @@ -37,5 +37,5 @@ private: std::unique_ptr<std::thread> thread; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/SocketServer.hpp b/src/server/SocketServer.hpp index dbeb76ea..bd285e6e 100644 --- a/src/server/SocketServer.hpp +++ b/src/server/SocketServer.hpp @@ -25,15 +25,15 @@ #include "EventWriter.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** The server side of an Ingen socket connection. */ class SocketServer { public: SocketServer(World& world, - Server::Engine& engine, + server::Engine& engine, SPtr<Raul::Socket> sock) : _engine(engine) , _sink(world.conf().option("dump").get<int32_t>() @@ -68,13 +68,13 @@ protected: } private: - Server::Engine& _engine; + server::Engine& _engine; SPtr<Interface> _sink; SPtr<SocketReader> _reader; SPtr<SocketWriter> _writer; }; -} // namespace Ingen +} // namespace ingen } // namespace Socket #endif // INGEN_SERVER_SOCKET_SERVER_HPP diff --git a/src/server/Task.cpp b/src/server/Task.cpp index d2cb2683..63f3ef34 100644 --- a/src/server/Task.cpp +++ b/src/server/Task.cpp @@ -17,8 +17,8 @@ #include "BlockImpl.hpp" #include "Task.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { void Task::run(RunContext& context) @@ -154,5 +154,5 @@ Task::dump(std::function<void (const std::string&)> sink, unsigned indent, bool } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/Task.hpp b/src/server/Task.hpp index 2cdad71b..97a6101c 100644 --- a/src/server/Task.hpp +++ b/src/server/Task.hpp @@ -24,8 +24,8 @@ #include <memory> #include <ostream> -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class RunContext; @@ -114,7 +114,7 @@ private: std::atomic<bool> _done; ///< Completion phase }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_TASK_HPP diff --git a/src/server/ThreadManager.hpp b/src/server/ThreadManager.hpp index 3bcedf30..bf14a423 100644 --- a/src/server/ThreadManager.hpp +++ b/src/server/ThreadManager.hpp @@ -23,8 +23,8 @@ #include "util.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { enum ThreadFlag { THREAD_IS_REAL_TIME = 1, @@ -62,7 +62,7 @@ public: static INGEN_THREAD_LOCAL unsigned flags; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_THREADMANAGER_HPP diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp index 289770c0..77b4706f 100644 --- a/src/server/UndoStack.cpp +++ b/src/server/UndoStack.cpp @@ -29,8 +29,8 @@ #define USTR(s) ((const uint8_t*)(s)) -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { int UndoStack::start_entry() @@ -249,5 +249,5 @@ UndoStack::save(FILE* stream, const char* name) serd_writer_free(writer); } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp index 4ca8a5b8..8ebd1482 100644 --- a/src/server/UndoStack.hpp +++ b/src/server/UndoStack.hpp @@ -26,12 +26,12 @@ #include "serd/serd.h" #include "sratom/sratom.h" -namespace Ingen { +namespace ingen { class URIMap; class URIs; -namespace Server { +namespace server { class INGEN_API UndoStack : public AtomSink { public: @@ -101,7 +101,7 @@ private: int _depth; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_UNDOSTACK_HPP diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp index de1fc629..59ef306f 100644 --- a/src/server/Worker.cpp +++ b/src/server/Worker.cpp @@ -23,8 +23,8 @@ #include "LV2Block.hpp" #include "Worker.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /// A message in the Worker::_requests ring struct MessageHeader { @@ -159,5 +159,5 @@ Worker::run() } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp index 11cc2cd1..063570ca 100644 --- a/src/server/Worker.hpp +++ b/src/server/Worker.hpp @@ -24,11 +24,11 @@ #include "raul/RingBuffer.hpp" #include "raul/Semaphore.hpp" -namespace Ingen { +namespace ingen { class Log; -namespace Server { +namespace server { class LV2Block; @@ -70,7 +70,7 @@ private: void run(); }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_WORKER_HPP diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index 8937b327..99a90a49 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -30,14 +30,14 @@ #include "internals/BlockDelay.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Connect::Connect(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Connect& msg) + const ingen::Connect& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _graph(nullptr) @@ -113,7 +113,7 @@ Connect::pre_process(PreProcessContext& ctx) // The tail block is now a dependency (provider) of the head block head_block->providers().insert(tail_block); - if (!dynamic_cast<Internals::BlockDelayNode*>(tail_block)) { + if (!dynamic_cast<internals::BlockDelayNode*>(tail_block)) { /* Arcs leaving a delay node are ignored for the purposes of compilation, since the output is from the previous cycle and does not affect execution order. Otherwise, the head block is @@ -183,6 +183,6 @@ Connect::undo(Interface& target) target.disconnect(_msg.tail, _msg.head); } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index 8a42b984..b4894875 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -28,14 +28,14 @@ namespace Raul { template <typename T> class Array; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class ArcImpl; class GraphImpl; class InputPort; -namespace Events { +namespace events { /** Make an Arc between two Ports. * @@ -47,7 +47,7 @@ public: Connect(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Connect& msg); + const ingen::Connect& msg); bool pre_process(PreProcessContext& ctx); void execute(RunContext& context); @@ -55,7 +55,7 @@ public: void undo(Interface& target); private: - const Ingen::Connect _msg; + const ingen::Connect _msg; GraphImpl* _graph; InputPort* _head; MPtr<CompiledGraph> _compiled_graph; @@ -67,8 +67,8 @@ private: Properties _head_add; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_CONNECT_HPP diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index fc9d40f7..5d2d511c 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -27,14 +27,14 @@ #include "PreProcessContext.hpp" #include "events/Copy.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Copy::Copy(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Copy& msg) + const ingen::Copy& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _old_block(nullptr) @@ -211,6 +211,6 @@ Copy::undo(Interface& target) } } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index 5216b56e..bd52baf2 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -25,13 +25,13 @@ #include "CompiledGraph.hpp" #include "Event.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class GraphImpl; -namespace Events { +namespace events { /** Copy a graph object to a new path. * \ingroup engine @@ -42,7 +42,7 @@ public: Copy(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Copy& msg); + const ingen::Copy& msg); bool pre_process(PreProcessContext& ctx); void execute(RunContext& context); @@ -54,15 +54,15 @@ private: bool engine_to_filesystem(PreProcessContext& ctx); bool filesystem_to_engine(PreProcessContext& ctx); - const Ingen::Copy _msg; + const ingen::Copy _msg; SPtr<BlockImpl> _old_block; GraphImpl* _parent; BlockImpl* _block; MPtr<CompiledGraph> _compiled_graph; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_COPY_HPP diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index d678bea3..fabdbd85 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -31,9 +31,9 @@ #include "PreProcessContext.hpp" #include "LV2Block.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { CreateBlock::CreateBlock(Engine& engine, SPtr<Interface> client, @@ -53,7 +53,7 @@ CreateBlock::pre_process(PreProcessContext& ctx) { typedef Properties::const_iterator iterator; - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); const SPtr<Store> store = _engine.store(); // Check sanity of target path @@ -175,6 +175,6 @@ CreateBlock::undo(Interface& target) target.del(_block->uri()); } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index 0a29e68c..35707f0d 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -23,13 +23,13 @@ #include "CompiledGraph.hpp" #include "Event.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class GraphImpl; -namespace Events { +namespace events { /** An event to load a Block and insert it into a Graph. * @@ -59,8 +59,8 @@ private: MPtr<CompiledGraph> _compiled_graph; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_CREATEBLOCK_HPP diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index 390fdd9a..27781cbc 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -27,9 +27,9 @@ #include "events/CreateGraph.hpp" #include "events/CreatePort.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { CreateGraph::CreateGraph(Engine& engine, SPtr<Interface> client, @@ -54,7 +54,7 @@ CreateGraph::~CreateGraph() void CreateGraph::build_child_events() { - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); // Properties common to both ports Properties control_properties; @@ -76,7 +76,7 @@ CreateGraph::build_child_events() Resource::Graph::EXTERNAL); _child_events.push_back( - new Events::CreatePort( + new events::CreatePort( _engine, _request_client, -1, _time, _path.child(Raul::Symbol("control")), in_properties)); @@ -92,7 +92,7 @@ CreateGraph::build_child_events() Resource::Graph::EXTERNAL); _child_events.push_back( - new Events::CreatePort(_engine, _request_client, -1, _time, + new events::CreatePort(_engine, _request_client, -1, _time, _path.child(Raul::Symbol("notify")), out_properties)); } @@ -111,7 +111,7 @@ CreateGraph::pre_process(PreProcessContext& ctx) } } - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); typedef Properties::const_iterator iterator; @@ -231,6 +231,6 @@ CreateGraph::undo(Interface& target) target.del(_graph->uri()); } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index 564d553b..3658d359 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -25,12 +25,12 @@ #include "Event.hpp" #include "events/Get.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class GraphImpl; -namespace Events { +namespace events { /** Creates a new Graph. * @@ -67,8 +67,8 @@ private: std::list<Event*> _child_events; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_CREATEGRAPH_HPP diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index e17b8b01..a79c85ef 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -32,9 +32,9 @@ #include "GraphImpl.hpp" #include "PortImpl.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { CreatePort::CreatePort(Engine& engine, SPtr<Interface> client, @@ -51,7 +51,7 @@ CreatePort::CreatePort(Engine& engine, , _engine_port(nullptr) , _properties(properties) { - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); typedef Properties::const_iterator Iterator; typedef std::pair<Iterator, Iterator> Range; @@ -214,6 +214,6 @@ CreatePort::undo(Interface& target) target.del(_graph_port->uri()); } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index a98ea393..13402087 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -28,15 +28,15 @@ #include "Event.hpp" #include "PortType.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class DuplexPort; class EnginePort; class GraphImpl; class PortImpl; -namespace Events { +namespace events { /** An event to add a Port to a Graph. * @@ -75,8 +75,8 @@ private: boost::optional<Flow> _flow; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_CREATEPORT_HPP diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index e8f9582c..ff9f32b4 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -31,14 +31,14 @@ #include "PortImpl.hpp" #include "PreProcessContext.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Delete::Delete(Engine& engine, SPtr<Interface> client, FrameTime timestamp, - const Ingen::Del& msg) + const ingen::Del& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _engine_port(nullptr) @@ -60,7 +60,7 @@ Delete::~Delete() bool Delete::pre_process(PreProcessContext& ctx) { - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); if (_path.is_root() || _path == "/control" || _path == "/notify") { return Event::pre_process_done(Status::NOT_DELETABLE, _path); } @@ -187,8 +187,8 @@ Delete::post_process() void Delete::undo(Interface& target) { - const Ingen::URIs& uris = _engine.world()->uris(); - Ingen::Forge& forge = _engine.buffer_factory()->forge(); + const ingen::URIs& uris = _engine.world()->uris(); + ingen::Forge& forge = _engine.buffer_factory()->forge(); auto i = _removed_objects.find(_path); if (i != _removed_objects.end()) { @@ -211,6 +211,6 @@ Delete::undo(Interface& target) } } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index 8b2a0a91..5d00c5ea 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -31,15 +31,15 @@ namespace Raul { template<typename T> class Array; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class DuplexPort; class EnginePort; class PortImpl; -namespace Events { +namespace events { class DisconnectAll; @@ -52,7 +52,7 @@ public: Delete(Engine& engine, SPtr<Interface> client, FrameTime timestamp, - const Ingen::Del& msg); + const ingen::Del& msg); ~Delete(); @@ -65,7 +65,7 @@ private: using IndexChange = std::pair<uint32_t, uint32_t>; using IndexChanges = std::map<Raul::Path, IndexChange>; - const Ingen::Del _msg; + const ingen::Del _msg; Raul::Path _path; SPtr<BlockImpl> _block; ///< Non-NULL iff a block SPtr<DuplexPort> _port; ///< Non-NULL iff a port @@ -79,8 +79,8 @@ private: std::vector<ControlBindings::Binding*> _removed_bindings; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_DELETE_HPP diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index b23ae884..7404aea6 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -36,14 +36,14 @@ #include "SetPortValue.hpp" #include "events/Get.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Delta::Delta(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Put& msg) + const ingen::Put& msg) : Event(engine, client, msg.seq, timestamp) , _create_event(nullptr) , _subject(msg.uri) @@ -62,7 +62,7 @@ Delta::Delta(Engine& engine, Delta::Delta(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Delta& msg) + const ingen::Delta& msg) : Event(engine, client, msg.seq, timestamp) , _create_event(nullptr) , _subject(msg.uri) @@ -82,7 +82,7 @@ Delta::Delta(Engine& engine, Delta::Delta(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::SetProperty& msg) + const ingen::SetProperty& msg) : Event(engine, client, msg.seq, timestamp) , _create_event(nullptr) , _subject(msg.subject) @@ -117,7 +117,7 @@ Delta::init() } // Set atomic execution if polyphony is to be changed - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); if (_properties.count(uris.ingen_polyphonic) || _properties.count(uris.ingen_polyphony)) { _block = true; @@ -171,7 +171,7 @@ get_file_node(LilvWorld* lworld, const URIs& uris, const Atom& value) bool Delta::pre_process(PreProcessContext& ctx) { - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); const bool is_graph_object = uri_is_path(_subject); const bool is_client = (_subject == "ingen:/clients/this"); @@ -218,8 +218,8 @@ Delta::pre_process(PreProcessContext& ctx) std::lock_guard<Store::Mutex> lock(_engine.store()->mutex()); _object = is_graph_object - ? static_cast<Ingen::Resource*>(_engine.store()->get(uri_to_path(_subject))) - : static_cast<Ingen::Resource*>(_engine.block_factory()->plugin(_subject)); + ? static_cast<ingen::Resource*>(_engine.store()->get(uri_to_path(_subject))) + : static_cast<ingen::Resource*>(_engine.block_factory()->plugin(_subject)); if (!_object && !is_client && !is_engine && (!is_graph_object || _type != Type::PUT)) { @@ -229,7 +229,7 @@ Delta::pre_process(PreProcessContext& ctx) if (is_graph_object && !_object) { Raul::Path path(uri_to_path(_subject)); bool is_graph = false, is_block = false, is_port = false, is_output = false; - Ingen::Resource::type(uris, _properties, is_graph, is_block, is_port, is_output); + ingen::Resource::type(uris, _properties, is_graph, is_block, is_port, is_output); if (is_graph) { _create_event = new CreateGraph( @@ -481,7 +481,7 @@ Delta::execute(RunContext& context) return; } - const Ingen::URIs& uris = _engine.world()->uris(); + const ingen::URIs& uris = _engine.world()->uris(); if (_create_event) { _create_event->set_time(_time); @@ -665,6 +665,6 @@ Delta::get_execution() const return _block ? Execution::ATOMIC : Execution::NORMAL; } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index af337b57..b3bb0537 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -28,17 +28,17 @@ #include "Event.hpp" #include "PluginImpl.hpp" -namespace Ingen { +namespace ingen { class Resource; -namespace Server { +namespace server { class Engine; class GraphImpl; class RunContext; -namespace Events { +namespace events { class SetPortValue; @@ -51,17 +51,17 @@ public: Delta(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Put& msg); + const ingen::Put& msg); Delta(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Delta& msg); + const ingen::Delta& msg); Delta(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::SetProperty& msg); + const ingen::SetProperty& msg); ~Delta(); @@ -108,7 +108,7 @@ private: Properties _properties; Properties _remove; ClientUpdate _update; - Ingen::Resource* _object; + ingen::Resource* _object; GraphImpl* _graph; MPtr<CompiledGraph> _compiled_graph; ControlBindings::Binding* _binding; @@ -126,8 +126,8 @@ private: bool _block; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_DELTA_HPP diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 4553c8a2..e803ce3d 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -33,14 +33,14 @@ #include "ThreadManager.hpp" #include "events/Disconnect.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Disconnect::Disconnect(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Disconnect& msg) + const ingen::Disconnect& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _graph(nullptr) @@ -219,6 +219,6 @@ Disconnect::undo(Interface& target) target.connect(_msg.tail, _msg.head); } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index 44290d7c..7649d9e4 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -29,13 +29,13 @@ namespace Raul { template <typename T> class Array; } -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class InputPort; class PortImpl; -namespace Events { +namespace events { /** Remove an Arc between two Ports. * @@ -47,7 +47,7 @@ public: Disconnect(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Disconnect& msg); + const ingen::Disconnect& msg); ~Disconnect(); @@ -74,14 +74,14 @@ public: }; private: - const Ingen::Disconnect _msg; + const ingen::Disconnect _msg; GraphImpl* _graph; Impl* _impl; MPtr<CompiledGraph> _compiled_graph; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_DISCONNECT_HPP diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index 11311d12..e21fad4d 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -33,14 +33,14 @@ #include "events/DisconnectAll.hpp" #include "util.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { DisconnectAll::DisconnectAll(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::DisconnectAll& msg) + const ingen::DisconnectAll& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _parent(nullptr) @@ -171,6 +171,6 @@ DisconnectAll::undo(Interface& target) } } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index 947e538f..aaebf872 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -25,14 +25,14 @@ #include "Disconnect.hpp" #include "Event.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class GraphImpl; class PortImpl; -namespace Events { +namespace events { class Disconnect; @@ -46,7 +46,7 @@ public: DisconnectAll(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::DisconnectAll& msg); + const ingen::DisconnectAll& msg); DisconnectAll(Engine& engine, GraphImpl* parent, @@ -62,7 +62,7 @@ public: private: typedef std::list<Disconnect::Impl*> Impls; - const Ingen::DisconnectAll _msg; + const ingen::DisconnectAll _msg; GraphImpl* _parent; BlockImpl* _block; PortImpl* _port; @@ -71,8 +71,8 @@ private: bool _deleting; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_DISCONNECTALL_HPP diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index e53e8c41..ad412beb 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -29,14 +29,14 @@ #include "PluginImpl.hpp" #include "PortImpl.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Get::Get(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Get& msg) + const ingen::Get& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _object(nullptr) @@ -106,6 +106,6 @@ Get::post_process() } } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index 7392550f..0cfbfe43 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -24,15 +24,15 @@ #include "Event.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class BlockImpl; class GraphImpl; class PluginImpl; class PortImpl; -namespace Events { +namespace events { /** A request from a client to send an object. * @@ -44,22 +44,22 @@ public: Get(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Get& msg); + const ingen::Get& msg); bool pre_process(PreProcessContext& ctx); void execute(RunContext& context) {} void post_process(); private: - const Ingen::Get _msg; + const ingen::Get _msg; const Node* _object; PluginImpl* _plugin; BlockFactory::Plugins _plugins; ClientUpdate _response; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_GET_HPP diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index 3c0dfaaf..be943533 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -19,14 +19,14 @@ #include "UndoStack.hpp" #include "events/Mark.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Mark::Mark(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::BundleBegin& msg) + const ingen::BundleBegin& msg) : Event(engine, client, msg.seq, timestamp) , _type(Type::BUNDLE_BEGIN) , _depth(0) @@ -35,7 +35,7 @@ Mark::Mark(Engine& engine, Mark::Mark(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::BundleEnd& msg) + const ingen::BundleEnd& msg) : Event(engine, client, msg.seq, timestamp) , _type(Type::BUNDLE_END) , _depth(0) @@ -107,6 +107,6 @@ Mark::get_execution() const return Execution::NORMAL; } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index eaeb9332..1d8bffdc 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -19,12 +19,12 @@ #include "Event.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class Engine; -namespace Events { +namespace events { /** Delineate the start or end of a bundle of events. * @@ -39,12 +39,12 @@ public: Mark(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::BundleBegin& msg); + const ingen::BundleBegin& msg); Mark(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::BundleEnd& msg); + const ingen::BundleEnd& msg); bool pre_process(PreProcessContext& ctx); void execute(RunContext& context); @@ -62,8 +62,8 @@ private: int _depth; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_MARK_HPP diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index b0935675..1890dc5f 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -25,14 +25,14 @@ #include "GraphImpl.hpp" #include "events/Move.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Move::Move(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Move& msg) + const ingen::Move& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) { @@ -86,6 +86,6 @@ Move::undo(Interface& target) target.move(_msg.new_path, _msg.old_path); } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index 459d2709..455a84d4 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -22,13 +22,13 @@ #include "Event.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class GraphImpl; class PortImpl; -namespace Events { +namespace events { /** Move a graph object to a new path. * \ingroup engine @@ -39,7 +39,7 @@ public: Move(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Move& msg); + const ingen::Move& msg); bool pre_process(PreProcessContext& ctx); void execute(RunContext& context); @@ -47,11 +47,11 @@ public: void undo(Interface& target); private: - const Ingen::Move _msg; + const ingen::Move _msg; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_MOVE_HPP diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index 62f2def6..fa36d739 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -28,9 +28,9 @@ #include "RunContext.hpp" #include "SetPortValue.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { /** Internal */ SetPortValue::SetPortValue(Engine& engine, @@ -52,7 +52,7 @@ SetPortValue::SetPortValue(Engine& engine, bool SetPortValue::pre_process(PreProcessContext& ctx) { - Ingen::URIs& uris = _engine.world()->uris(); + ingen::URIs& uris = _engine.world()->uris(); if (_port->is_output()) { return Event::pre_process_done(Status::DIRECTION_MISMATCH, _port->path()); } @@ -90,7 +90,7 @@ SetPortValue::apply(RunContext& context) return; } - Ingen::URIs& uris = _engine.world()->uris(); + ingen::URIs& uris = _engine.world()->uris(); Buffer* buf = _port->buffer(0).get(); if (_buffer) { @@ -134,6 +134,6 @@ SetPortValue::post_process() } } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp index 4df60019..01bad6a8 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -24,12 +24,12 @@ #include "Event.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class PortImpl; -namespace Events { +namespace events { /** An event to change the value of a port. * @@ -64,8 +64,8 @@ private: bool _synthetic; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_SETPORTVALUE_HPP diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp index e06a5951..0c307e85 100644 --- a/src/server/events/Undo.cpp +++ b/src/server/events/Undo.cpp @@ -20,14 +20,14 @@ #include "EventWriter.hpp" #include "Undo.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { Undo::Undo(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Undo& msg) + const ingen::Undo& msg) : Event(engine, client, msg.seq, timestamp) , _is_redo(false) {} @@ -35,7 +35,7 @@ Undo::Undo(Engine& engine, Undo::Undo(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Redo& msg) + const ingen::Redo& msg) : Event(engine, client, msg.seq, timestamp) , _is_redo(true) {} @@ -80,6 +80,6 @@ Undo::post_process() respond(); } -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen diff --git a/src/server/events/Undo.hpp b/src/server/events/Undo.hpp index af4b0d65..4e09c7f3 100644 --- a/src/server/events/Undo.hpp +++ b/src/server/events/Undo.hpp @@ -21,9 +21,9 @@ #include "UndoStack.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { -namespace Events { +namespace ingen { +namespace server { +namespace events { /** A request to undo the last change to the engine. * @@ -35,12 +35,12 @@ public: Undo(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Undo& msg); + const ingen::Undo& msg); Undo(Engine& engine, SPtr<Interface> client, SampleCount timestamp, - const Ingen::Redo& msg); + const ingen::Redo& msg); bool pre_process(PreProcessContext& ctx); void execute(RunContext& context); @@ -51,8 +51,8 @@ private: bool _is_redo; }; -} // namespace Events -} // namespace Server -} // namespace Ingen +} // namespace events +} // namespace server +} // namespace ingen #endif // INGEN_EVENTS_UNDO_HPP diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp index 3409f1bf..15391437 100644 --- a/src/server/ingen_engine.cpp +++ b/src/server/ingen_engine.cpp @@ -20,12 +20,12 @@ #include "EventWriter.hpp" #include "util.hpp" -using namespace Ingen; +using namespace ingen; -struct IngenEngineModule : public Ingen::Module { - virtual void load(Ingen::World* world) { - Server::set_denormal_flags(world->log()); - SPtr<Server::Engine> engine(new Server::Engine(world)); +struct IngenEngineModule : public ingen::Module { + virtual void load(ingen::World* world) { + server::set_denormal_flags(world->log()); + SPtr<server::Engine> engine(new server::Engine(world)); world->set_engine(engine); if (!world->interface()) { world->set_interface(engine->interface()); @@ -35,7 +35,7 @@ struct IngenEngineModule : public Ingen::Module { extern "C" { -Ingen::Module* +ingen::Module* ingen_module_load() { return new IngenEngineModule(); diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index a897f130..c0fd80aa 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -26,30 +26,30 @@ #include "JackDriver.hpp" #include "Engine.hpp" -using namespace Ingen; +using namespace ingen; -struct IngenJackModule : public Ingen::Module { - void load(Ingen::World* world) { - if (((Server::Engine*)world->engine().get())->driver()) { +struct IngenJackModule : public ingen::Module { + void load(ingen::World* world) { + if (((server::Engine*)world->engine().get())->driver()) { world->log().warn("Engine already has a driver\n"); return; } - Server::JackDriver* driver = new Server::JackDriver( - *(Server::Engine*)world->engine().get()); + server::JackDriver* driver = new server::JackDriver( + *(server::Engine*)world->engine().get()); const Atom& s = world->conf().option("jack-server"); const std::string server_name = s.is_valid() ? s.ptr<char>() : ""; driver->attach(server_name, world->conf().option("jack-name").ptr<char>(), nullptr); - ((Server::Engine*)world->engine().get())->set_driver( - SPtr<Server::Driver>(driver)); + ((server::Engine*)world->engine().get())->set_driver( + SPtr<server::Driver>(driver)); } }; extern "C" { -Ingen::Module* +ingen::Module* ingen_module_load() { return new IngenJackModule(); diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 99b2826a..36bafc4d 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -56,7 +56,7 @@ #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#" -namespace Ingen { +namespace ingen { /** Record of a graph in this bundle. */ struct LV2Graph : public Parser::ResourceRecord { @@ -75,7 +75,7 @@ public: Graphs graphs; }; -namespace Server { +namespace server { class LV2Driver; @@ -87,8 +87,8 @@ ui_ring_size(SampleCount block_length) return std::max((size_t)8192, (size_t)block_length * 16); } -class LV2Driver : public Ingen::Server::Driver - , public Ingen::AtomSink +class LV2Driver : public ingen::server::Driver + , public ingen::AtomSink { public: LV2Driver(Engine& engine, @@ -396,13 +396,13 @@ private: bool _instantiated; }; -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen extern "C" { -using namespace Ingen; -using namespace Ingen::Server; +using namespace ingen; +using namespace ingen::server; static void ingen_lv2_main(SPtr<Engine> engine, const SPtr<LV2Driver>& driver) @@ -430,7 +430,7 @@ struct IngenPlugin { , argv(nullptr) {} - Ingen::World* world; + ingen::World* world; SPtr<Engine> engine; std::thread* main; LV2_URID_Map* map; @@ -492,7 +492,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, } set_bundle_path(bundle_path); - const std::string manifest_path = Ingen::bundle_file_path("manifest.ttl"); + const std::string manifest_path = ingen::bundle_file_path("manifest.ttl"); SerdNode manifest_node = serd_node_new_file_uri( (const uint8_t*)manifest_path.c_str(), nullptr, nullptr, true); @@ -514,7 +514,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, IngenPlugin* plugin = new IngenPlugin(); plugin->map = map; - plugin->world = new Ingen::World(map, unmap, log); + plugin->world = new ingen::World(map, unmap, log); plugin->world->load_configuration(plugin->argc, plugin->argv); LV2_URID bufsz_max = map->map(map->handle, LV2_BUF_SIZE__maxBlockLength); @@ -547,7 +547,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor, "queue-size", plugin->world->forge().make(std::max(block_length, seq_size) * 4)); - SPtr<Server::Engine> engine(new Server::Engine(plugin->world)); + SPtr<server::Engine> engine(new server::Engine(plugin->world)); plugin->engine = engine; plugin->world->set_engine(engine); @@ -555,14 +555,14 @@ ingen_instantiate(const LV2_Descriptor* descriptor, plugin->world->set_interface(interface); - Server::ThreadManager::set_flag(Server::THREAD_PRE_PROCESS); - Server::ThreadManager::single_threaded = true; + server::ThreadManager::set_flag(server::THREAD_PRE_PROCESS); + server::ThreadManager::single_threaded = true; LV2Driver* driver = new LV2Driver(*engine.get(), block_length, seq_size, rate); - engine->set_driver(SPtr<Ingen::Server::Driver>(driver)); + engine->set_driver(SPtr<ingen::server::Driver>(driver)); engine->activate(); - Server::ThreadManager::single_threaded = true; + server::ThreadManager::single_threaded = true; std::lock_guard<std::mutex> lock(plugin->world->rdf_mutex()); @@ -597,10 +597,10 @@ ingen_instantiate(const LV2_Descriptor* descriptor, static void ingen_connect_port(LV2_Handle instance, uint32_t port, void* data) { - using namespace Ingen::Server; + using namespace ingen::server; IngenPlugin* me = (IngenPlugin*)instance; - Server::Engine* engine = (Server::Engine*)me->world->engine().get(); + server::Engine* engine = (server::Engine*)me->world->engine().get(); const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver()); if (port < driver->ports().size()) { driver->ports().at(port)->set_buffer(data); @@ -613,7 +613,7 @@ static void ingen_activate(LV2_Handle instance) { IngenPlugin* me = (IngenPlugin*)instance; - SPtr<Server::Engine> engine = static_ptr_cast<Server::Engine>(me->world->engine()); + SPtr<server::Engine> engine = static_ptr_cast<server::Engine>(me->world->engine()); const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver()); engine->activate(); me->main = new std::thread(ingen_lv2_main, engine, driver); @@ -623,11 +623,11 @@ static void ingen_run(LV2_Handle instance, uint32_t sample_count) { IngenPlugin* me = (IngenPlugin*)instance; - SPtr<Server::Engine> engine = static_ptr_cast<Server::Engine>(me->world->engine()); + SPtr<server::Engine> engine = static_ptr_cast<server::Engine>(me->world->engine()); const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver()); - Server::ThreadManager::set_flag(Ingen::Server::THREAD_PROCESS); - Server::ThreadManager::set_flag(Ingen::Server::THREAD_IS_REAL_TIME); + server::ThreadManager::set_flag(ingen::server::THREAD_PROCESS); + server::ThreadManager::set_flag(ingen::server::THREAD_IS_REAL_TIME); driver->run(sample_count); } @@ -648,8 +648,8 @@ static void ingen_cleanup(LV2_Handle instance) { IngenPlugin* me = (IngenPlugin*)instance; - me->world->set_engine(SPtr<Ingen::Server::Engine>()); - me->world->set_interface(SPtr<Ingen::Interface>()); + me->world->set_engine(SPtr<ingen::server::Engine>()); + me->world->set_interface(SPtr<ingen::Interface>()); if (me->main) { me->main->join(); delete me->main; @@ -804,8 +804,8 @@ LV2Graph::LV2Graph(Parser::ResourceRecord record) Lib::Lib(const char* bundle_path) { - Ingen::set_bundle_path(bundle_path); - const std::string manifest_path = Ingen::bundle_file_path("manifest.ttl"); + ingen::set_bundle_path(bundle_path); + const std::string manifest_path = ingen::bundle_file_path("manifest.ttl"); SerdNode manifest_node = serd_node_new_file_uri( (const uint8_t*)manifest_path.c_str(), nullptr, nullptr, true); diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp index e4065342..d1e04a6c 100644 --- a/src/server/ingen_portaudio.cpp +++ b/src/server/ingen_portaudio.cpp @@ -26,26 +26,26 @@ #include "PortAudioDriver.hpp" #include "Engine.hpp" -using namespace Ingen; +using namespace ingen; -struct IngenPortAudioModule : public Ingen::Module { - void load(Ingen::World* world) { - if (((Server::Engine*)world->engine().get())->driver()) { +struct IngenPortAudioModule : public ingen::Module { + void load(ingen::World* world) { + if (((server::Engine*)world->engine().get())->driver()) { world->log().warn("Engine already has a driver\n"); return; } - Server::PortAudioDriver* driver = new Server::PortAudioDriver( - *(Server::Engine*)world->engine().get()); + server::PortAudioDriver* driver = new server::PortAudioDriver( + *(server::Engine*)world->engine().get()); driver->attach(); - ((Server::Engine*)world->engine().get())->set_driver( - SPtr<Server::Driver>(driver)); + ((server::Engine*)world->engine().get())->set_driver( + SPtr<server::Driver>(driver)); } }; extern "C" { -Ingen::Module* +ingen::Module* ingen_module_load() { return new IngenPortAudioModule(); diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp index 6b27ed83..5c7ad147 100644 --- a/src/server/internals/BlockDelay.cpp +++ b/src/server/internals/BlockDelay.cpp @@ -29,9 +29,9 @@ #include "RunContext.hpp" #include "internals/BlockDelay.hpp" -namespace Ingen { -namespace Server { -namespace Internals { +namespace ingen { +namespace server { +namespace internals { InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) { return new InternalPlugin( @@ -46,7 +46,7 @@ BlockDelayNode::BlockDelayNode(InternalPlugin* plugin, SampleRate srate) : InternalBlock(plugin, symbol, polyphonic, parent, srate) { - const Ingen::URIs& uris = bufs.uris(); + const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(2); _in_port = new InputPort(bufs, this, Raul::Symbol("in"), 0, 1, @@ -84,6 +84,6 @@ BlockDelayNode::run(RunContext& context) _buffer->copy(context, _in_port->buffer(0).get()); } -} // namespace Internals -} // namespace Server -} // namespace Ingen +} // namespace internals +} // namespace server +} // namespace ingen diff --git a/src/server/internals/BlockDelay.hpp b/src/server/internals/BlockDelay.hpp index e1ef5311..a4a27383 100644 --- a/src/server/internals/BlockDelay.hpp +++ b/src/server/internals/BlockDelay.hpp @@ -21,15 +21,15 @@ #include "InternalBlock.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class InputPort; class OutputPort; class InternalPlugin; class BufferFactory; -namespace Internals { +namespace internals { class BlockDelayNode : public InternalBlock { @@ -55,8 +55,8 @@ private: BufferRef _buffer; }; -} // namespace Server -} // namespace Ingen -} // namespace Internals +} // namespace server +} // namespace ingen +} // namespace internals #endif // INGEN_INTERNALS_BLOCKDELAY_HPP diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 95474ab8..4b5735d7 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -30,9 +30,9 @@ #include "RunContext.hpp" #include "util.hpp" -namespace Ingen { -namespace Server { -namespace Internals { +namespace ingen { +namespace server { +namespace internals { InternalPlugin* ControllerNode::internal_plugin(URIs& uris) { return new InternalPlugin( @@ -48,7 +48,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, : InternalBlock(plugin, symbol, false, parent, srate) , _learning(false) { - const Ingen::URIs& uris = bufs.uris(); + const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(7); const Atom zero = bufs.forge().make(0.0f); @@ -169,6 +169,6 @@ ControllerNode::control(RunContext& context, uint8_t control_num, uint8_t val, F return true; } -} // namespace Internals -} // namespace Server -} // namespace Ingen +} // namespace internals +} // namespace server +} // namespace ingen diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index 720f78c0..9d1bbf7d 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -19,14 +19,14 @@ #include "InternalBlock.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class InputPort; class OutputPort; class InternalPlugin; -namespace Internals { +namespace internals { /** MIDI control input block. * @@ -64,8 +64,8 @@ private: bool _learning; }; -} // namespace Server -} // namespace Ingen -} // namespace Internals +} // namespace server +} // namespace ingen +} // namespace internals #endif // INGEN_INTERNALS_CONTROLLER_HPP diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index f8e2503d..9d39f345 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -34,9 +34,9 @@ // #define NOTE_DEBUG 1 -namespace Ingen { -namespace Server { -namespace Internals { +namespace ingen { +namespace server { +namespace internals { InternalPlugin* NoteNode::internal_plugin(URIs& uris) { return new InternalPlugin( @@ -53,7 +53,7 @@ NoteNode::NoteNode(InternalPlugin* plugin, , _voices(bufs.maid().make_managed<Voices>(_polyphony)) , _sustain(false) { - const Ingen::URIs& uris = bufs.uris(); + const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(8); const Atom zero = bufs.forge().make(0.0f); @@ -415,6 +415,6 @@ NoteNode::channel_pressure(RunContext& context, FrameTime time, float amount) _pressure_port->set_control_value(context, time, amount); } -} // namespace Internals -} // namespace Server -} // namespace Ingen +} // namespace internals +} // namespace server +} // namespace ingen diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index 1e60c130..5c1b24c4 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -20,14 +20,14 @@ #include "InternalBlock.hpp" #include "types.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class InputPort; class OutputPort; class InternalPlugin; -namespace Internals { +namespace internals { /** MIDI note input block. * @@ -102,8 +102,8 @@ private: OutputPort* _pressure_port; }; -} // namespace Server -} // namespace Ingen -} // namespace Internals +} // namespace server +} // namespace ingen +} // namespace internals #endif // INGEN_INTERNALS_NOTE_HPP diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp index 5152a930..c35aa02b 100644 --- a/src/server/internals/Time.cpp +++ b/src/server/internals/Time.cpp @@ -27,9 +27,9 @@ #include "internals/Time.hpp" #include "util.hpp" -namespace Ingen { -namespace Server { -namespace Internals { +namespace ingen { +namespace server { +namespace internals { InternalPlugin* TimeNode::internal_plugin(URIs& uris) { return new InternalPlugin( @@ -44,7 +44,7 @@ TimeNode::TimeNode(InternalPlugin* plugin, SampleRate srate) : InternalBlock(plugin, symbol, false, parent, srate) { - const Ingen::URIs& uris = bufs.uris(); + const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(1); _notify_port = new OutputPort( @@ -73,6 +73,6 @@ TimeNode::run(RunContext& context) context, *_notify_port->buffer(0)); } -} // namespace Internals -} // namespace Server -} // namespace Ingen +} // namespace internals +} // namespace server +} // namespace ingen diff --git a/src/server/internals/Time.hpp b/src/server/internals/Time.hpp index 1a063f8d..b4b570f4 100644 --- a/src/server/internals/Time.hpp +++ b/src/server/internals/Time.hpp @@ -19,14 +19,14 @@ #include "InternalBlock.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class InputPort; class OutputPort; class InternalPlugin; -namespace Internals { +namespace internals { /** Time information block. * @@ -52,8 +52,8 @@ private: OutputPort* _notify_port; }; -} // namespace Server -} // namespace Ingen -} // namespace Internals +} // namespace server +} // namespace ingen +} // namespace internals #endif // INGEN_INTERNALS_TIME_HPP diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 66fd058b..793e508d 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -30,9 +30,9 @@ #include "internals/Trigger.hpp" #include "util.hpp" -namespace Ingen { -namespace Server { -namespace Internals { +namespace ingen { +namespace server { +namespace internals { InternalPlugin* TriggerNode::internal_plugin(URIs& uris) { return new InternalPlugin( @@ -48,7 +48,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, : InternalBlock(plugin, symbol, false, parent, srate) , _learning(false) { - const Ingen::URIs& uris = bufs.uris(); + const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(6); const Atom zero = bufs.forge().make(0.0f); @@ -182,6 +182,6 @@ TriggerNode::note_off(RunContext& context, uint8_t note_num, FrameTime time) return false; } -} // namespace Internals -} // namespace Server -} // namespace Ingen +} // namespace internals +} // namespace server +} // namespace ingen diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index 4d67395a..ae661751 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -19,14 +19,14 @@ #include "InternalBlock.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { class InputPort; class OutputPort; class InternalPlugin; -namespace Internals { +namespace internals { /** MIDI trigger input block. * @@ -68,8 +68,8 @@ private: OutputPort* _vel_port; }; -} // namespace Server -} // namespace Ingen -} // namespace Internals +} // namespace server +} // namespace ingen +} // namespace internals #endif // INGEN_INTERNALS_TRIGGER_HPP diff --git a/src/server/mix.cpp b/src/server/mix.cpp index 60525596..065e3efc 100644 --- a/src/server/mix.cpp +++ b/src/server/mix.cpp @@ -20,8 +20,8 @@ #include "RunContext.hpp" #include "mix.hpp" -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { static inline bool is_end(const Buffer* buf, const LV2_Atom_Event* ev) @@ -108,5 +108,5 @@ mix(const RunContext& context, } } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen diff --git a/src/server/mix.hpp b/src/server/mix.hpp index 3d8880db..7df76595 100644 --- a/src/server/mix.hpp +++ b/src/server/mix.hpp @@ -19,11 +19,11 @@ #include <cstdint> -namespace Ingen { +namespace ingen { class URIs; -namespace Server { +namespace server { class Buffer; class RunContext; @@ -34,7 +34,7 @@ mix(const RunContext& context, const Buffer*const* srcs, uint32_t num_srcs); -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_MIX_HPP diff --git a/src/server/util.hpp b/src/server/util.hpp index 7d30cc8f..07a7f350 100644 --- a/src/server/util.hpp +++ b/src/server/util.hpp @@ -43,13 +43,13 @@ # define INGEN_THREAD_LOCAL #endif -namespace Ingen { -namespace Server { +namespace ingen { +namespace server { /** Set flags to disable denormal processing. */ inline void -set_denormal_flags(Ingen::Log& log) +set_denormal_flags(ingen::Log& log) { #ifdef __SSE__ _mm_setcsr(_mm_getcsr() | 0x8040); @@ -57,7 +57,7 @@ set_denormal_flags(Ingen::Log& log) #endif } -} // namespace Server -} // namespace Ingen +} // namespace server +} // namespace ingen #endif // INGEN_ENGINE_UTIL_HPP |