diff options
Diffstat (limited to 'src/server')
79 files changed, 299 insertions, 293 deletions
diff --git a/src/server/.clang-tidy b/src/server/.clang-tidy index 9c5270f0..fc51d942 100644 --- a/src/server/.clang-tidy +++ b/src/server/.clang-tidy @@ -51,6 +51,12 @@ Checks: > -readability-implicit-bool-conversion, -readability-redundant-member-init, -readability-use-anyofallof, +CheckOptions: + - key: modernize-use-override.AllowOverrideAndFinal + value: 'true' +CheckOptions: + - key: cppcoreguidelines-explicit-virtual-functions.AllowOverrideAndFinal + value: 'true' WarningsAsErrors: '*' HeaderFilterRegex: 'include/ingen/.*|tests/.*|src/.*' FormatStyle: file diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp index d9a2b783..689be199 100644 --- a/src/server/ArcImpl.cpp +++ b/src/server/ArcImpl.cpp @@ -55,13 +55,13 @@ ArcImpl::~ArcImpl() } } -const Raul::Path& +const raul::Path& ArcImpl::tail_path() const { return _tail->path(); } -const Raul::Path& +const raul::Path& ArcImpl::head_path() const { return _head->path(); diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp index 3545a177..09c59c8f 100644 --- a/src/server/ArcImpl.hpp +++ b/src/server/ArcImpl.hpp @@ -28,9 +28,9 @@ #include <cstdint> -namespace Raul { +namespace raul { class Path; // IWYU pragma: keep -} // namespace Raul +} // namespace raul namespace ingen { namespace server { @@ -52,7 +52,7 @@ class RunContext; * \ingroup engine */ class ArcImpl - : private Raul::Noncopyable + : private raul::Noncopyable , public Arc , public boost::intrusive::slist_base_hook<> { @@ -63,8 +63,8 @@ public: inline PortImpl* tail() const { return _tail; } inline PortImpl* head() const { return _head; } - const Raul::Path& tail_path() const override; - const Raul::Path& head_path() const override; + const raul::Path& tail_path() const override; + const raul::Path& head_path() const override; /** Get the buffer for a particular voice. * An Arc is smart - it knows the destination port requesting the diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp index e285ba92..7cf28325 100644 --- a/src/server/BlockFactory.hpp +++ b/src/server/BlockFactory.hpp @@ -36,7 +36,7 @@ class PluginImpl; * * \ingroup engine */ -class BlockFactory : public Raul::Noncopyable +class BlockFactory : public raul::Noncopyable { public: explicit BlockFactory(ingen::World& world); diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp index cea69976..26e83eb8 100644 --- a/src/server/BlockImpl.cpp +++ b/src/server/BlockImpl.cpp @@ -36,7 +36,7 @@ namespace ingen { namespace server { BlockImpl::BlockImpl(PluginImpl* plugin, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate) diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index 293c98c0..c285bdac 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -39,9 +39,9 @@ #include <memory> #include <set> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { namespace server { @@ -65,10 +65,10 @@ class BlockImpl : public NodeImpl , public boost::intrusive::slist_base_hook<> // In GraphImpl { public: - using Ports = Raul::Array<PortImpl*>; + using Ports = raul::Array<PortImpl*>; BlockImpl(PluginImpl* plugin, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate rate); @@ -94,7 +94,7 @@ public: /** Duplicate this Node. */ virtual BlockImpl* duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) { return nullptr; } /** Return true iff this block is activated */ @@ -204,7 +204,7 @@ protected: PortImpl* nth_port_by_type(uint32_t n, bool input, PortType type); PluginImpl* _plugin; - Raul::managed_ptr<Ports> _ports; ///< Access in audio thread only + raul::managed_ptr<Ports> _ports; ///< Access in audio thread only uint32_t _polyphony; std::set<BlockImpl*> _providers; ///< Blocks connected to this one's input ports std::set<BlockImpl*> _dependants; ///< Blocks this one's output ports are connected to diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index 5a414432..8e9848f4 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -76,7 +76,7 @@ public: * This makes doing the right thing in recursive functions that send * updates simple (e.g. Event::post_process()). */ - class Transfer : public Raul::Noncopyable { + class Transfer : public raul::Noncopyable { public: explicit Transfer(Broadcaster& b) : broadcaster(b) { if (++broadcaster._bundle_depth == 1) { diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index c606c8cd..4ecdfc3b 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -62,7 +62,7 @@ BufferFactory::forge() return _engine.world().forge(); } -Raul::Maid& +raul::Maid& BufferFactory::maid() { return *_engine.maid(); diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp index 78d3fb56..19a61bed 100644 --- a/src/server/BufferFactory.hpp +++ b/src/server/BufferFactory.hpp @@ -28,7 +28,7 @@ #include <cstdint> #include <mutex> -namespace Raul { class Maid; } +namespace raul { class Maid; } namespace ingen { @@ -71,7 +71,7 @@ public: void set_seq_size(uint32_t seq_size) { _seq_size = seq_size; } Forge& forge(); - Raul::Maid& maid(); + raul::Maid& maid(); URIs& uris() { return _uris; } Engine& engine() { return _engine; } diff --git a/src/server/ClientUpdate.hpp b/src/server/ClientUpdate.hpp index 57848e62..9fadae90 100644 --- a/src/server/ClientUpdate.hpp +++ b/src/server/ClientUpdate.hpp @@ -67,8 +67,8 @@ struct ClientUpdate { }; struct Connect { - Raul::Path tail; - Raul::Path head; + raul::Path tail; + raul::Path head; }; std::vector<URI> dels; diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index d80780ff..e644d982 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -75,8 +75,8 @@ CompiledGraph::CompiledGraph(GraphImpl* graph) compile_graph(graph); } -Raul::managed_ptr<CompiledGraph> -CompiledGraph::compile(Raul::Maid& maid, GraphImpl& graph) +raul::managed_ptr<CompiledGraph> +CompiledGraph::compile(raul::Maid& maid, GraphImpl& graph) { try { return maid.make_managed<CompiledGraph>(&graph); diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp index 8642866a..8c2bb815 100644 --- a/src/server/CompiledGraph.hpp +++ b/src/server/CompiledGraph.hpp @@ -40,16 +40,16 @@ class RunContext; * execute the nodes in order and have nodes always executed before any of * their dependencies. */ -class CompiledGraph : public Raul::Maid::Disposable - , public Raul::Noncopyable +class CompiledGraph : public raul::Maid::Disposable + , public raul::Noncopyable { public: - static Raul::managed_ptr<CompiledGraph> compile(Raul::Maid& maid, GraphImpl& graph); + static raul::managed_ptr<CompiledGraph> compile(raul::Maid& maid, GraphImpl& graph); void run(RunContext& ctx); private: - friend class Raul::Maid; ///< Allow make_managed to construct + friend class raul::Maid; ///< Allow make_managed to construct CompiledGraph(GraphImpl* graph); @@ -73,8 +73,8 @@ private: std::unique_ptr<Task> _master; }; -inline Raul::managed_ptr<CompiledGraph> -compile(Raul::Maid& maid, GraphImpl& graph) +inline raul::managed_ptr<CompiledGraph> +compile(raul::Maid& maid, GraphImpl& graph) { return CompiledGraph::compile(maid, graph); } diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 8989c90f..8bf52dfd 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -384,7 +384,7 @@ ControlBindings::finish_learn(RunContext& ctx, Key key) } void -ControlBindings::get_all(const Raul::Path& path, std::vector<Binding*>& bindings) +ControlBindings::get_all(const raul::Path& path, std::vector<Binding*>& bindings) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp index 325ca20e..1c231e22 100644 --- a/src/server/ControlBindings.hpp +++ b/src/server/ControlBindings.hpp @@ -30,7 +30,7 @@ #include <memory> #include <vector> -namespace Raul { class Path; } +namespace raul { class Path; } namespace boost { namespace intrusive { @@ -79,7 +79,7 @@ public: /** One binding of a controller to a port. */ struct Binding : public boost::intrusive::set_base_hook<>, - public Raul::Maid::Disposable { + public raul::Maid::Disposable { Binding(Key k=Key(), PortImpl* p=nullptr) : key(k), port(p) {} inline bool operator<(const Binding& rhs) const { return key < rhs.key; } @@ -118,7 +118,7 @@ public: void post_process(RunContext& ctx, Buffer* buffer); /** Get all bindings for `path` or children of `path`. */ - void get_all(const Raul::Path& path, std::vector<Binding*>& bindings); + void get_all(const raul::Path& path, std::vector<Binding*>& bindings); /** Remove a set of bindings from an earlier call to get_all(). */ void remove(RunContext& ctx, const std::vector<Binding*>& bindings); diff --git a/src/server/DirectDriver.hpp b/src/server/DirectDriver.hpp index c95912d0..7c683493 100644 --- a/src/server/DirectDriver.hpp +++ b/src/server/DirectDriver.hpp @@ -73,7 +73,7 @@ public: return new EnginePort(graph_port); } - EnginePort* get_port(const Raul::Path& path) override { + EnginePort* get_port(const raul::Path& path) override { for (auto& p : _ports) { if (p.graph_port()->path() == path) { return &p; @@ -91,10 +91,10 @@ public: _ports.erase(_ports.iterator_to(*port)); } - void rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) override {} + void rename_port(const raul::Path& old_path, + const raul::Path& new_path) override {} - void port_property(const Raul::Path& path, + void port_property(const raul::Path& path, const URI& uri, const Atom& value) override {} diff --git a/src/server/Driver.hpp b/src/server/Driver.hpp index 59720882..1bc6213d 100644 --- a/src/server/Driver.hpp +++ b/src/server/Driver.hpp @@ -24,7 +24,7 @@ #include <cstddef> -namespace Raul { class Path; } +namespace raul { class Path; } namespace ingen { @@ -44,7 +44,7 @@ class RunContext; * * \ingroup engine */ -class Driver : public Raul::Noncopyable { +class Driver : public raul::Noncopyable { public: virtual ~Driver() = default; @@ -60,7 +60,7 @@ public: virtual EnginePort* create_port(DuplexPort* graph_port) = 0; /** Find a system port by path. */ - virtual EnginePort* get_port(const Raul::Path& path) = 0; + virtual EnginePort* get_port(const raul::Path& path) = 0; /** Add a system visible port (e.g. a port on the root graph). */ virtual void add_port(RunContext& ctx, EnginePort* port) = 0; @@ -83,11 +83,11 @@ public: virtual void unregister_port(EnginePort& port) = 0; /** Rename a system visible port. */ - virtual void rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) = 0; + virtual void rename_port(const raul::Path& old_path, + const raul::Path& new_path) = 0; /** Apply a system visible port property. */ - virtual void port_property(const Raul::Path& path, + virtual void port_property(const raul::Path& path, const URI& uri, const Atom& value) = 0; diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index 64160954..ce516b46 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -43,7 +43,7 @@ namespace server { DuplexPort::DuplexPort(BufferFactory& bufs, GraphImpl* parent, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, uint32_t index, bool polyphonic, PortType type, @@ -92,7 +92,7 @@ DuplexPort::~DuplexPort() DuplexPort* DuplexPort::duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) { BufferFactory& bufs = *engine.buffer_factory(); @@ -148,7 +148,7 @@ DuplexPort::on_property(const URI& uri, const Atom& value) bool DuplexPort::get_buffers(BufferFactory& bufs, PortImpl::GetFn get, - const Raul::managed_ptr<Voices>& voices, + const raul::managed_ptr<Voices>& voices, uint32_t poly, size_t num_in_arcs) const { diff --git a/src/server/DuplexPort.hpp b/src/server/DuplexPort.hpp index 7f39ae89..cdd764a0 100644 --- a/src/server/DuplexPort.hpp +++ b/src/server/DuplexPort.hpp @@ -32,7 +32,7 @@ #include <cstddef> #include <cstdint> -namespace Raul { class Symbol; } +namespace raul { class Symbol; } namespace ingen { @@ -62,7 +62,7 @@ class INGEN_API DuplexPort final public: DuplexPort(BufferFactory& bufs, GraphImpl* parent, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, uint32_t index, bool polyphonic, PortType type, @@ -74,7 +74,7 @@ public: ~DuplexPort() override; DuplexPort* duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent); void inherit_neighbour(const PortImpl* port, @@ -91,7 +91,7 @@ public: bool get_buffers(BufferFactory& bufs, PortImpl::GetFn get, - const Raul::managed_ptr<Voices>& voices, + const raul::managed_ptr<Voices>& voices, uint32_t poly, size_t num_in_arcs) const override; diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 46d70f25..c72d98df 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -85,7 +85,7 @@ Engine::Engine(ingen::World& world) : _world(world) , _options(new LV2Options(world.uris())) , _buffer_factory(new BufferFactory(*this, world.uris())) - , _maid(new Raul::Maid) + , _maid(new raul::Maid) , _worker(new Worker(world.log(), event_queue_size())) , _sync_worker(new Worker(world.log(), event_queue_size(), true)) , _broadcaster(new Broadcaster()) @@ -114,7 +114,7 @@ Engine::Engine(ingen::World& world) for (int i = 0; i < world.conf().option("threads").get<int32_t>(); ++i) { _notifications.emplace_back( - make_unique<Raul::RingBuffer>(uint32_t(24 * event_queue_size()))); + make_unique<raul::RingBuffer>(uint32_t(24 * event_queue_size()))); _run_contexts.emplace_back( make_unique<RunContext>( *this, _notifications.back().get(), unsigned(i), i > 0)); @@ -420,7 +420,7 @@ Engine::activate() enqueue_event( new events::CreateGraph( - *this, nullptr, -1, 0, Raul::Path("/"), properties)); + *this, nullptr, -1, 0, raul::Path("/"), properties)); flush_events(std::chrono::milliseconds(10)); if (!_root_graph) { diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index ec0319ed..b5b6a311 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -35,10 +35,10 @@ #include <random> #include <vector> -namespace Raul { +namespace raul { class Maid; class RingBuffer; -} // namespace Raul +} // namespace raul namespace ingen { @@ -145,7 +145,7 @@ public: const std::unique_ptr<ControlBindings>& control_bindings() const { return _control_bindings; } const std::shared_ptr<Driver>& driver() const { return _driver; } const std::unique_ptr<PostProcessor>& post_processor() const { return _post_processor; } - const std::unique_ptr<Raul::Maid>& maid() const { return _maid; } + const std::unique_ptr<raul::Maid>& maid() const { return _maid; } const std::unique_ptr<UndoStack>& undo_stack() const { return _undo_stack; } const std::unique_ptr<UndoStack>& redo_stack() const { return _redo_stack; } const std::unique_ptr<Worker>& worker() const { return _worker; } @@ -184,7 +184,7 @@ private: std::shared_ptr<LV2Options> _options; std::unique_ptr<BufferFactory> _buffer_factory; - std::unique_ptr<Raul::Maid> _maid; + std::unique_ptr<raul::Maid> _maid; std::shared_ptr<Driver> _driver; std::unique_ptr<Worker> _worker; std::unique_ptr<Worker> _sync_worker; @@ -201,7 +201,7 @@ private: std::unique_ptr<AtomReader> _atom_interface; GraphImpl* _root_graph; - std::vector<std::unique_ptr<Raul::RingBuffer>> _notifications; + std::vector<std::unique_ptr<raul::RingBuffer>> _notifications; std::vector<std::unique_ptr<RunContext>> _run_contexts; uint64_t _cycle_start_time; Load _run_load; diff --git a/src/server/EnginePort.hpp b/src/server/EnginePort.hpp index c0ec11d2..ecfe59b3 100644 --- a/src/server/EnginePort.hpp +++ b/src/server/EnginePort.hpp @@ -33,8 +33,8 @@ namespace server { * * @ingroup engine */ -class EnginePort : public Raul::Noncopyable - , public Raul::Deletable +class EnginePort : public raul::Noncopyable + , public raul::Deletable , public boost::intrusive::slist_base_hook<> { public: diff --git a/src/server/Event.hpp b/src/server/Event.hpp index d8b3de9b..e00aa0d1 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -32,9 +32,9 @@ #include <string> #include <utility> -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace ingen { namespace server { @@ -55,7 +55,7 @@ class PreProcessContext; * * \ingroup engine */ -class Event : public Raul::Deletable, public Raul::Noncopyable +class Event : public raul::Deletable, public raul::Noncopyable { public: /** Event mode to distinguish normal events from undo events. */ @@ -144,7 +144,7 @@ protected: return pre_process_done(st); } - inline bool pre_process_done(Status st, const Raul::Path& subject) { + inline bool pre_process_done(Status st, const raul::Path& subject) { return pre_process_done(st, path_to_uri(subject)); } diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index 15a41a9d..a668312d 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -48,14 +48,14 @@ namespace ingen { namespace server { GraphImpl::GraphImpl(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, uint32_t poly, GraphImpl* parent, SampleRate srate, uint32_t internal_poly) : BlockImpl(new GraphPlugin(engine.world().uris(), engine.world().uris().ingen_Graph, - Raul::Symbol("graph"), + raul::Symbol("graph"), "Ingen Graph"), symbol, poly, parent, srate) , _engine(engine) @@ -78,7 +78,7 @@ GraphImpl::~GraphImpl() BlockImpl* GraphImpl::duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) { BufferFactory& bufs = *engine.buffer_factory(); @@ -190,7 +190,7 @@ GraphImpl::prepare_internal_poly(BufferFactory& bufs, uint32_t poly) bool GraphImpl::apply_internal_poly(RunContext& ctx, BufferFactory& bufs, - Raul::Maid&, + raul::Maid&, uint32_t poly) { // TODO: Subgraph dynamic polyphony (i.e. changing port polyphony) @@ -312,7 +312,7 @@ GraphImpl::has_arc(const PortImpl* tail, const PortImpl* dst_port) const } void -GraphImpl::set_compiled_graph(Raul::managed_ptr<CompiledGraph>&& cg) +GraphImpl::set_compiled_graph(raul::managed_ptr<CompiledGraph>&& cg) { if (_compiled_graph && _compiled_graph != cg) { _engine.reset_load(); @@ -365,13 +365,13 @@ GraphImpl::clear_ports() _outputs.clear(); } -Raul::managed_ptr<BlockImpl::Ports> -GraphImpl::build_ports_array(Raul::Maid& maid) +raul::managed_ptr<BlockImpl::Ports> +GraphImpl::build_ports_array(raul::Maid& maid) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); const size_t n = _inputs.size() + _outputs.size(); - Raul::managed_ptr<Ports> result = maid.make_managed<Ports>(n); + raul::managed_ptr<Ports> result = maid.make_managed<Ports>(n); std::map<size_t, DuplexPort*> ports; for (auto& p : _inputs) { diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp index e085155f..cbbd57de 100644 --- a/src/server/GraphImpl.hpp +++ b/src/server/GraphImpl.hpp @@ -33,9 +33,9 @@ #include <memory> #include <utility> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace boost { namespace intrusive { @@ -67,7 +67,7 @@ class GraphImpl final : public BlockImpl { public: GraphImpl(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, uint32_t poly, GraphImpl* parent, SampleRate srate, @@ -78,7 +78,7 @@ public: GraphType graph_type() const override { return GraphType::GRAPH; } BlockImpl* duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) override; void activate(BufferFactory& bufs) override; @@ -111,7 +111,7 @@ public: */ bool apply_internal_poly(RunContext& ctx, BufferFactory& bufs, - Raul::Maid& maid, + raul::Maid& maid, uint32_t poly); // Graph specific stuff not inherited from Block @@ -184,13 +184,13 @@ public: bool has_arc(const PortImpl* tail, const PortImpl* dst_port) const; /** Set a new compiled graph to run, and return the old one. */ - void set_compiled_graph(Raul::managed_ptr<CompiledGraph>&& cg); + void set_compiled_graph(raul::managed_ptr<CompiledGraph>&& cg); - const Raul::managed_ptr<Ports>& external_ports() { return _ports; } + const raul::managed_ptr<Ports>& external_ports() { return _ports; } - void set_external_ports(Raul::managed_ptr<Ports>&& pa) { _ports = std::move(pa); } + void set_external_ports(raul::managed_ptr<Ports>&& pa) { _ports = std::move(pa); } - Raul::managed_ptr<Ports> build_ports_array(Raul::Maid& maid); + raul::managed_ptr<Ports> build_ports_array(raul::Maid& maid); /** Whether to run this graph's DSP bits in the audio thread */ bool enabled() const { return _process; } @@ -206,7 +206,7 @@ private: Engine& _engine; uint32_t _poly_pre; ///< Pre-process thread only uint32_t _poly_process; ///< Process thread only - Raul::managed_ptr<CompiledGraph> _compiled_graph; ///< Process thread only + raul::managed_ptr<CompiledGraph> _compiled_graph; ///< Process thread only PortList _inputs; ///< Pre-process thread only PortList _outputs; ///< Pre-process thread only Blocks _blocks; ///< Pre-process thread only diff --git a/src/server/GraphPlugin.hpp b/src/server/GraphPlugin.hpp index 0bd00a65..b7a281f5 100644 --- a/src/server/GraphPlugin.hpp +++ b/src/server/GraphPlugin.hpp @@ -43,13 +43,13 @@ class GraphPlugin : public PluginImpl public: GraphPlugin(URIs& uris, const URI& uri, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, const std::string& name) : PluginImpl(uris, uris.ingen_Graph.urid_atom(), uri) {} BlockImpl* instantiate(BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, Engine& engine, @@ -58,7 +58,7 @@ public: return nullptr; } - Raul::Symbol symbol() const override { return Raul::Symbol("graph"); } + raul::Symbol symbol() const override { return raul::Symbol("graph"); } static std::string name() { return "Ingen Graph"; } private: diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index d3a1eea1..10a525cc 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -42,7 +42,7 @@ namespace server { InputPort::InputPort(BufferFactory& bufs, BlockImpl* parent, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, uint32_t index, uint32_t poly, PortType type, @@ -73,7 +73,7 @@ InputPort::apply_poly(RunContext& ctx, const uint32_t poly) bool InputPort::get_buffers(BufferFactory& bufs, PortImpl::GetFn get, - const Raul::managed_ptr<Voices>& voices, + const raul::managed_ptr<Voices>& voices, uint32_t poly, size_t num_in_arcs) const { @@ -104,7 +104,7 @@ InputPort::get_buffers(BufferFactory& bufs, bool InputPort::pre_get_buffers(BufferFactory& bufs, - Raul::managed_ptr<Voices>& voices, + raul::managed_ptr<Voices>& voices, uint32_t poly) const { return get_buffers(bufs, &BufferFactory::get_buffer, voices, poly, _num_arcs); diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp index e39c22a5..9357c3ff 100644 --- a/src/server/InputPort.hpp +++ b/src/server/InputPort.hpp @@ -30,7 +30,7 @@ #include <cstdint> #include <cstdlib> -namespace Raul { class Symbol; } +namespace raul { class Symbol; } namespace boost { namespace intrusive { @@ -66,7 +66,7 @@ class InputPort : public PortImpl public: InputPort(BufferFactory& bufs, BlockImpl* parent, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, uint32_t index, uint32_t poly, PortType type, @@ -105,7 +105,7 @@ public: * connection/disconnection/etc in the next process cycle. */ bool pre_get_buffers(BufferFactory& bufs, - Raul::managed_ptr<Voices>& voices, + raul::managed_ptr<Voices>& voices, uint32_t poly) const; bool @@ -132,7 +132,7 @@ public: protected: bool get_buffers(BufferFactory& bufs, PortImpl::GetFn get, - const Raul::managed_ptr<Voices>& voices, + const raul::managed_ptr<Voices>& voices, uint32_t poly, size_t num_in_arcs) const override; diff --git a/src/server/InternalBlock.cpp b/src/server/InternalBlock.cpp index 7afac475..68e1f3e8 100644 --- a/src/server/InternalBlock.cpp +++ b/src/server/InternalBlock.cpp @@ -32,9 +32,9 @@ #include <cstdint> #include <memory> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -46,7 +46,7 @@ class GraphImpl; class RunContext; InternalBlock::InternalBlock(PluginImpl* plugin, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool poly, GraphImpl* parent, SampleRate rate) @@ -55,7 +55,7 @@ InternalBlock::InternalBlock(PluginImpl* plugin, BlockImpl* InternalBlock::duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) { BufferFactory& bufs = *engine.buffer_factory(); diff --git a/src/server/InternalBlock.hpp b/src/server/InternalBlock.hpp index a7243707..2357f405 100644 --- a/src/server/InternalBlock.hpp +++ b/src/server/InternalBlock.hpp @@ -20,9 +20,9 @@ #include "BlockImpl.hpp" #include "types.hpp" -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { namespace server { @@ -40,13 +40,13 @@ class InternalBlock : public BlockImpl { public: InternalBlock(PluginImpl* plugin, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool poly, GraphImpl* parent, SampleRate rate); BlockImpl* duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) override; void pre_process(RunContext& ctx) override; diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index 384ece0f..7cdf3ef6 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -31,7 +31,7 @@ namespace server { InternalPlugin::InternalPlugin(URIs& uris, const URI& uri, - const Raul::Symbol& symbol) + const raul::Symbol& symbol) : PluginImpl(uris, uris.ingen_Internal.urid_atom(), uri) , _symbol(symbol) { @@ -40,7 +40,7 @@ InternalPlugin::InternalPlugin(URIs& uris, BlockImpl* InternalPlugin::instantiate(BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, Engine& engine, diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp index 6d3fcca6..92993d70 100644 --- a/src/server/InternalPlugin.hpp +++ b/src/server/InternalPlugin.hpp @@ -43,19 +43,19 @@ class InternalPlugin : public PluginImpl public: InternalPlugin(URIs& uris, const URI& uri, - const Raul::Symbol& symbol); + const raul::Symbol& symbol); BlockImpl* instantiate(BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, Engine& engine, const LilvState* state) override; - Raul::Symbol symbol() const override { return _symbol; } + raul::Symbol symbol() const override { return _symbol; } private: - const Raul::Symbol _symbol; + const raul::Symbol _symbol; }; } // namespace server diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index 434b09c7..f03689cb 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -195,7 +195,7 @@ JackDriver::deactivate() } EnginePort* -JackDriver::get_port(const Raul::Path& path) +JackDriver::get_port(const raul::Path& path) { for (auto& p : _ports) { if (p.graph_port()->path() == path) { @@ -266,8 +266,8 @@ JackDriver::unregister_port(EnginePort& port) } void -JackDriver::rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) +JackDriver::rename_port(const raul::Path& old_path, + const raul::Path& new_path) { EnginePort* eport = get_port(old_path); if (eport) { @@ -283,7 +283,7 @@ JackDriver::rename_port(const Raul::Path& old_path, } void -JackDriver::port_property(const Raul::Path& path, +JackDriver::port_property(const raul::Path& path, const URI& uri, const Atom& value) { diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp index c94cb790..d4ea03d0 100644 --- a/src/server/JackDriver.hpp +++ b/src/server/JackDriver.hpp @@ -38,9 +38,9 @@ #include <memory> #include <string> -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace boost { namespace intrusive { @@ -85,10 +85,10 @@ public: bool dynamic_ports() const override { return true; } EnginePort* create_port(DuplexPort* graph_port) override; - EnginePort* get_port(const Raul::Path& path) override; + EnginePort* get_port(const raul::Path& path) override; - void rename_port(const Raul::Path& old_path, const Raul::Path& new_path) override; - void port_property(const Raul::Path& path, const URI& uri, const Atom& value) override; + void rename_port(const raul::Path& old_path, const raul::Path& new_path) override; + void port_property(const raul::Path& path, const URI& uri, const Atom& value) override; void add_port(RunContext& ctx, EnginePort* port) override; void remove_port(RunContext& ctx, EnginePort* port) override; void register_port(EnginePort& port) override; @@ -154,7 +154,7 @@ protected: Ports _ports; AudioBufPtr _fallback_buffer; LV2_Atom_Forge _forge; - Raul::Semaphore _sem; + raul::Semaphore _sem; std::atomic<bool> _flag; jack_client_t* _client; jack_nframes_t _block_length; diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index 02e0a407..026b7d06 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -64,7 +64,7 @@ namespace server { * (It _will_ crash!) */ LV2Block::LV2Block(LV2Plugin* plugin, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate) @@ -257,7 +257,7 @@ LV2Block::instantiate(BufferFactory& bufs, const LilvState* state) /* LV2 port symbols are guaranteed to be unique, valid C identifiers, and Lilv guarantees that lilv_port_get_symbol() is valid. */ - const Raul::Symbol port_sym( + const raul::Symbol port_sym( lilv_node_as_string(lilv_port_get_symbol(plug, id))); // Get port type @@ -514,7 +514,7 @@ LV2Block::save_state(const FilePath& dir) const BlockImpl* LV2Block::duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) { const SampleRate rate = engine.sample_rate(); diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index 0e3e5995..c8f9e59a 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -41,9 +41,9 @@ #include <memory> #include <mutex> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace boost { namespace intrusive { @@ -81,7 +81,7 @@ class LV2Block final : public BlockImpl { public: LV2Block(LV2Plugin* plugin, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate); @@ -94,7 +94,7 @@ public: bool save_state(const FilePath& dir) const override; BlockImpl* duplicate(Engine& engine, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, GraphImpl* parent) override; bool prepare_poly(BufferFactory& bufs, uint32_t poly) override; @@ -124,7 +124,7 @@ public: static StatePtr load_state(World& world, const FilePath& path); protected: - struct Instance : public Raul::Noncopyable { + struct Instance : public raul::Noncopyable { explicit Instance(LilvInstance* i) : instance(i) {} ~Instance() { lilv_instance_free(instance); } @@ -139,9 +139,9 @@ protected: return static_cast<LilvInstance*>((*_instances)[voice]->instance); } - using Instances = Raul::Array<std::shared_ptr<Instance>>; + using Instances = raul::Array<std::shared_ptr<Instance>>; - static void drop_instances(const Raul::managed_ptr<Instances>& instances) { + static void drop_instances(const raul::managed_ptr<Instances>& instances) { if (instances) { for (size_t i = 0; i < instances->size(); ++i) { (*instances)[i].reset(); @@ -149,8 +149,8 @@ protected: } } - struct Response : public Raul::Maid::Disposable - , public Raul::Noncopyable + struct Response : public raul::Maid::Disposable + , public raul::Noncopyable , public boost::intrusive::slist_base_hook<> { inline Response(uint32_t s, const void* d) @@ -177,8 +177,8 @@ protected: LV2_Worker_Respond_Handle handle, uint32_t size, const void* data); LV2Plugin* _lv2_plugin; - Raul::managed_ptr<Instances> _instances; - Raul::managed_ptr<Instances> _prepared_instances; + raul::managed_ptr<Instances> _instances; + raul::managed_ptr<Instances> _prepared_instances; const LV2_Worker_Interface* _worker_iface; std::mutex _work_mutex; Responses _responses; diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index 1411be1d..7a43ba67 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -65,7 +65,7 @@ LV2Plugin::update_properties() lilv_node_free(micro); } -Raul::Symbol +raul::Symbol LV2Plugin::symbol() const { std::string working = uri(); @@ -78,18 +78,18 @@ LV2Plugin::symbol() const const std::string symbol = working.substr(last_slash+1); if ( (symbol[0] >= 'a' && symbol[0] <= 'z') || (symbol[0] >= 'A' && symbol[0] <= 'Z') ) { - return Raul::Symbol::symbolify(symbol); + return raul::Symbol::symbolify(symbol); } else { working = working.substr(0, last_slash); } } - return Raul::Symbol("lv2_symbol"); + return raul::Symbol("lv2_symbol"); } BlockImpl* LV2Plugin::instantiate(BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, Engine& engine, diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp index 24d764cc..fa007327 100644 --- a/src/server/LV2Plugin.hpp +++ b/src/server/LV2Plugin.hpp @@ -42,13 +42,13 @@ public: LV2Plugin(World& world, const LilvPlugin* lplugin); BlockImpl* instantiate(BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, Engine& engine, const LilvState* state) override; - Raul::Symbol symbol() const override; + raul::Symbol symbol() const override; World& world() const { return _world; } const LilvPlugin* lilv_plugin() const { return _lilv_plugin; } diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp index e72aa50a..d914ae1c 100644 --- a/src/server/NodeImpl.cpp +++ b/src/server/NodeImpl.cpp @@ -32,10 +32,10 @@ namespace server { NodeImpl::NodeImpl(const ingen::URIs& uris, NodeImpl* parent, - const Raul::Symbol& symbol) - : Node(uris, parent ? parent->path().child(symbol) : Raul::Path("/")) + const raul::Symbol& symbol) + : Node(uris, parent ? parent->path().child(symbol) : raul::Path("/")) , _parent(parent) - , _path(parent ? parent->path().child(symbol) : Raul::Path("/")) + , _path(parent ? parent->path().child(symbol) : raul::Path("/")) , _symbol(symbol) { } diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp index 6a61c852..8acce161 100644 --- a/src/server/NodeImpl.hpp +++ b/src/server/NodeImpl.hpp @@ -38,7 +38,7 @@ class RunContext; /** An object on the audio graph (a Graph, Block, or Port). * - * Each of these is a Raul::Deletable and so can be deleted in a realtime safe + * Each of these is a raul::Deletable and so can be deleted in a realtime safe * way from anywhere, and they all have a map of variable for clients to store * arbitrary values in (which the engine puts no significance to whatsoever). * @@ -47,17 +47,17 @@ class RunContext; class NodeImpl : public Node { public: - const Raul::Symbol& symbol() const override { return _symbol; } + const raul::Symbol& symbol() const override { return _symbol; } Node* graph_parent() const override { return _parent; } NodeImpl* parent() const { return _parent; } /** Rename */ - void set_path(const Raul::Path& new_path) override { + void set_path(const raul::Path& new_path) override { _path = new_path; const char* const new_sym = new_path.symbol(); if (new_sym[0] != '\0') { - _symbol = Raul::Symbol(new_sym); + _symbol = raul::Symbol(new_sym); } set_uri(path_to_uri(new_path)); } @@ -67,7 +67,7 @@ public: /** The Graph this object is a child of. */ virtual GraphImpl* parent_graph() const; - const Raul::Path& path() const override { return _path; } + const raul::Path& path() const override { return _path; } /** Prepare for a new (external) polyphony value. * @@ -94,11 +94,11 @@ public: protected: NodeImpl(const ingen::URIs& uris, NodeImpl* parent, - const Raul::Symbol& symbol); + const raul::Symbol& symbol); NodeImpl* _parent; - Raul::Path _path; - Raul::Symbol _symbol; + raul::Path _path; + raul::Symbol _symbol; }; } // namespace server diff --git a/src/server/OutputPort.hpp b/src/server/OutputPort.hpp index 775e3093..61fb44f5 100644 --- a/src/server/OutputPort.hpp +++ b/src/server/OutputPort.hpp @@ -25,9 +25,9 @@ #include <cstddef> #include <cstdint> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -50,7 +50,7 @@ class OutputPort : public PortImpl public: OutputPort(BufferFactory& bufs, BlockImpl* parent, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, uint32_t index, uint32_t poly, PortType type, diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp index b9e42366..3d7d596f 100644 --- a/src/server/PluginImpl.hpp +++ b/src/server/PluginImpl.hpp @@ -57,13 +57,13 @@ public: PluginImpl& operator=(const PluginImpl&) = delete; virtual BlockImpl* instantiate(BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, Engine& engine, const LilvState* state) = 0; - virtual Raul::Symbol symbol() const = 0; + virtual raul::Symbol symbol() const = 0; const Atom& type() const { return _type; } void set_type(const Atom& t) { _type = t; } diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp index 98490f76..fcb9cf67 100644 --- a/src/server/PortAudioDriver.cpp +++ b/src/server/PortAudioDriver.cpp @@ -159,7 +159,7 @@ PortAudioDriver::frame_time() const } EnginePort* -PortAudioDriver::get_port(const Raul::Path& path) +PortAudioDriver::get_port(const raul::Path& path) { for (auto& p : _ports) { if (p.graph_port()->path() == path) { @@ -193,13 +193,13 @@ PortAudioDriver::unregister_port(EnginePort& port) } void -PortAudioDriver::rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) +PortAudioDriver::rename_port(const raul::Path& old_path, + const raul::Path& new_path) { } void -PortAudioDriver::port_property(const Raul::Path& path, +PortAudioDriver::port_property(const raul::Path& path, const URI& uri, const Atom& value) { diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp index 971f022a..5f2bf7a1 100644 --- a/src/server/PortAudioDriver.hpp +++ b/src/server/PortAudioDriver.hpp @@ -32,7 +32,7 @@ #include <cstdint> #include <memory> -namespace Raul { class Path; } +namespace raul { class Path; } namespace boost { namespace intrusive { @@ -67,10 +67,10 @@ public: void deactivate() override; EnginePort* create_port(DuplexPort* graph_port) override; - EnginePort* get_port(const Raul::Path& path) override; + EnginePort* get_port(const raul::Path& path) override; - void rename_port(const Raul::Path& old_path, const Raul::Path& new_path) override; - void port_property(const Raul::Path& path, const URI& uri, const Atom& value) override; + void rename_port(const raul::Path& old_path, const raul::Path& new_path) override; + void port_property(const raul::Path& path, const URI& uri, const Atom& value) override; void add_port(RunContext& ctx, EnginePort* port) override; void remove_port(RunContext& ctx, EnginePort* port) override; void register_port(EnginePort& port) override; @@ -124,7 +124,7 @@ protected: Ports _ports; PaStreamParameters _inputParameters; PaStreamParameters _outputParameters; - Raul::Semaphore _sem; + raul::Semaphore _sem; std::unique_ptr<FrameTimer> _timer; PaStream* _stream; size_t _seq_size; diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index 987b6cf7..68392707 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -54,7 +54,7 @@ monitor_period(const Engine& engine) PortImpl::PortImpl(BufferFactory& bufs, BlockImpl* const block, - const Raul::Symbol& name, + const raul::Symbol& name, uint32_t index, uint32_t poly, PortType type, @@ -118,7 +118,7 @@ PortImpl::PortImpl(BufferFactory& bufs, bool PortImpl::get_buffers(BufferFactory& bufs, GetFn get, - const Raul::managed_ptr<Voices>& voices, + const raul::managed_ptr<Voices>& voices, uint32_t poly, size_t) const { @@ -216,7 +216,7 @@ PortImpl::deactivate() } void -PortImpl::set_voices(RunContext&, Raul::managed_ptr<Voices>&& voices) +PortImpl::set_voices(RunContext&, raul::managed_ptr<Voices>&& voices) { _voices = std::move(voices); connect_buffers(); diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 954db09c..d79bb6cd 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -37,9 +37,9 @@ #include <cstdlib> #include <utility> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -97,11 +97,11 @@ public: BufferRef buffer; }; - using Voices = Raul::Array<Voice>; + using Voices = raul::Array<Voice>; PortImpl(BufferFactory& bufs, BlockImpl* block, - const Raul::Symbol& name, + const raul::Symbol& name, uint32_t index, uint32_t poly, PortType type, @@ -116,7 +116,7 @@ public: BlockImpl* parent_block() const { return reinterpret_cast<BlockImpl*>(_parent); } /** Set the the voices (buffers) for this port in the audio thread. */ - void set_voices(RunContext& ctx, Raul::managed_ptr<Voices>&& voices); + void set_voices(RunContext& ctx, raul::managed_ptr<Voices>&& voices); /** Prepare for a new (external) polyphony value. * @@ -291,7 +291,7 @@ protected: */ virtual bool get_buffers(BufferFactory& bufs, GetFn get, - const Raul::managed_ptr<Voices>& voices, + const raul::managed_ptr<Voices>& voices, uint32_t poly, size_t num_in_arcs) const; @@ -307,8 +307,8 @@ protected: Atom _value; Atom _min; Atom _max; - Raul::managed_ptr<Voices> _voices; - Raul::managed_ptr<Voices> _prepared_voices; + raul::managed_ptr<Voices> _voices; + raul::managed_ptr<Voices> _prepared_voices; BufferRef _user_buffer; std::atomic_flag _connected_flag; bool _monitored; diff --git a/src/server/PreProcessContext.hpp b/src/server/PreProcessContext.hpp index dba6cf9d..fa7d07c5 100644 --- a/src/server/PreProcessContext.hpp +++ b/src/server/PreProcessContext.hpp @@ -63,8 +63,8 @@ public: * This may return null when an atomic bundle is deferring compilation, in * which case the graph is flagged as dirty for later compilation. */ - Raul::Maid::managed_ptr<CompiledGraph> - maybe_compile(Raul::Maid& maid, GraphImpl& graph) + raul::Maid::managed_ptr<CompiledGraph> + maybe_compile(raul::Maid& maid, GraphImpl& graph) { if (must_compile(graph)) { return compile(maid, graph); diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp index 54f185c3..05027638 100644 --- a/src/server/PreProcessor.hpp +++ b/src/server/PreProcessor.hpp @@ -76,7 +76,7 @@ private: Engine& _engine; std::mutex _mutex; - Raul::Semaphore _sem; + raul::Semaphore _sem; std::atomic<Event*> _head; std::atomic<Event*> _tail; std::atomic<BlockState> _block_state; diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp index c5cd5f3f..a61e4afb 100644 --- a/src/server/RunContext.cpp +++ b/src/server/RunContext.cpp @@ -58,7 +58,7 @@ struct Notification }; RunContext::RunContext(Engine& engine, - Raul::RingBuffer* event_sink, + raul::RingBuffer* event_sink, unsigned id, bool threaded) : _engine(engine) diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp index bc09f7c3..92aa1cf8 100644 --- a/src/server/RunContext.hpp +++ b/src/server/RunContext.hpp @@ -57,7 +57,7 @@ public: * a thread and execute tasks as they become available. */ RunContext(Engine& engine, - Raul::RingBuffer* event_sink, + raul::RingBuffer* event_sink, unsigned id, bool threaded); @@ -144,7 +144,7 @@ protected: void run(); Engine& _engine; ///< Engine we're running in - Raul::RingBuffer* _event_sink; ///< Updates from process context + raul::RingBuffer* _event_sink; ///< Updates from process context Task* _task; ///< Currently executing task std::unique_ptr<std::thread> _thread; ///< Thread (or null for main) unsigned _id; ///< Context ID diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp index 8492bf8a..445374c4 100644 --- a/src/server/SocketListener.cpp +++ b/src/server/SocketListener.cpp @@ -67,13 +67,13 @@ get_link_target(const char* link_path) } static void ingen_listen(Engine* engine, - Raul::Socket* unix_sock, - Raul::Socket* net_sock); + raul::Socket* unix_sock, + raul::Socket* net_sock); SocketListener::SocketListener(Engine& engine) - : unix_sock(Raul::Socket::Type::UNIX) - , net_sock(Raul::Socket::Type::TCP) + : unix_sock(raul::Socket::Type::UNIX) + , net_sock(raul::Socket::Type::TCP) , thread(new std::thread(ingen_listen, &engine, &unix_sock, &net_sock)) {} @@ -85,7 +85,7 @@ SocketListener::~SocketListener() { } static void -ingen_listen(Engine* engine, Raul::Socket* unix_sock, Raul::Socket* net_sock) +ingen_listen(Engine* engine, raul::Socket* unix_sock, raul::Socket* net_sock) { ingen::World& world = engine->world(); diff --git a/src/server/SocketListener.hpp b/src/server/SocketListener.hpp index 21070c23..70a2d46b 100644 --- a/src/server/SocketListener.hpp +++ b/src/server/SocketListener.hpp @@ -32,8 +32,8 @@ public: ~SocketListener(); private: - Raul::Socket unix_sock; - Raul::Socket net_sock; + raul::Socket unix_sock; + raul::Socket net_sock; std::unique_ptr<std::thread> thread; }; diff --git a/src/server/SocketServer.hpp b/src/server/SocketServer.hpp index 464ef657..ac8aa611 100644 --- a/src/server/SocketServer.hpp +++ b/src/server/SocketServer.hpp @@ -46,7 +46,7 @@ class SocketServer public: SocketServer(World& world, server::Engine& engine, - const std::shared_ptr<Raul::Socket>& sock) + const std::shared_ptr<raul::Socket>& sock) : _engine(engine) , _sink(world.conf().option("dump").get<int32_t>() ? std::shared_ptr<Interface>( diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp index 02533298..dd799174 100644 --- a/src/server/Worker.hpp +++ b/src/server/Worker.hpp @@ -63,9 +63,9 @@ private: std::shared_ptr<Schedule> _schedule; Log& _log; - Raul::Semaphore _sem; - Raul::RingBuffer _requests; - Raul::RingBuffer _responses; + raul::Semaphore _sem; + raul::RingBuffer _requests; + raul::RingBuffer _responses; uint8_t* const _buffer; const uint32_t _buffer_size; std::unique_ptr<std::thread> _thread; diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index e9eadff0..941c0a25 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -66,9 +66,9 @@ private: const ingen::Connect _msg; GraphImpl* _graph; InputPort* _head; - Raul::managed_ptr<CompiledGraph> _compiled_graph; + raul::managed_ptr<CompiledGraph> _compiled_graph; std::shared_ptr<ArcImpl> _arc; - Raul::managed_ptr<PortImpl::Voices> _voices; + raul::managed_ptr<PortImpl::Voices> _voices; Properties _tail_remove; Properties _tail_add; Properties _head_remove; diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 3f7fa52e..9ce7ead6 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -66,7 +66,7 @@ Copy::pre_process(PreProcessContext& ctx) if (uri_is_path(_msg.old_uri)) { // Old URI is a path within the engine - const Raul::Path old_path = uri_to_path(_msg.old_uri); + const raul::Path old_path = uri_to_path(_msg.old_uri); // Find the old node const Store::iterator i = _engine.store()->find(old_path); @@ -104,8 +104,8 @@ bool Copy::engine_to_engine(PreProcessContext& ctx) { // Only support a single source for now - const Raul::Path new_path = uri_to_path(_msg.new_uri); - if (!Raul::Symbol::is_valid(new_path.symbol())) { + const raul::Path new_path = uri_to_path(_msg.new_uri); + if (!raul::Symbol::is_valid(new_path.symbol())) { return Event::pre_process_done(Status::BAD_REQUEST); } @@ -115,7 +115,7 @@ Copy::engine_to_engine(PreProcessContext& ctx) } // Find new parent graph - const Raul::Path parent_path = new_path.parent(); + const raul::Path parent_path = new_path.parent(); const Store::iterator p = _engine.store()->find(parent_path); if (p == _engine.store()->end()) { return Event::pre_process_done(Status::NOT_FOUND, parent_path); @@ -126,7 +126,7 @@ Copy::engine_to_engine(PreProcessContext& ctx) // Create new block if (!(_block = dynamic_cast<BlockImpl*>( - _old_block->duplicate(_engine, Raul::Symbol(new_path.symbol()), _parent)))) { + _old_block->duplicate(_engine, raul::Symbol(new_path.symbol()), _parent)))) { return Event::pre_process_done(Status::INTERNAL_ERROR); } @@ -189,12 +189,12 @@ Copy::filesystem_to_engine(PreProcessContext&) // Old URI is a filesystem path and new URI is a path within the engine const std::string src_path(_msg.old_uri.path()); - const Raul::Path dst_path = uri_to_path(_msg.new_uri); - boost::optional<Raul::Path> dst_parent; - boost::optional<Raul::Symbol> dst_symbol; + const raul::Path dst_path = uri_to_path(_msg.new_uri); + boost::optional<raul::Path> dst_parent; + boost::optional<raul::Symbol> dst_symbol; if (!dst_path.is_root()) { dst_parent = dst_path.parent(); - dst_symbol = Raul::Symbol(dst_path.symbol()); + dst_symbol = raul::Symbol(dst_path.symbol()); } _engine.world().parser()->parse_file( diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index b133a6d6..f9c507f0 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -67,7 +67,7 @@ private: std::shared_ptr<BlockImpl> _old_block; GraphImpl* _parent; BlockImpl* _block; - Raul::managed_ptr<CompiledGraph> _compiled_graph; + raul::managed_ptr<CompiledGraph> _compiled_graph; }; } // namespace events diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index 4c675f2f..9888b578 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -59,7 +59,7 @@ CreateBlock::CreateBlock(Engine& engine, const std::shared_ptr<Interface>& client, int32_t id, SampleCount timestamp, - const Raul::Path& path, + const raul::Path& path, Properties& properties) : Event(engine, client, id, timestamp) , _path(path) @@ -120,7 +120,7 @@ CreateBlock::pre_process(PreProcessContext& ctx) if (!ancestor) { return Event::pre_process_done(Status::PROTOTYPE_NOT_FOUND, prototype); } else if (!(_block = ancestor->duplicate( - _engine, Raul::Symbol(_path.symbol()), _graph))) { + _engine, raul::Symbol(_path.symbol()), _graph))) { return Event::pre_process_done(Status::CREATION_FAILED, _path); } @@ -147,7 +147,7 @@ CreateBlock::pre_process(PreProcessContext& ctx) // Instantiate plugin if (!(_block = plugin->instantiate(*_engine.buffer_factory(), - Raul::Symbol(_path.symbol()), + raul::Symbol(_path.symbol()), polyphonic, _graph, _engine, diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index 3da589c7..53eff006 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -54,7 +54,7 @@ public: const std::shared_ptr<Interface>& client, int32_t id, SampleCount timestamp, - const Raul::Path& path, + const raul::Path& path, Properties& properties); ~CreateBlock() override; @@ -65,12 +65,12 @@ public: void undo(Interface& target) override; private: - Raul::Path _path; + raul::Path _path; Properties& _properties; ClientUpdate _update; GraphImpl* _graph; BlockImpl* _block; - Raul::managed_ptr<CompiledGraph> _compiled_graph; + raul::managed_ptr<CompiledGraph> _compiled_graph; }; } // namespace events diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index e5dbb55b..ea66ae55 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -54,7 +54,7 @@ CreateGraph::CreateGraph(Engine& engine, const std::shared_ptr<Interface>& client, int32_t id, SampleCount timestamp, - const Raul::Path& path, + const raul::Path& path, const Properties& properties) : Event(engine, client, id, timestamp) , _path(path) @@ -91,7 +91,7 @@ CreateGraph::build_child_events() _child_events.push_back( make_unique<events::CreatePort>(_engine, _request_client, -1, _time, - _path.child(Raul::Symbol("control")), + _path.child(raul::Symbol("control")), in_properties)); // Add notify port (message respond) @@ -106,7 +106,7 @@ CreateGraph::build_child_events() _child_events.push_back( make_unique<events::CreatePort>(_engine, _request_client, -1, _time, - _path.child(Raul::Symbol("notify")), + _path.child(raul::Symbol("notify")), out_properties)); } @@ -118,7 +118,7 @@ CreateGraph::pre_process(PreProcessContext& ctx) } if (!_path.is_root()) { - const Raul::Path up(_path.parent()); + const raul::Path up(_path.parent()); if (!(_parent = dynamic_cast<GraphImpl*>(_engine.store()->get(up)))) { return Event::pre_process_done(Status::PARENT_NOT_FOUND, up); } @@ -143,7 +143,7 @@ CreateGraph::pre_process(PreProcessContext& ctx) ext_poly = int_poly; } - const Raul::Symbol symbol(_path.is_root() ? "graph" : _path.symbol()); + const raul::Symbol symbol(_path.is_root() ? "graph" : _path.symbol()); // Get graph prototype iterator t = _properties.find(uris.lv2_prototype); diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index 6c49feda..e502c4e8 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -54,7 +54,7 @@ public: const std::shared_ptr<Interface>& client, int32_t id, SampleCount timestamp, - const Raul::Path& path, + const raul::Path& path, const Properties& properties); ~CreateGraph() override; @@ -69,12 +69,12 @@ public: private: void build_child_events(); - const Raul::Path _path; + const raul::Path _path; Properties _properties; ClientUpdate _update; GraphImpl* _graph; GraphImpl* _parent; - Raul::managed_ptr<CompiledGraph> _compiled_graph; + raul::managed_ptr<CompiledGraph> _compiled_graph; std::list<std::unique_ptr<Event>> _child_events; }; diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index 2b0c00a5..71b37735 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -53,7 +53,7 @@ CreatePort::CreatePort(Engine& engine, const std::shared_ptr<Interface>& client, int32_t id, SampleCount timestamp, - const Raul::Path& path, + const raul::Path& path, const Properties& properties) : Event(engine, client, id, timestamp) , _path(path) @@ -107,7 +107,7 @@ CreatePort::pre_process(PreProcessContext&) return Event::pre_process_done(Status::EXISTS, _path); } - const Raul::Path parent_path = _path.parent(); + const raul::Path parent_path = _path.parent(); Node* const parent = _engine.store()->get(parent_path); if (!parent) { return Event::pre_process_done(Status::PARENT_NOT_FOUND, parent_path); @@ -156,7 +156,7 @@ CreatePort::pre_process(PreProcessContext&) } // Create port - _graph_port = new DuplexPort(bufs, _graph, Raul::Symbol(_path.symbol()), + _graph_port = new DuplexPort(bufs, _graph, raul::Symbol(_path.symbol()), index, polyphonic, _port_type, _buf_type, buf_size, diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index 196ca5b9..351f0159 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -58,7 +58,7 @@ public: const std::shared_ptr<Interface>& client, int32_t id, SampleCount timestamp, - const Raul::Path& path, + const raul::Path& path, const Properties& properties); bool pre_process(PreProcessContext& ctx) override; @@ -72,12 +72,12 @@ private: OUTPUT }; - Raul::Path _path; + raul::Path _path; PortType _port_type; LV2_URID _buf_type; GraphImpl* _graph; DuplexPort* _graph_port; - Raul::managed_ptr<BlockImpl::Ports> _ports_array; ///< New external port array for Graph + raul::managed_ptr<BlockImpl::Ports> _ports_array; ///< New external port array for Graph EnginePort* _engine_port; ///< Driver port if on the root Properties _properties; Properties _update; diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index cac28750..50a925b5 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -71,15 +71,15 @@ public: private: using IndexChange = std::pair<uint32_t, uint32_t>; - using IndexChanges = std::map<Raul::Path, IndexChange>; + using IndexChanges = std::map<raul::Path, IndexChange>; const ingen::Del _msg; - Raul::Path _path; + raul::Path _path; std::shared_ptr<BlockImpl> _block; ///< Non-null iff a block std::shared_ptr<DuplexPort> _port; ///< Non-null iff a port EnginePort* _engine_port; - Raul::managed_ptr<GraphImpl::Ports> _ports_array; ///< New (external) ports for Graph - Raul::managed_ptr<CompiledGraph> _compiled_graph; ///< Graph's new process order + raul::managed_ptr<GraphImpl::Ports> _ports_array; ///< New (external) ports for Graph + raul::managed_ptr<CompiledGraph> _compiled_graph; ///< Graph's new process order std::unique_ptr<DisconnectAll> _disconnect_event; Store::Objects _removed_objects; IndexChanges _port_index_changes; diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index e441f2fe..034b2194 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -240,7 +240,7 @@ Delta::pre_process(PreProcessContext& ctx) } if (is_graph_object && !_object) { - Raul::Path path(uri_to_path(_subject)); + raul::Path path(uri_to_path(_subject)); bool is_graph = false; bool is_block = false; diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index f28832a2..726d8b48 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -117,7 +117,7 @@ private: ClientUpdate _update; ingen::Resource* _object; GraphImpl* _graph; - Raul::managed_ptr<CompiledGraph> _compiled_graph; + raul::managed_ptr<CompiledGraph> _compiled_graph; ControlBindings::Binding* _binding; StatePtr _state; Resource::Graph _context; diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index 7f8a1594..a835ed27 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -75,14 +75,14 @@ public: PortImpl* _tail; InputPort* _head; std::shared_ptr<ArcImpl> _arc; - Raul::managed_ptr<PortImpl::Voices> _voices; + raul::managed_ptr<PortImpl::Voices> _voices; }; private: const ingen::Disconnect _msg; GraphImpl* _graph; std::unique_ptr<Impl> _impl; - Raul::managed_ptr<CompiledGraph> _compiled_graph; + raul::managed_ptr<CompiledGraph> _compiled_graph; }; } // namespace events diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index 4560fe85..a527dc34 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -75,7 +75,7 @@ private: BlockImpl* _block; PortImpl* _port; Impls _impls; - Raul::managed_ptr<CompiledGraph> _compiled_graph; + raul::managed_ptr<CompiledGraph> _compiled_graph; bool _deleting; }; diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index e651b1e7..7ebab080 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -74,7 +74,7 @@ private: enum class Type { BUNDLE_BEGIN, BUNDLE_END }; using CompiledGraphs = - std::map<GraphImpl*, Raul::managed_ptr<CompiledGraph>>; + std::map<GraphImpl*, raul::managed_ptr<CompiledGraph>>; CompiledGraphs _compiled_graphs; Type _type; diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 97b6a18c..d709e41a 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -219,7 +219,7 @@ public: virtual void set_root_graph(GraphImpl* graph) { _root_graph = graph; } virtual GraphImpl* root_graph() { return _root_graph; } - EnginePort* get_port(const Raul::Path& path) override { + EnginePort* get_port(const raul::Path& path) override { for (auto& p : _ports) { if (p->graph_port()->path() == path) { return p; @@ -251,11 +251,11 @@ public: void unregister_port(EnginePort& port) override {} /** Unused since LV2 has no dynamic ports. */ - void rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) override {} + void rename_port(const raul::Path& old_path, + const raul::Path& new_path) override {} /** Unused since LV2 has no dynamic ports. */ - void port_property(const Raul::Path& path, + void port_property(const raul::Path& path, const URI& uri, const Atom& value) override {} @@ -296,7 +296,7 @@ public: return true; } - Raul::Semaphore& main_sem() { return _main_sem; } + raul::Semaphore& main_sem() { return _main_sem; } /** AtomSink::write implementation called by the PostProcessor in the main * thread to write responses to the UI. @@ -408,18 +408,18 @@ public: private: Engine& _engine; Ports _ports; - Raul::Semaphore _main_sem; + raul::Semaphore _main_sem; AtomReader _reader; AtomWriter _writer; - Raul::RingBuffer _from_ui; - Raul::RingBuffer _to_ui; + raul::RingBuffer _from_ui; + raul::RingBuffer _to_ui; GraphImpl* _root_graph; uint32_t _notify_capacity; SampleCount _block_length; size_t _seq_size; SampleCount _sample_rate; SampleCount _frame_time; - Raul::Semaphore _to_ui_overflow_sem; + raul::Semaphore _to_ui_overflow_sem; bool _to_ui_overflow; bool _instantiated; }; @@ -713,7 +713,7 @@ ingen_save(LV2_Handle instance, char* real_path = make_path->path(make_path->handle, "main.ttl"); char* state_path = map_path->abstract_path(map_path->handle, real_path); - auto root = plugin->world->store()->find(Raul::Path("/")); + auto root = plugin->world->store()->find(raul::Path("/")); { std::lock_guard<std::mutex> lock(plugin->world->rdf_mutex()); diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp index 682438cc..68252fe4 100644 --- a/src/server/internals/BlockDelay.cpp +++ b/src/server/internals/BlockDelay.cpp @@ -42,12 +42,12 @@ namespace internals { InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) { return new InternalPlugin( - uris, URI(NS_INTERNALS "BlockDelay"), Raul::Symbol("blockDelay")); + uris, URI(NS_INTERNALS "BlockDelay"), raul::Symbol("blockDelay")); } BlockDelayNode::BlockDelayNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate) @@ -56,12 +56,12 @@ BlockDelayNode::BlockDelayNode(InternalPlugin* plugin, const ingen::URIs& uris = bufs.uris(); _ports = bufs.maid().make_managed<Ports>(2); - _in_port = new InputPort(bufs, this, Raul::Symbol("in"), 0, 1, + _in_port = new InputPort(bufs, this, raul::Symbol("in"), 0, 1, PortType::AUDIO, 0, bufs.forge().make(0.0f)); _in_port->set_property(uris.lv2_name, bufs.forge().alloc("In")); _ports->at(0) = _in_port; - _out_port = new OutputPort(bufs, this, Raul::Symbol("out"), 0, 1, + _out_port = new OutputPort(bufs, this, raul::Symbol("out"), 0, 1, PortType::AUDIO, 0, bufs.forge().make(0.0f)); _out_port->set_property(uris.lv2_name, bufs.forge().alloc("Out")); _ports->at(1) = _out_port; diff --git a/src/server/internals/BlockDelay.hpp b/src/server/internals/BlockDelay.hpp index 2b523e37..78a03c28 100644 --- a/src/server/internals/BlockDelay.hpp +++ b/src/server/internals/BlockDelay.hpp @@ -21,9 +21,9 @@ #include "InternalBlock.hpp" #include "types.hpp" -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -45,7 +45,7 @@ class BlockDelayNode : public InternalBlock public: BlockDelayNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate); diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 12786dac..d0d8cd39 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -50,12 +50,12 @@ namespace internals { InternalPlugin* ControllerNode::internal_plugin(URIs& uris) { return new InternalPlugin( - uris, URI(NS_INTERNALS "Controller"), Raul::Symbol("controller")); + uris, URI(NS_INTERNALS "Controller"), raul::Symbol("controller")); } ControllerNode::ControllerNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate) @@ -69,21 +69,21 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, const Atom one = bufs.forge().make(1.0f); const Atom atom_Float = bufs.forge().make_urid(URI(LV2_ATOM__Float)); - _midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1, + _midi_in_port = new InputPort(bufs, this, raul::Symbol("input"), 0, 1, PortType::ATOM, uris.atom_Sequence, Atom()); _midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input")); _midi_in_port->set_property(uris.atom_supports, bufs.forge().make_urid(uris.midi_MidiEvent)); _ports->at(0) = _midi_in_port; - _midi_out_port = new OutputPort(bufs, this, Raul::Symbol("event"), 1, 1, + _midi_out_port = new OutputPort(bufs, this, raul::Symbol("event"), 1, 1, PortType::ATOM, uris.atom_Sequence, Atom()); _midi_out_port->set_property(uris.lv2_name, bufs.forge().alloc("Event")); _midi_out_port->set_property(uris.atom_supports, bufs.forge().make_urid(uris.midi_MidiEvent)); _ports->at(1) = _midi_out_port; - _param_port = new InputPort(bufs, this, Raul::Symbol("controller"), 2, 1, + _param_port = new InputPort(bufs, this, raul::Symbol("controller"), 2, 1, PortType::ATOM, uris.atom_Sequence, zero); _param_port->set_property(uris.atom_supports, atom_Float); _param_port->set_property(uris.lv2_minimum, zero); @@ -92,26 +92,26 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, _param_port->set_property(uris.lv2_name, bufs.forge().alloc("Controller")); _ports->at(2) = _param_port; - _log_port = new InputPort(bufs, this, Raul::Symbol("logarithmic"), 3, 1, + _log_port = new InputPort(bufs, this, raul::Symbol("logarithmic"), 3, 1, PortType::ATOM, uris.atom_Sequence, zero); _log_port->set_property(uris.atom_supports, atom_Float); _log_port->set_property(uris.lv2_portProperty, uris.lv2_toggled); _log_port->set_property(uris.lv2_name, bufs.forge().alloc("Logarithmic")); _ports->at(3) = _log_port; - _min_port = new InputPort(bufs, this, Raul::Symbol("minimum"), 4, 1, + _min_port = new InputPort(bufs, this, raul::Symbol("minimum"), 4, 1, PortType::ATOM, uris.atom_Sequence, zero); _min_port->set_property(uris.atom_supports, atom_Float); _min_port->set_property(uris.lv2_name, bufs.forge().alloc("Minimum")); _ports->at(4) = _min_port; - _max_port = new InputPort(bufs, this, Raul::Symbol("maximum"), 5, 1, + _max_port = new InputPort(bufs, this, raul::Symbol("maximum"), 5, 1, PortType::ATOM, uris.atom_Sequence, one); _max_port->set_property(uris.atom_supports, atom_Float); _max_port->set_property(uris.lv2_name, bufs.forge().alloc("Maximum")); _ports->at(5) = _max_port; - _audio_port = new OutputPort(bufs, this, Raul::Symbol("output"), 6, 1, + _audio_port = new OutputPort(bufs, this, raul::Symbol("output"), 6, 1, PortType::ATOM, uris.atom_Sequence, zero); _audio_port->set_property(uris.atom_supports, atom_Float); _audio_port->set_property(uris.lv2_name, bufs.forge().alloc("Output")); diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index 383ce152..b5cea110 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -22,9 +22,9 @@ #include <cstdint> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -53,7 +53,7 @@ class ControllerNode : public InternalBlock public: ControllerNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate); diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 317e7951..4952310b 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -53,12 +53,12 @@ namespace internals { InternalPlugin* NoteNode::internal_plugin(URIs& uris) { return new InternalPlugin( - uris, URI(NS_INTERNALS "Note"), Raul::Symbol("note")); + uris, URI(NS_INTERNALS "Note"), raul::Symbol("note")); } NoteNode::NoteNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate) @@ -72,14 +72,14 @@ NoteNode::NoteNode(InternalPlugin* plugin, const Atom zero = bufs.forge().make(0.0f); const Atom one = bufs.forge().make(1.0f); - _midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1, + _midi_in_port = new InputPort(bufs, this, raul::Symbol("input"), 0, 1, PortType::ATOM, uris.atom_Sequence, Atom()); _midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input")); _midi_in_port->set_property(uris.atom_supports, bufs.forge().make_urid(uris.midi_MidiEvent)); _ports->at(0) = _midi_in_port; - _freq_port = new OutputPort(bufs, this, Raul::Symbol("frequency"), 1, _polyphony, + _freq_port = new OutputPort(bufs, this, raul::Symbol("frequency"), 1, _polyphony, PortType::ATOM, uris.atom_Sequence, bufs.forge().make(440.0f)); _freq_port->set_property(uris.atom_supports, bufs.uris().atom_Float); @@ -88,7 +88,7 @@ NoteNode::NoteNode(InternalPlugin* plugin, _freq_port->set_property(uris.lv2_maximum, bufs.forge().make(25088.0f)); _ports->at(1) = _freq_port; - _num_port = new OutputPort(bufs, this, Raul::Symbol("number"), 1, _polyphony, + _num_port = new OutputPort(bufs, this, raul::Symbol("number"), 1, _polyphony, PortType::ATOM, uris.atom_Sequence, zero); _num_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _num_port->set_property(uris.lv2_minimum, zero); @@ -97,7 +97,7 @@ NoteNode::NoteNode(InternalPlugin* plugin, _num_port->set_property(uris.lv2_name, bufs.forge().alloc("Number")); _ports->at(2) = _num_port; - _vel_port = new OutputPort(bufs, this, Raul::Symbol("velocity"), 2, _polyphony, + _vel_port = new OutputPort(bufs, this, raul::Symbol("velocity"), 2, _polyphony, PortType::ATOM, uris.atom_Sequence, zero); _vel_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _vel_port->set_property(uris.lv2_minimum, zero); @@ -105,21 +105,21 @@ NoteNode::NoteNode(InternalPlugin* plugin, _vel_port->set_property(uris.lv2_name, bufs.forge().alloc("Velocity")); _ports->at(3) = _vel_port; - _gate_port = new OutputPort(bufs, this, Raul::Symbol("gate"), 3, _polyphony, + _gate_port = new OutputPort(bufs, this, raul::Symbol("gate"), 3, _polyphony, PortType::ATOM, uris.atom_Sequence, zero); _gate_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _gate_port->set_property(uris.lv2_portProperty, uris.lv2_toggled); _gate_port->set_property(uris.lv2_name, bufs.forge().alloc("Gate")); _ports->at(4) = _gate_port; - _trig_port = new OutputPort(bufs, this, Raul::Symbol("trigger"), 4, _polyphony, + _trig_port = new OutputPort(bufs, this, raul::Symbol("trigger"), 4, _polyphony, PortType::ATOM, uris.atom_Sequence, zero); _trig_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _trig_port->set_property(uris.lv2_portProperty, uris.lv2_toggled); _trig_port->set_property(uris.lv2_name, bufs.forge().alloc("Trigger")); _ports->at(5) = _trig_port; - _bend_port = new OutputPort(bufs, this, Raul::Symbol("bend"), 5, _polyphony, + _bend_port = new OutputPort(bufs, this, raul::Symbol("bend"), 5, _polyphony, PortType::ATOM, uris.atom_Sequence, zero); _bend_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _bend_port->set_property(uris.lv2_name, bufs.forge().alloc("Bender")); @@ -128,7 +128,7 @@ NoteNode::NoteNode(InternalPlugin* plugin, _bend_port->set_property(uris.lv2_maximum, one); _ports->at(6) = _bend_port; - _pressure_port = new OutputPort(bufs, this, Raul::Symbol("pressure"), 6, _polyphony, + _pressure_port = new OutputPort(bufs, this, raul::Symbol("pressure"), 6, _polyphony, PortType::ATOM, uris.atom_Sequence, zero); _pressure_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _pressure_port->set_property(uris.lv2_name, bufs.forge().alloc("Pressure")); diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index d0e9341a..80816131 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -25,9 +25,9 @@ #include <cstdint> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -55,7 +55,7 @@ class NoteNode : public InternalBlock public: NoteNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate); @@ -97,12 +97,12 @@ private: SampleCount time = 0; }; - using Voices = Raul::Array<Voice>; + using Voices = raul::Array<Voice>; void free_voice(RunContext& ctx, uint32_t voice, FrameTime time); - Raul::managed_ptr<Voices> _voices; - Raul::managed_ptr<Voices> _prepared_voices; + raul::managed_ptr<Voices> _voices; + raul::managed_ptr<Voices> _prepared_voices; Key _keys[128]; bool _sustain; ///< Whether or not hold pedal is depressed diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp index 47f85867..651a2f36 100644 --- a/src/server/internals/Time.cpp +++ b/src/server/internals/Time.cpp @@ -47,12 +47,12 @@ namespace internals { InternalPlugin* TimeNode::internal_plugin(URIs& uris) { return new InternalPlugin( - uris, URI(NS_INTERNALS "Time"), Raul::Symbol("time")); + uris, URI(NS_INTERNALS "Time"), raul::Symbol("time")); } TimeNode::TimeNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate) @@ -62,7 +62,7 @@ TimeNode::TimeNode(InternalPlugin* plugin, _ports = bufs.maid().make_managed<Ports>(1); _notify_port = new OutputPort( - bufs, this, Raul::Symbol("notify"), 0, 1, + bufs, this, raul::Symbol("notify"), 0, 1, PortType::ATOM, uris.atom_Sequence, Atom(), 1024); _notify_port->set_property(uris.lv2_name, bufs.forge().alloc("Notify")); _notify_port->set_property(uris.atom_supports, diff --git a/src/server/internals/Time.hpp b/src/server/internals/Time.hpp index ec0f5528..fa3e90e5 100644 --- a/src/server/internals/Time.hpp +++ b/src/server/internals/Time.hpp @@ -20,9 +20,9 @@ #include "InternalBlock.hpp" #include "types.hpp" -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -49,7 +49,7 @@ class TimeNode : public InternalBlock public: TimeNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate); diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 450a7040..645ffabb 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -50,12 +50,12 @@ namespace internals { InternalPlugin* TriggerNode::internal_plugin(URIs& uris) { return new InternalPlugin( - uris, URI(NS_INTERNALS "Trigger"), Raul::Symbol("trigger")); + uris, URI(NS_INTERNALS "Trigger"), raul::Symbol("trigger")); } TriggerNode::TriggerNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate) @@ -67,21 +67,21 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, const Atom zero = bufs.forge().make(0.0f); - _midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1, + _midi_in_port = new InputPort(bufs, this, raul::Symbol("input"), 0, 1, PortType::ATOM, uris.atom_Sequence, Atom()); _midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input")); _midi_in_port->set_property(uris.atom_supports, bufs.forge().make_urid(uris.midi_MidiEvent)); _ports->at(0) = _midi_in_port; - _midi_out_port = new OutputPort(bufs, this, Raul::Symbol("event"), 1, 1, + _midi_out_port = new OutputPort(bufs, this, raul::Symbol("event"), 1, 1, PortType::ATOM, uris.atom_Sequence, Atom()); _midi_out_port->set_property(uris.lv2_name, bufs.forge().alloc("Event")); _midi_out_port->set_property(uris.atom_supports, bufs.forge().make_urid(uris.midi_MidiEvent)); _ports->at(1) = _midi_out_port; - _note_port = new InputPort(bufs, this, Raul::Symbol("note"), 2, 1, + _note_port = new InputPort(bufs, this, raul::Symbol("note"), 2, 1, PortType::ATOM, uris.atom_Sequence, bufs.forge().make(60.0f)); _note_port->set_property(uris.atom_supports, bufs.uris().atom_Float); @@ -91,21 +91,21 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, _note_port->set_property(uris.lv2_name, bufs.forge().alloc("Note")); _ports->at(2) = _note_port; - _gate_port = new OutputPort(bufs, this, Raul::Symbol("gate"), 3, 1, + _gate_port = new OutputPort(bufs, this, raul::Symbol("gate"), 3, 1, PortType::ATOM, uris.atom_Sequence, zero); _gate_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _gate_port->set_property(uris.lv2_portProperty, uris.lv2_toggled); _gate_port->set_property(uris.lv2_name, bufs.forge().alloc("Gate")); _ports->at(3) = _gate_port; - _trig_port = new OutputPort(bufs, this, Raul::Symbol("trigger"), 4, 1, + _trig_port = new OutputPort(bufs, this, raul::Symbol("trigger"), 4, 1, PortType::ATOM, uris.atom_Sequence, zero); _trig_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _trig_port->set_property(uris.lv2_portProperty, uris.lv2_toggled); _trig_port->set_property(uris.lv2_name, bufs.forge().alloc("Trigger")); _ports->at(4) = _trig_port; - _vel_port = new OutputPort(bufs, this, Raul::Symbol("velocity"), 5, 1, + _vel_port = new OutputPort(bufs, this, raul::Symbol("velocity"), 5, 1, PortType::ATOM, uris.atom_Sequence, zero); _vel_port->set_property(uris.atom_supports, bufs.uris().atom_Float); _vel_port->set_property(uris.lv2_minimum, zero); diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index ba14db68..d9553c3e 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -22,9 +22,9 @@ #include <cstdint> -namespace Raul { +namespace raul { class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -56,7 +56,7 @@ class TriggerNode : public InternalBlock public: TriggerNode(InternalPlugin* plugin, BufferFactory& bufs, - const Raul::Symbol& symbol, + const raul::Symbol& symbol, bool polyphonic, GraphImpl* parent, SampleRate srate); |