summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.clang-tidy6
-rw-r--r--include/ingen/Arc.hpp8
-rw-r--r--include/ingen/AtomReader.hpp6
-rw-r--r--include/ingen/AtomWriter.hpp4
-rw-r--r--include/ingen/ClashAvoider.hpp12
-rw-r--r--include/ingen/Configuration.hpp4
-rw-r--r--include/ingen/Interface.hpp12
-rw-r--r--include/ingen/LV2Features.hpp2
-rw-r--r--include/ingen/Message.hpp16
-rw-r--r--include/ingen/Node.hpp12
-rw-r--r--include/ingen/Parser.hpp8
-rw-r--r--include/ingen/Resource.hpp2
-rw-r--r--include/ingen/Serialiser.hpp6
-rw-r--r--include/ingen/SocketReader.hpp6
-rw-r--r--include/ingen/SocketWriter.hpp8
-rw-r--r--include/ingen/Store.hpp18
-rw-r--r--include/ingen/URIMap.hpp2
-rw-r--r--include/ingen/URIs.hpp2
-rw-r--r--include/ingen/World.hpp2
-rw-r--r--include/ingen/client/ArcModel.hpp4
-rw-r--r--include/ingen/client/BlockModel.hpp14
-rw-r--r--include/ingen/client/ClientStore.hpp18
-rw-r--r--include/ingen/client/GraphModel.hpp6
-rw-r--r--include/ingen/client/ObjectModel.hpp12
-rw-r--r--include/ingen/client/PluginModel.hpp2
-rw-r--r--include/ingen/client/PortModel.hpp2
-rw-r--r--include/ingen/client/SocketClient.hpp10
-rw-r--r--include/ingen/paths.hpp8
-rw-r--r--src/AtomReader.cpp20
-rw-r--r--src/AtomWriter.cpp4
-rw-r--r--src/ClashAvoider.cpp22
-rw-r--r--src/Parser.cpp100
-rw-r--r--src/Serialiser.cpp20
-rw-r--r--src/SocketReader.cpp2
-rw-r--r--src/SocketWriter.cpp2
-rw-r--r--src/Store.cpp14
-rw-r--r--src/client/BlockModel.cpp8
-rw-r--r--src/client/ClientStore.cpp18
-rw-r--r--src/client/ObjectModel.cpp6
-rw-r--r--src/client/PluginModel.cpp8
-rw-r--r--src/gui/.clang-tidy6
-rw-r--r--src/gui/BreadCrumbs.cpp16
-rw-r--r--src/gui/BreadCrumbs.hpp22
-rw-r--r--src/gui/ConnectWindow.cpp4
-rw-r--r--src/gui/GraphBox.cpp4
-rw-r--r--src/gui/GraphBox.hpp6
-rw-r--r--src/gui/GraphCanvas.cpp26
-rw-r--r--src/gui/GraphCanvas.hpp2
-rw-r--r--src/gui/LoadGraphWindow.cpp18
-rw-r--r--src/gui/LoadGraphWindow.hpp4
-rw-r--r--src/gui/LoadPluginWindow.cpp8
-rw-r--r--src/gui/NewSubgraphWindow.cpp8
-rw-r--r--src/gui/NodeMenu.cpp4
-rw-r--r--src/gui/PortMenu.cpp2
-rw-r--r--src/gui/RenameWindow.cpp10
-rw-r--r--src/gui/ThreadedLoader.cpp8
-rw-r--r--src/gui/ThreadedLoader.hpp14
-rw-r--r--src/gui/WindowFactory.hpp2
-rw-r--r--src/gui/ingen_gui_lv2.cpp2
-rw-r--r--src/ingen/ingen.cpp10
-rw-r--r--src/server/.clang-tidy6
-rw-r--r--src/server/ArcImpl.cpp4
-rw-r--r--src/server/ArcImpl.hpp10
-rw-r--r--src/server/BlockFactory.hpp2
-rw-r--r--src/server/BlockImpl.cpp2
-rw-r--r--src/server/BlockImpl.hpp12
-rw-r--r--src/server/Broadcaster.hpp2
-rw-r--r--src/server/BufferFactory.cpp2
-rw-r--r--src/server/BufferFactory.hpp4
-rw-r--r--src/server/ClientUpdate.hpp4
-rw-r--r--src/server/CompiledGraph.cpp4
-rw-r--r--src/server/CompiledGraph.hpp12
-rw-r--r--src/server/ControlBindings.cpp2
-rw-r--r--src/server/ControlBindings.hpp6
-rw-r--r--src/server/DirectDriver.hpp8
-rw-r--r--src/server/Driver.hpp12
-rw-r--r--src/server/DuplexPort.cpp6
-rw-r--r--src/server/DuplexPort.hpp8
-rw-r--r--src/server/Engine.cpp6
-rw-r--r--src/server/Engine.hpp10
-rw-r--r--src/server/EnginePort.hpp4
-rw-r--r--src/server/Event.hpp8
-rw-r--r--src/server/GraphImpl.cpp16
-rw-r--r--src/server/GraphImpl.hpp20
-rw-r--r--src/server/GraphPlugin.hpp6
-rw-r--r--src/server/InputPort.cpp6
-rw-r--r--src/server/InputPort.hpp8
-rw-r--r--src/server/InternalBlock.cpp8
-rw-r--r--src/server/InternalBlock.hpp8
-rw-r--r--src/server/InternalPlugin.cpp4
-rw-r--r--src/server/InternalPlugin.hpp8
-rw-r--r--src/server/JackDriver.cpp8
-rw-r--r--src/server/JackDriver.hpp12
-rw-r--r--src/server/LV2Block.cpp6
-rw-r--r--src/server/LV2Block.hpp22
-rw-r--r--src/server/LV2Plugin.cpp8
-rw-r--r--src/server/LV2Plugin.hpp4
-rw-r--r--src/server/NodeImpl.cpp6
-rw-r--r--src/server/NodeImpl.hpp16
-rw-r--r--src/server/OutputPort.hpp6
-rw-r--r--src/server/PluginImpl.hpp4
-rw-r--r--src/server/PortAudioDriver.cpp8
-rw-r--r--src/server/PortAudioDriver.hpp10
-rw-r--r--src/server/PortImpl.cpp6
-rw-r--r--src/server/PortImpl.hpp16
-rw-r--r--src/server/PreProcessContext.hpp4
-rw-r--r--src/server/PreProcessor.hpp2
-rw-r--r--src/server/RunContext.cpp2
-rw-r--r--src/server/RunContext.hpp4
-rw-r--r--src/server/SocketListener.cpp10
-rw-r--r--src/server/SocketListener.hpp4
-rw-r--r--src/server/SocketServer.hpp2
-rw-r--r--src/server/Worker.hpp6
-rw-r--r--src/server/events/Connect.hpp4
-rw-r--r--src/server/events/Copy.cpp18
-rw-r--r--src/server/events/Copy.hpp2
-rw-r--r--src/server/events/CreateBlock.cpp6
-rw-r--r--src/server/events/CreateBlock.hpp6
-rw-r--r--src/server/events/CreateGraph.cpp10
-rw-r--r--src/server/events/CreateGraph.hpp6
-rw-r--r--src/server/events/CreatePort.cpp6
-rw-r--r--src/server/events/CreatePort.hpp6
-rw-r--r--src/server/events/Delete.hpp8
-rw-r--r--src/server/events/Delta.cpp2
-rw-r--r--src/server/events/Delta.hpp2
-rw-r--r--src/server/events/Disconnect.hpp4
-rw-r--r--src/server/events/DisconnectAll.hpp2
-rw-r--r--src/server/events/Mark.hpp2
-rw-r--r--src/server/ingen_lv2.cpp20
-rw-r--r--src/server/internals/BlockDelay.cpp8
-rw-r--r--src/server/internals/BlockDelay.hpp6
-rw-r--r--src/server/internals/Controller.cpp18
-rw-r--r--src/server/internals/Controller.hpp6
-rw-r--r--src/server/internals/Note.cpp20
-rw-r--r--src/server/internals/Note.hpp12
-rw-r--r--src/server/internals/Time.cpp6
-rw-r--r--src/server/internals/Time.hpp6
-rw-r--r--src/server/internals/Trigger.cpp16
-rw-r--r--src/server/internals/Trigger.hpp6
-rw-r--r--tests/ingen_test.cpp6
-rw-r--r--wscript2
141 files changed, 615 insertions, 597 deletions
diff --git a/.clang-tidy b/.clang-tidy
index f614d82b..60a2b184 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -62,6 +62,12 @@ Checks: >
-readability-convert-member-functions-to-static,
-readability-implicit-bool-conversion,
-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/include/ingen/Arc.hpp b/include/ingen/Arc.hpp
index 62c95d67..1d21b65e 100644
--- a/include/ingen/Arc.hpp
+++ b/include/ingen/Arc.hpp
@@ -20,7 +20,7 @@
#include "ingen/ingen.h"
#include "raul/Deletable.hpp"
-namespace Raul { class Path; }
+namespace raul { class Path; }
namespace ingen {
@@ -28,11 +28,11 @@ namespace ingen {
*
* @ingroup Ingen
*/
-class INGEN_API Arc : public Raul::Deletable
+class INGEN_API Arc : public raul::Deletable
{
public:
- virtual const Raul::Path& tail_path() const = 0;
- virtual const Raul::Path& head_path() const = 0;
+ virtual const raul::Path& tail_path() const = 0;
+ virtual const raul::Path& head_path() const = 0;
};
} // namespace ingen
diff --git a/include/ingen/AtomReader.hpp b/include/ingen/AtomReader.hpp
index 75a3c690..c83e7e4a 100644
--- a/include/ingen/AtomReader.hpp
+++ b/include/ingen/AtomReader.hpp
@@ -26,9 +26,9 @@
#include <cstdint>
-namespace Raul {
+namespace raul {
class Path;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -59,7 +59,7 @@ private:
void get_atom(const LV2_Atom* in, Atom& out);
boost::optional<URI> atom_to_uri(const LV2_Atom* atom);
- boost::optional<Raul::Path> atom_to_path(const LV2_Atom* atom);
+ boost::optional<raul::Path> atom_to_path(const LV2_Atom* atom);
Resource::Graph atom_to_context(const LV2_Atom* atom);
void get_props(const LV2_Atom_Object* obj,
diff --git a/include/ingen/AtomWriter.hpp b/include/ingen/AtomWriter.hpp
index f9052d93..492e7ff6 100644
--- a/include/ingen/AtomWriter.hpp
+++ b/include/ingen/AtomWriter.hpp
@@ -29,7 +29,7 @@
#include <cstdint>
-namespace Raul { class Path; }
+namespace raul { class Path; }
namespace ingen {
@@ -69,7 +69,7 @@ public:
private:
void forge_uri(const URI& uri);
void forge_properties(const Properties& properties);
- void forge_arc(const Raul::Path& tail, const Raul::Path& head);
+ void forge_arc(const raul::Path& tail, const raul::Path& head);
void forge_request(LV2_Atom_Forge_Frame* frame, LV2_URID type, int32_t id);
void forge_context(Resource::Graph ctx);
diff --git a/include/ingen/ClashAvoider.hpp b/include/ingen/ClashAvoider.hpp
index 1d2cebf0..c1d62754 100644
--- a/include/ingen/ClashAvoider.hpp
+++ b/include/ingen/ClashAvoider.hpp
@@ -38,9 +38,9 @@ public:
explicit ClashAvoider(const Store& store);
URI map_uri(const URI& in);
- Raul::Path map_path(const Raul::Path& in);
+ raul::Path map_path(const raul::Path& in);
- bool exists(const Raul::Path& path) const;
+ bool exists(const raul::Path& path) const;
/** Adjust a new label by increasing the numeric suffix if any.
*
@@ -48,13 +48,13 @@ public:
* @param new_path The new path that `old_path` was mapped to
* @param name The old name.
*/
- static std::string adjust_name(const Raul::Path& old_path,
- const Raul::Path& new_path,
+ static std::string adjust_name(const raul::Path& old_path,
+ const raul::Path& new_path,
std::string name);
private:
- using Offsets = std::map<Raul::Path, unsigned>;
- using SymbolMap = std::map<Raul::Path, Raul::Path>;
+ using Offsets = std::map<raul::Path, unsigned>;
+ using SymbolMap = std::map<raul::Path, raul::Path>;
const Store& _store;
Offsets _offsets;
diff --git a/include/ingen/Configuration.hpp b/include/ingen/Configuration.hpp
index 4b290316..16c20811 100644
--- a/include/ingen/Configuration.hpp
+++ b/include/ingen/Configuration.hpp
@@ -71,11 +71,11 @@ public:
void print_usage(const std::string& program, std::ostream& os);
- struct OptionError : public Raul::Exception {
+ struct OptionError : public raul::Exception {
explicit OptionError(const std::string& m) : Exception(m) {}
};
- struct FileError : public Raul::Exception {
+ struct FileError : public raul::Exception {
explicit FileError(const std::string& m) : Exception(m) {}
};
diff --git a/include/ingen/Interface.hpp b/include/ingen/Interface.hpp
index 68de5684..cb17039e 100644
--- a/include/ingen/Interface.hpp
+++ b/include/ingen/Interface.hpp
@@ -31,9 +31,9 @@
#include <memory>
#include <string>
-namespace Raul {
+namespace raul {
class Path;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -92,24 +92,24 @@ public:
message(Copy{_seq++, old_uri, new_uri});
}
- inline void move(const Raul::Path& old_path, const Raul::Path& new_path)
+ inline void move(const raul::Path& old_path, const raul::Path& new_path)
{
message(Move{_seq++, old_path, new_path});
}
inline void del(const URI& uri) { message(Del{_seq++, uri}); }
- inline void connect(const Raul::Path& tail, const Raul::Path& head)
+ inline void connect(const raul::Path& tail, const raul::Path& head)
{
message(Connect{_seq++, tail, head});
}
- inline void disconnect(const Raul::Path& tail, const Raul::Path& head)
+ inline void disconnect(const raul::Path& tail, const raul::Path& head)
{
message(Disconnect{_seq++, tail, head});
}
- inline void disconnect_all(const Raul::Path& graph, const Raul::Path& path)
+ inline void disconnect_all(const raul::Path& graph, const raul::Path& path)
{
message(DisconnectAll{_seq++, graph, path});
}
diff --git a/include/ingen/LV2Features.hpp b/include/ingen/LV2Features.hpp
index e00e869c..f61b9b85 100644
--- a/include/ingen/LV2Features.hpp
+++ b/include/ingen/LV2Features.hpp
@@ -64,7 +64,7 @@ public:
const char* _uri;
};
- class FeatureArray : public Raul::Noncopyable {
+ class FeatureArray : public raul::Noncopyable {
public:
using FeatureVector = std::vector<std::shared_ptr<LV2_Feature>>;
diff --git a/include/ingen/Message.hpp b/include/ingen/Message.hpp
index ad524390..b7342eba 100644
--- a/include/ingen/Message.hpp
+++ b/include/ingen/Message.hpp
@@ -44,8 +44,8 @@ struct BundleEnd
struct Connect
{
int32_t seq;
- Raul::Path tail;
- Raul::Path head;
+ raul::Path tail;
+ raul::Path head;
};
struct Copy
@@ -73,15 +73,15 @@ struct Delta
struct Disconnect
{
int32_t seq;
- Raul::Path tail;
- Raul::Path head;
+ raul::Path tail;
+ raul::Path head;
};
struct DisconnectAll
{
int32_t seq;
- Raul::Path graph;
- Raul::Path path;
+ raul::Path graph;
+ raul::Path path;
};
struct Error
@@ -99,8 +99,8 @@ struct Get
struct Move
{
int32_t seq;
- Raul::Path old_path;
- Raul::Path new_path;
+ raul::Path old_path;
+ raul::Path new_path;
};
struct Put
diff --git a/include/ingen/Node.hpp b/include/ingen/Node.hpp
index 39b33596..3733b51e 100644
--- a/include/ingen/Node.hpp
+++ b/include/ingen/Node.hpp
@@ -29,10 +29,10 @@
#include <string>
#include <utility>
-namespace Raul {
+namespace raul {
class Path;
class Symbol;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -79,8 +79,8 @@ public:
// All objects
virtual GraphType graph_type() const = 0;
- virtual const Raul::Path& path() const = 0;
- virtual const Raul::Symbol& symbol() const = 0;
+ virtual const raul::Path& path() const = 0;
+ virtual const raul::Symbol& symbol() const = 0;
virtual Node* graph_parent() const = 0;
URI base_uri() const {
@@ -92,9 +92,9 @@ public:
protected:
friend class Store;
- virtual void set_path(const Raul::Path& p) = 0;
+ virtual void set_path(const raul::Path& p) = 0;
- Node(const URIs& uris, const Raul::Path& path)
+ Node(const URIs& uris, const raul::Path& path)
: Resource(uris, path_to_uri(path))
{}
diff --git a/include/ingen/Parser.hpp b/include/ingen/Parser.hpp
index 03175318..f2cd951f 100644
--- a/include/ingen/Parser.hpp
+++ b/include/ingen/Parser.hpp
@@ -80,8 +80,8 @@ public:
World& world,
Interface& target,
const FilePath& path,
- const boost::optional<Raul::Path>& parent = boost::optional<Raul::Path>(),
- const boost::optional<Raul::Symbol>& symbol = boost::optional<Raul::Symbol>(),
+ const boost::optional<raul::Path>& parent = boost::optional<raul::Path>(),
+ const boost::optional<raul::Symbol>& symbol = boost::optional<raul::Symbol>(),
const boost::optional<Properties>& data = boost::optional<Properties>());
virtual boost::optional<URI> parse_string(
@@ -89,8 +89,8 @@ public:
Interface& target,
const std::string& str,
const URI& base_uri,
- const boost::optional<Raul::Path>& parent = boost::optional<Raul::Path>(),
- const boost::optional<Raul::Symbol>& symbol = boost::optional<Raul::Symbol>(),
+ const boost::optional<raul::Path>& parent = boost::optional<raul::Path>(),
+ const boost::optional<raul::Symbol>& symbol = boost::optional<raul::Symbol>(),
const boost::optional<Properties>& data = boost::optional<Properties>());
};
diff --git a/include/ingen/Resource.hpp b/include/ingen/Resource.hpp
index e4a7972e..577e8cc0 100644
--- a/include/ingen/Resource.hpp
+++ b/include/ingen/Resource.hpp
@@ -37,7 +37,7 @@ class Atom;
*
* @ingroup Ingen
*/
-class INGEN_API Resource : public Raul::Deletable
+class INGEN_API Resource : public raul::Deletable
{
public:
using Graph = Property::Graph;
diff --git a/include/ingen/Serialiser.hpp b/include/ingen/Serialiser.hpp
index fd5b50b3..37eda462 100644
--- a/include/ingen/Serialiser.hpp
+++ b/include/ingen/Serialiser.hpp
@@ -25,7 +25,7 @@
#include <memory>
#include <string>
-namespace Raul { class Path; }
+namespace raul { class Path; }
namespace ingen {
@@ -60,7 +60,7 @@ public:
* All serialized paths will have the root path chopped from their prefix
* (therefore all serialized paths must be descendants of the root)
*/
- virtual void start_to_string(const Raul::Path& root,
+ virtual void start_to_string(const raul::Path& root,
const URI& base_uri);
/** Begin a serialization to a file.
@@ -70,7 +70,7 @@ public:
* All serialized paths will have the root path chopped from their prefix
* (therefore all serialized paths must be descendants of the root)
*/
- virtual void start_to_file(const Raul::Path& root,
+ virtual void start_to_file(const raul::Path& root,
const FilePath& filename);
/** Serialize an object (graph, block, or port).
diff --git a/include/ingen/SocketReader.hpp b/include/ingen/SocketReader.hpp
index 5efa2143..f86a9bd6 100644
--- a/include/ingen/SocketReader.hpp
+++ b/include/ingen/SocketReader.hpp
@@ -25,7 +25,7 @@
#include <memory>
#include <thread>
-namespace Raul { class Socket; }
+namespace raul { class Socket; }
namespace ingen {
@@ -38,7 +38,7 @@ class INGEN_API SocketReader
public:
SocketReader(World& world,
Interface& iface,
- std::shared_ptr<Raul::Socket> sock);
+ std::shared_ptr<raul::Socket> sock);
virtual ~SocketReader();
@@ -75,7 +75,7 @@ private:
SerdEnv* _env;
SordInserter* _inserter;
SordNode* _msg_node;
- std::shared_ptr<Raul::Socket> _socket;
+ std::shared_ptr<raul::Socket> _socket;
int _socket_error;
bool _exit_flag;
std::thread _thread;
diff --git a/include/ingen/SocketWriter.hpp b/include/ingen/SocketWriter.hpp
index 63f2f86f..a0896ad9 100644
--- a/include/ingen/SocketWriter.hpp
+++ b/include/ingen/SocketWriter.hpp
@@ -24,9 +24,9 @@
#include <cstddef>
#include <memory>
-namespace Raul {
+namespace raul {
class Socket;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -42,14 +42,14 @@ public:
SocketWriter(URIMap& map,
URIs& uris,
const URI& uri,
- std::shared_ptr<Raul::Socket> sock);
+ std::shared_ptr<raul::Socket> sock);
void message(const Message& message) override;
size_t text_sink(const void* buf, size_t len) override;
protected:
- std::shared_ptr<Raul::Socket> _socket;
+ std::shared_ptr<raul::Socket> _socket;
};
} // namespace ingen
diff --git a/include/ingen/Store.hpp b/include/ingen/Store.hpp
index 46bec770..67ea16fa 100644
--- a/include/ingen/Store.hpp
+++ b/include/ingen/Store.hpp
@@ -27,7 +27,7 @@
#include <mutex>
#include <utility>
-namespace Raul { class Symbol; }
+namespace raul { class Symbol; }
namespace ingen {
@@ -36,20 +36,20 @@ class Node;
/** Store of objects in the graph hierarchy.
* @ingroup IngenShared
*/
-class INGEN_API Store : public Raul::Noncopyable,
- public Raul::Deletable,
- public std::map<const Raul::Path, std::shared_ptr<Node>>
+class INGEN_API Store : public raul::Noncopyable,
+ public raul::Deletable,
+ public std::map<const raul::Path, std::shared_ptr<Node>>
{
public:
void add(Node* o);
- Node* get(const Raul::Path& path) {
+ Node* get(const raul::Path& path) {
const iterator i = find(path);
return (i == end()) ? nullptr : i->second.get();
}
using const_range = std::pair<const_iterator, const_iterator>;
- using Objects = std::map<Raul::Path, std::shared_ptr<Node>>;
+ using Objects = std::map<raul::Path, std::shared_ptr<Node>>;
using Mutex = std::recursive_mutex;
iterator find_descendants_end(Store::iterator parent);
@@ -70,10 +70,10 @@ public:
*
* Note this invalidates `i`.
*/
- void rename(iterator top, const Raul::Path& new_path);
+ void rename(iterator top, const raul::Path& new_path);
- unsigned child_name_offset(const Raul::Path& parent,
- const Raul::Symbol& symbol,
+ unsigned child_name_offset(const raul::Path& parent,
+ const raul::Symbol& symbol,
bool allow_zero=true) const;
Mutex& mutex() { return _mutex; }
diff --git a/include/ingen/URIMap.hpp b/include/ingen/URIMap.hpp
index 8b93e216..465f87f1 100644
--- a/include/ingen/URIMap.hpp
+++ b/include/ingen/URIMap.hpp
@@ -40,7 +40,7 @@ class World;
/** URI to integer map and implementation of LV2 URID extension.
* @ingroup IngenShared
*/
-class INGEN_API URIMap : public Raul::Noncopyable {
+class INGEN_API URIMap : public raul::Noncopyable {
public:
URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap);
diff --git a/include/ingen/URIs.hpp b/include/ingen/URIs.hpp
index baa376e9..cfa00f73 100644
--- a/include/ingen/URIs.hpp
+++ b/include/ingen/URIs.hpp
@@ -37,7 +37,7 @@ class URIMap;
*
* @ingroup ingen
*/
-class INGEN_API URIs : public Raul::Noncopyable {
+class INGEN_API URIs : public raul::Noncopyable {
public:
URIs(ingen::Forge& ingen_forge, URIMap* map, LilvWorld* lworld);
diff --git a/include/ingen/World.hpp b/include/ingen/World.hpp
index bff5f213..ecf1d45a 100644
--- a/include/ingen/World.hpp
+++ b/include/ingen/World.hpp
@@ -62,7 +62,7 @@ class URIs;
*
* @ingroup IngenShared
*/
-class INGEN_API World : public Raul::Noncopyable {
+class INGEN_API World : public raul::Noncopyable {
public:
/** Construct a new Ingen world.
* @param map LV2 URID map implementation, or null to use internal.
diff --git a/include/ingen/client/ArcModel.hpp b/include/ingen/client/ArcModel.hpp
index 635c2d41..a76f274f 100644
--- a/include/ingen/client/ArcModel.hpp
+++ b/include/ingen/client/ArcModel.hpp
@@ -40,8 +40,8 @@ public:
std::shared_ptr<PortModel> tail() const { return _tail; }
std::shared_ptr<PortModel> head() const { return _head; }
- const Raul::Path& tail_path() const override { return _tail->path(); }
- const Raul::Path& head_path() const override { return _head->path(); }
+ const raul::Path& tail_path() const override { return _tail->path(); }
+ const raul::Path& head_path() const override { return _head->path(); }
private:
friend class ClientStore;
diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp
index ee2c88d8..060d454f 100644
--- a/include/ingen/client/BlockModel.hpp
+++ b/include/ingen/client/BlockModel.hpp
@@ -29,10 +29,10 @@
#include <string>
#include <vector>
-namespace Raul {
+namespace raul {
class Path;
class Symbol;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -57,7 +57,7 @@ public:
using Ports = std::vector<std::shared_ptr<const PortModel>>;
- std::shared_ptr<const PortModel> get_port(const Raul::Symbol& symbol) const;
+ std::shared_ptr<const PortModel> get_port(const raul::Symbol& symbol) const;
std::shared_ptr<const PortModel> get_port(uint32_t index) const;
Node* port(uint32_t index) const override;
@@ -89,19 +89,19 @@ public:
protected:
friend class ClientStore;
- BlockModel(URIs& uris, URI plugin_uri, const Raul::Path& path);
+ BlockModel(URIs& uris, URI plugin_uri, const raul::Path& path);
BlockModel(URIs& uris,
const std::shared_ptr<PluginModel>& plugin,
- const Raul::Path& path);
+ const raul::Path& path);
- explicit BlockModel(const Raul::Path& path);
+ explicit BlockModel(const raul::Path& path);
void add_child(const std::shared_ptr<ObjectModel>& c) override;
bool remove_child(const std::shared_ptr<ObjectModel>& c) override;
void add_port(const std::shared_ptr<PortModel>& pm);
void remove_port(const std::shared_ptr<PortModel>& port);
- void remove_port(const Raul::Path& port_path);
+ void remove_port(const raul::Path& port_path);
void set(const std::shared_ptr<ObjectModel>& model) override;
virtual void clear();
diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp
index b1d40881..3aec363f 100644
--- a/include/ingen/client/ClientStore.hpp
+++ b/include/ingen/client/ClientStore.hpp
@@ -28,9 +28,9 @@
#include <memory>
#include <utility>
-namespace Raul {
+namespace raul {
class Path;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -61,7 +61,7 @@ public:
URI uri() const override { return URI("ingen:/clients/store"); }
- std::shared_ptr<const ObjectModel> object(const Raul::Path& path) const;
+ std::shared_ptr<const ObjectModel> object(const raul::Path& path) const;
std::shared_ptr<const PluginModel> plugin(const URI& uri) const;
std::shared_ptr<const Resource> resource(const URI& uri) const;
@@ -100,22 +100,22 @@ public:
INGEN_SIGNAL(plugin_deleted, void, URI)
private:
- std::shared_ptr<ObjectModel> _object(const Raul::Path& path);
+ std::shared_ptr<ObjectModel> _object(const raul::Path& path);
std::shared_ptr<PluginModel> _plugin(const URI& uri);
std::shared_ptr<PluginModel> _plugin(const Atom& uri);
std::shared_ptr<Resource> _resource(const URI& uri);
void add_object(const std::shared_ptr<ObjectModel>& object);
- std::shared_ptr<ObjectModel> remove_object(const Raul::Path& path);
+ std::shared_ptr<ObjectModel> remove_object(const raul::Path& path);
void add_plugin(const std::shared_ptr<PluginModel>& pm);
- std::shared_ptr<GraphModel> connection_graph(const Raul::Path& tail_path,
- const Raul::Path& head_path);
+ std::shared_ptr<GraphModel> connection_graph(const raul::Path& tail_path,
+ const raul::Path& head_path);
// Slots for SigClientInterface signals
- bool attempt_connection(const Raul::Path& tail_path,
- const Raul::Path& head_path);
+ bool attempt_connection(const raul::Path& tail_path,
+ const raul::Path& head_path);
URIs& _uris;
Log& _log;
diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp
index fb95b716..59d1bb65 100644
--- a/include/ingen/client/GraphModel.hpp
+++ b/include/ingen/client/GraphModel.hpp
@@ -26,9 +26,9 @@
#include <cstdint>
#include <memory>
-namespace Raul {
+namespace raul {
class Path;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -67,7 +67,7 @@ public:
private:
friend class ClientStore;
- GraphModel(URIs& uris, const Raul::Path& graph_path)
+ GraphModel(URIs& uris, const raul::Path& graph_path)
: BlockModel(uris,
static_cast<const URI&>(uris.ingen_Graph),
graph_path)
diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp
index 73e2080e..e92618f8 100644
--- a/include/ingen/client/ObjectModel.hpp
+++ b/include/ingen/client/ObjectModel.hpp
@@ -58,8 +58,8 @@ public:
void on_property(const URI& uri, const Atom& value) override;
void on_property_removed(const URI& uri, const Atom& value) override;
- const Raul::Path& path() const override { return _path; }
- const Raul::Symbol& symbol() const override { return _symbol; }
+ const raul::Path& path() const override { return _path; }
+ const raul::Symbol& symbol() const override { return _symbol; }
std::shared_ptr<ObjectModel> parent() const { return _parent; }
bool polyphonic() const;
@@ -77,10 +77,10 @@ public:
protected:
friend class ClientStore;
- ObjectModel(URIs& uris, const Raul::Path& path);
+ ObjectModel(URIs& uris, const raul::Path& path);
ObjectModel(const ObjectModel& copy);
- void set_path(const Raul::Path& p) override;
+ void set_path(const raul::Path& p) override;
virtual void set_parent(const std::shared_ptr<ObjectModel>& p);
virtual void add_child(const std::shared_ptr<ObjectModel>& c) {}
virtual bool remove_child(const std::shared_ptr<ObjectModel>& c) { return true; }
@@ -90,8 +90,8 @@ protected:
std::shared_ptr<ObjectModel> _parent;
private:
- Raul::Path _path;
- Raul::Symbol _symbol;
+ raul::Path _path;
+ raul::Symbol _symbol;
};
} // namespace client
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index 07905ebb..b0a61e94 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -68,7 +68,7 @@ public:
const Atom& get_property(const URI& key) const override;
- Raul::Symbol default_block_symbol() const;
+ raul::Symbol default_block_symbol() const;
std::string human_name() const;
std::string port_human_name(uint32_t index) const;
diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp
index b081a74d..9323b84b 100644
--- a/include/ingen/client/PortModel.hpp
+++ b/include/ingen/client/PortModel.hpp
@@ -78,7 +78,7 @@ private:
friend class ClientStore;
PortModel(URIs& uris,
- const Raul::Path& path,
+ const raul::Path& path,
uint32_t index,
Direction dir)
: ObjectModel(uris, path)
diff --git a/include/ingen/client/SocketClient.hpp b/include/ingen/client/SocketClient.hpp
index 0e651250..1e75ae80 100644
--- a/include/ingen/client/SocketClient.hpp
+++ b/include/ingen/client/SocketClient.hpp
@@ -42,7 +42,7 @@ class INGEN_API SocketClient : public SocketWriter
public:
SocketClient(World& world,
const URI& uri,
- const std::shared_ptr<Raul::Socket>& sock,
+ const std::shared_ptr<raul::Socket>& sock,
const std::shared_ptr<Interface>& respondee)
: SocketWriter(world.uri_map(), world.uris(), uri, sock)
, _respondee(respondee)
@@ -63,11 +63,11 @@ public:
const URI& uri,
const std::shared_ptr<ingen::Interface>& respondee)
{
- const Raul::Socket::Type type = (uri.scheme() == "unix"
- ? Raul::Socket::Type::UNIX
- : Raul::Socket::Type::TCP);
+ const raul::Socket::Type type = (uri.scheme() == "unix"
+ ? raul::Socket::Type::UNIX
+ : raul::Socket::Type::TCP);
- std::shared_ptr<Raul::Socket> sock(new Raul::Socket(type));
+ std::shared_ptr<raul::Socket> sock(new raul::Socket(type));
if (!sock->connect(uri)) {
world.log().error("Failed to connect <%1%> (%2%)\n",
sock->uri(), strerror(errno));
diff --git a/include/ingen/paths.hpp b/include/ingen/paths.hpp
index 05496114..fefdf364 100644
--- a/include/ingen/paths.hpp
+++ b/include/ingen/paths.hpp
@@ -38,14 +38,14 @@ inline bool uri_is_path(const URI& uri)
}
}
-inline Raul::Path uri_to_path(const URI& uri)
+inline raul::Path uri_to_path(const URI& uri)
{
return (uri == main_uri())
- ? Raul::Path("/")
- : Raul::Path(uri.string().substr(main_uri().string().length()));
+ ? raul::Path("/")
+ : raul::Path(uri.string().substr(main_uri().string().length()));
}
-inline URI path_to_uri(const Raul::Path& path)
+inline URI path_to_uri(const raul::Path& path)
{
return URI(main_uri().string() + path.c_str());
}
diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp
index f42b2973..74476b83 100644
--- a/src/AtomReader.cpp
+++ b/src/AtomReader.cpp
@@ -109,14 +109,14 @@ AtomReader::atom_to_uri(const LV2_Atom* atom)
return boost::optional<URI>();
}
-boost::optional<Raul::Path>
+boost::optional<raul::Path>
AtomReader::atom_to_path(const LV2_Atom* atom)
{
boost::optional<URI> uri = atom_to_uri(atom);
if (uri && uri_is_path(*uri)) {
return uri_to_path(*uri);
}
- return boost::optional<Raul::Path>();
+ return boost::optional<raul::Path>();
}
Resource::Graph
@@ -205,10 +205,10 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
_uris.ingen_incidentTo.urid(), &incidentTo,
nullptr);
- boost::optional<Raul::Path> subject_path(atom_to_path(subject));
- boost::optional<Raul::Path> tail_path(atom_to_path(tail));
- boost::optional<Raul::Path> head_path(atom_to_path(head));
- boost::optional<Raul::Path> other_path(atom_to_path(incidentTo));
+ boost::optional<raul::Path> subject_path(atom_to_path(subject));
+ boost::optional<raul::Path> tail_path(atom_to_path(tail));
+ boost::optional<raul::Path> head_path(atom_to_path(head));
+ boost::optional<raul::Path> other_path(atom_to_path(incidentTo));
if (tail_path && head_path) {
_iface(Disconnect{seq, *tail_path, *head_path});
} else if (subject_path && other_path) {
@@ -245,8 +245,8 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
return false;
}
- boost::optional<Raul::Path> tail_path(atom_to_path(tail));
- boost::optional<Raul::Path> head_path(atom_to_path(head));
+ boost::optional<raul::Path> tail_path(atom_to_path(tail));
+ boost::optional<raul::Path> head_path(atom_to_path(head));
if (tail_path && head_path) {
_iface(Connect{seq, *tail_path, *head_path});
} else {
@@ -356,13 +356,13 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
return false;
}
- boost::optional<Raul::Path> subject_path(atom_to_path(subject));
+ boost::optional<raul::Path> subject_path(atom_to_path(subject));
if (!subject_path) {
_log.warn("Move message has non-path subject\n");
return false;
}
- boost::optional<Raul::Path> dest_path(atom_to_path(dest));
+ boost::optional<raul::Path> dest_path(atom_to_path(dest));
if (!dest_path) {
_log.warn("Move message has non-path destination\n");
return false;
diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp
index fe4d2326..6b60a3a5 100644
--- a/src/AtomWriter.cpp
+++ b/src/AtomWriter.cpp
@@ -158,7 +158,7 @@ AtomWriter::forge_properties(const Properties& properties)
}
void
-AtomWriter::forge_arc(const Raul::Path& tail, const Raul::Path& head)
+AtomWriter::forge_arc(const raul::Path& tail, const raul::Path& head)
{
LV2_Atom_Forge_Frame arc;
lv2_atom_forge_object(&_forge, &arc, 0, _uris.ingen_Arc);
@@ -504,7 +504,7 @@ AtomWriter::operator()(const Connect& message)
LV2_Atom_Forge_Frame msg;
forge_request(&msg, _uris.patch_Put, message.seq);
lv2_atom_forge_key(&_forge, _uris.patch_subject);
- forge_uri(path_to_uri(Raul::Path::lca(message.tail, message.head)));
+ forge_uri(path_to_uri(raul::Path::lca(message.tail, message.head)));
lv2_atom_forge_key(&_forge, _uris.patch_body);
forge_arc(message.tail, message.head);
lv2_atom_forge_pop(&_forge, &msg);
diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp
index 293b9867..ece002f8 100644
--- a/src/ClashAvoider.cpp
+++ b/src/ClashAvoider.cpp
@@ -47,8 +47,8 @@ ClashAvoider::map_uri(const URI& in)
}
}
-Raul::Path
-ClashAvoider::map_path(const Raul::Path& in)
+raul::Path
+ClashAvoider::map_path(const raul::Path& in)
{
unsigned offset = 0;
bool has_offset = false;
@@ -66,7 +66,7 @@ ClashAvoider::map_path(const Raul::Path& in)
base_path_str = base_path_str.substr(0, base_path_str.find_last_of('_'));
}
- Raul::Path base_path(base_path_str);
+ raul::Path base_path(base_path_str);
auto m = _symbol_map.find(in);
if (m != _symbol_map.end()) {
@@ -75,11 +75,11 @@ ClashAvoider::map_path(const Raul::Path& in)
using InsertRecord = std::pair<SymbolMap::iterator, bool>;
// See if parent is mapped
- Raul::Path parent = in.parent();
+ raul::Path parent = in.parent();
do {
auto p = _symbol_map.find(parent);
if (p != _symbol_map.end()) {
- const Raul::Path mapped = Raul::Path(
+ const raul::Path mapped = raul::Path(
p->second.base() + in.substr(parent.base().length()));
InsertRecord i = _symbol_map.emplace(in, mapped);
return i.first->second;
@@ -113,14 +113,14 @@ ClashAvoider::map_path(const Raul::Path& in)
std::stringstream ss;
ss << base_path << "_" << offset;
- if (!exists(Raul::Path(ss.str()))) {
+ if (!exists(raul::Path(ss.str()))) {
std::string name = base_path.symbol();
if (name.empty()) {
name = "_";
}
- Raul::Symbol sym(name);
+ raul::Symbol sym(name);
std::string str = ss.str();
- InsertRecord i = _symbol_map.emplace(in, Raul::Path(str));
+ InsertRecord i = _symbol_map.emplace(in, raul::Path(str));
offset = _store.child_name_offset(in.parent(), sym, false);
_offsets.emplace(base_path, offset);
return i.first->second;
@@ -137,7 +137,7 @@ ClashAvoider::map_path(const Raul::Path& in)
}
bool
-ClashAvoider::exists(const Raul::Path& path) const
+ClashAvoider::exists(const raul::Path& path) const
{
return _store.find(path) != _store.end();
}
@@ -158,8 +158,8 @@ numeric_suffix_start(const std::string& str)
}
std::string
-ClashAvoider::adjust_name(const Raul::Path& old_path,
- const Raul::Path& new_path,
+ClashAvoider::adjust_name(const raul::Path& old_path,
+ const raul::Path& new_path,
std::string name)
{
const auto name_suffix_start = numeric_suffix_start(name);
diff --git a/src/Parser.cpp b/src/Parser.cpp
index 7a3f594c..f54c4249 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -83,13 +83,13 @@ Parser::find_resources(Sord::World& world,
return resources;
}
-static boost::optional<Raul::Path>
+static boost::optional<raul::Path>
get_path(const URI& base, const URI& uri)
{
const URI relative = uri.make_relative(base);
const std::string uri_str = "/" + relative.string();
- return Raul::Path::is_valid(uri_str) ? Raul::Path(uri_str)
- : boost::optional<Raul::Path>();
+ return raul::Path::is_valid(uri_str) ? raul::Path(uri_str)
+ : boost::optional<raul::Path>();
}
static bool
@@ -145,14 +145,14 @@ get_properties(ingen::World& world,
return props;
}
-using PortRecord = std::pair<Raul::Path, Properties>;
+using PortRecord = std::pair<raul::Path, Properties>;
static boost::optional<PortRecord>
get_port(ingen::World& world,
Sord::Model& model,
const Sord::Node& subject,
Resource::Graph ctx,
- const Raul::Path& parent,
+ const raul::Path& parent,
uint32_t* index)
{
const URIs& uris = world.uris();
@@ -186,30 +186,30 @@ get_port(ingen::World& world,
: subject_str.substr(last_slash + 1));
}
- if (!Raul::Symbol::is_valid(sym)) {
+ if (!raul::Symbol::is_valid(sym)) {
world.log().error("Port %1% has invalid symbol `%2%'\n", subject, sym);
return boost::optional<PortRecord>();
}
- const Raul::Symbol port_sym(sym);
- const Raul::Path port_path(parent.child(port_sym));
+ const raul::Symbol port_sym(sym);
+ const raul::Path port_path(parent.child(port_sym));
props.erase(uris.lv2_symbol); // Don't set symbol property in engine
return make_pair(port_path, props);
}
-static boost::optional<Raul::Path>
+static boost::optional<raul::Path>
parse(
World& world,
Interface& target,
Sord::Model& model,
const URI& base_uri,
Sord::Node& subject,
- const boost::optional<Raul::Path>& parent = boost::optional<Raul::Path>(),
- const boost::optional<Raul::Symbol>& symbol = boost::optional<Raul::Symbol>(),
+ const boost::optional<raul::Path>& parent = boost::optional<raul::Path>(),
+ const boost::optional<raul::Symbol>& symbol = boost::optional<raul::Symbol>(),
const boost::optional<Properties>& data = boost::optional<Properties>());
-static boost::optional<Raul::Path>
+static boost::optional<raul::Path>
parse_graph(
World& world,
Interface& target,
@@ -217,18 +217,18 @@ parse_graph(
const URI& base_uri,
const Sord::Node& subject,
Resource::Graph ctx,
- const boost::optional<Raul::Path>& parent = boost::optional<Raul::Path>(),
- const boost::optional<Raul::Symbol>& symbol = boost::optional<Raul::Symbol>(),
+ const boost::optional<raul::Path>& parent = boost::optional<raul::Path>(),
+ const boost::optional<raul::Symbol>& symbol = boost::optional<raul::Symbol>(),
const boost::optional<Properties>& data = boost::optional<Properties>());
-static boost::optional<Raul::Path>
+static boost::optional<raul::Path>
parse_block(
World& world,
Interface& target,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
- const Raul::Path& path,
+ const raul::Path& path,
const boost::optional<Properties>& data = boost::optional<Properties>());
static bool
@@ -238,15 +238,15 @@ parse_arcs(
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
- const Raul::Path& graph);
+ const raul::Path& graph);
-static boost::optional<Raul::Path>
+static boost::optional<raul::Path>
parse_block(ingen::World& world,
ingen::Interface& target,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
- const Raul::Path& path,
+ const raul::Path& path,
const boost::optional<Properties>& data)
{
const URIs& uris = world.uris();
@@ -269,7 +269,7 @@ parse_block(ingen::World& world,
if (!prototype.is_valid()) {
world.log().error("Block %1% (%2%) missing mandatory lv2:prototype\n",
subject, path);
- return boost::optional<Raul::Path>();
+ return boost::optional<raul::Path>();
}
const auto* type_uri =
@@ -302,11 +302,11 @@ parse_block(ingen::World& world,
Sord::URI sub_node(*world.rdf_world(), sub_file);
parse_graph(world, target, sub_model, sub_base,
sub_node, Resource::Graph::INTERNAL,
- path.parent(), Raul::Symbol(path.symbol()), data);
+ path.parent(), raul::Symbol(path.symbol()), data);
parse_graph(world, target, model, base_uri,
subject, Resource::Graph::EXTERNAL,
- path.parent(), Raul::Symbol(path.symbol()), data);
+ path.parent(), raul::Symbol(path.symbol()), data);
} else {
// Prototype is non-file URI, plugin
Properties props = get_properties(
@@ -317,15 +317,15 @@ parse_block(ingen::World& world,
return path;
}
-static boost::optional<Raul::Path>
+static boost::optional<raul::Path>
parse_graph(ingen::World& world,
ingen::Interface& target,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
Resource::Graph ctx,
- const boost::optional<Raul::Path>& parent,
- const boost::optional<Raul::Symbol>& symbol,
+ const boost::optional<raul::Path>& parent,
+ const boost::optional<raul::Symbol>& symbol,
const boost::optional<Properties>& data)
{
const URIs& uris = world.uris();
@@ -337,13 +337,13 @@ parse_graph(ingen::World& world,
const Sord::Node nil;
// Build graph path and symbol
- Raul::Path graph_path;
+ raul::Path graph_path;
if (parent && symbol) {
graph_path = parent->child(*symbol);
} else if (parent) {
graph_path = *parent;
} else {
- graph_path = Raul::Path("/");
+ graph_path = raul::Path("/");
}
// Create graph
@@ -362,7 +362,7 @@ parse_graph(ingen::World& world,
world, model, port, ctx, graph_path, &index);
if (!port_record) {
world.log().error("Invalid port %1%\n", port);
- return boost::optional<Raul::Path>();
+ return boost::optional<raul::Path>();
}
// Store port information in ports map
@@ -390,8 +390,8 @@ parse_graph(ingen::World& world,
Sord::Node node = n.get_object();
URI node_uri = node;
assert(!node_uri.path().empty() && node_uri.path() != "/");
- const Raul::Path block_path = graph_path.child(
- Raul::Symbol(FilePath(node_uri.path()).stem().string()));
+ const raul::Path block_path = graph_path.child(
+ raul::Symbol(FilePath(node_uri.path()).stem().string()));
// Parse and create block
parse_block(world, target, model, base_uri, node, block_path,
@@ -413,7 +413,7 @@ parse_graph(ingen::World& world,
world, model, port, subctx, block_path, nullptr);
if (!port_record) {
world.log().error("Invalid port %1%\n", port);
- return boost::optional<Raul::Path>();
+ return boost::optional<raul::Path>();
}
// Create port and/or set all port properties
@@ -435,7 +435,7 @@ parse_arc(ingen::World& world,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
- const Raul::Path& graph)
+ const raul::Path& graph)
{
const URIs& uris = world.uris();
@@ -454,14 +454,14 @@ parse_arc(ingen::World& world,
return false;
}
- const boost::optional<Raul::Path> tail_path = get_path(
+ const boost::optional<raul::Path> tail_path = get_path(
base_uri, t.get_object());
if (!tail_path) {
world.log().error("Arc tail has invalid URI\n");
return false;
}
- const boost::optional<Raul::Path> head_path = get_path(
+ const boost::optional<raul::Path> head_path = get_path(
base_uri, h.get_object());
if (!head_path) {
world.log().error("Arc head has invalid URI\n");
@@ -487,7 +487,7 @@ parse_arcs(ingen::World& world,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
- const Raul::Path& graph)
+ const raul::Path& graph)
{
const Sord::URI ingen_arc(*world.rdf_world(), world.uris().ingen_arc);
const Sord::Node nil;
@@ -499,14 +499,14 @@ parse_arcs(ingen::World& world,
return true;
}
-static boost::optional<Raul::Path>
+static boost::optional<raul::Path>
parse(ingen::World& world,
ingen::Interface& target,
Sord::Model& model,
const URI& base_uri,
Sord::Node& subject,
- const boost::optional<Raul::Path>& parent,
- const boost::optional<Raul::Symbol>& symbol,
+ const boost::optional<raul::Path>& parent,
+ const boost::optional<raul::Symbol>& symbol,
const boost::optional<Properties>& data)
{
const URIs& uris = world.uris();
@@ -549,40 +549,40 @@ parse(ingen::World& world,
for (const auto& i : subjects) {
const Sord::Node& s = i.first;
const std::set<Sord::Node>& types = i.second;
- boost::optional<Raul::Path> ret;
+ boost::optional<raul::Path> ret;
if (types.find(graph_class) != types.end()) {
ret = parse_graph(world, target, model, base_uri,
s, Resource::Graph::INTERNAL,
parent, symbol, data);
} else if (types.find(block_class) != types.end()) {
- const Raul::Path rel_path(*get_path(base_uri, s));
- const Raul::Path path = parent ? parent->child(rel_path) : rel_path;
+ const raul::Path rel_path(*get_path(base_uri, s));
+ const raul::Path path = parent ? parent->child(rel_path) : rel_path;
ret = parse_block(world, target, model, base_uri, s, path, data);
} else if (types.find(in_port_class) != types.end() ||
types.find(out_port_class) != types.end()) {
- const Raul::Path rel_path(*get_path(base_uri, s));
- const Raul::Path path = parent ? parent->child(rel_path) : rel_path;
+ const raul::Path rel_path(*get_path(base_uri, s));
+ const raul::Path path = parent ? parent->child(rel_path) : rel_path;
const Properties properties = get_properties(
world, model, s, Resource::Graph::DEFAULT, data);
target.put(path_to_uri(path), properties);
ret = path;
} else if (types.find(arc_class) != types.end()) {
- Raul::Path parent_path(parent ? parent.get() : Raul::Path("/"));
+ raul::Path parent_path(parent ? parent.get() : raul::Path("/"));
parse_arc(world, target, model, base_uri, s, parent_path);
} else {
world.log().error("Subject has no known types\n");
}
}
- return boost::optional<Raul::Path>();
+ return boost::optional<raul::Path>();
}
bool
Parser::parse_file(ingen::World& world,
ingen::Interface& target,
const FilePath& path,
- const boost::optional<Raul::Path>& parent,
- const boost::optional<Raul::Symbol>& symbol,
+ const boost::optional<raul::Path>& parent,
+ const boost::optional<raul::Symbol>& symbol,
const boost::optional<Properties>& data)
{
// Get absolute file path
@@ -650,7 +650,7 @@ Parser::parse_file(ingen::World& world,
}
Sord::Node subject(*world.rdf_world(), Sord::Node::URI, uri.string());
- boost::optional<Raul::Path> parsed_path
+ boost::optional<raul::Path> parsed_path
= parse(world, target, model, model.base_uri(),
subject, parent, symbol, data);
@@ -670,8 +670,8 @@ Parser::parse_string(ingen::World& world,
ingen::Interface& target,
const std::string& str,
const URI& base_uri,
- const boost::optional<Raul::Path>& parent,
- const boost::optional<Raul::Symbol>& symbol,
+ const boost::optional<raul::Path>& parent,
+ const boost::optional<raul::Symbol>& symbol,
const boost::optional<Properties>& data)
{
// Load string into model
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp
index bc4da25d..f368820e 100644
--- a/src/Serialiser.cpp
+++ b/src/Serialiser.cpp
@@ -74,7 +74,7 @@ struct Serialiser::Impl {
enum class Mode { TO_FILE, TO_STRING };
- void start_to_file(const Raul::Path& root,
+ void start_to_file(const raul::Path& root,
const FilePath& filename);
std::set<const Resource*>
@@ -94,7 +94,7 @@ struct Serialiser::Impl {
void write_bundle(const std::shared_ptr<const Node>& graph, const URI& uri);
- Sord::Node path_rdf_node(const Raul::Path& path) const;
+ Sord::Node path_rdf_node(const raul::Path& path) const;
void write_manifest(const FilePath& bundle_path,
const std::shared_ptr<const Node>& graph);
@@ -107,7 +107,7 @@ struct Serialiser::Impl {
std::string finish();
- Raul::Path _root_path;
+ raul::Path _root_path;
Mode _mode;
URI _base_uri;
FilePath _basename;
@@ -129,7 +129,7 @@ Serialiser::Impl::write_manifest(const FilePath& bundle_path,
const FilePath manifest_path(bundle_path / "manifest.ttl");
const FilePath binary_path(ingen_module_path("lv2"));
- start_to_file(Raul::Path("/"), manifest_path);
+ start_to_file(raul::Path("/"), manifest_path);
Sord::World& world = _model->world();
const URIs& uris = _world.uris();
@@ -159,7 +159,7 @@ Serialiser::Impl::write_plugins(const FilePath& bundle_path,
{
const FilePath plugins_path(bundle_path / "plugins.ttl");
- start_to_file(Raul::Path("/"), plugins_path);
+ start_to_file(raul::Path("/"), plugins_path);
Sord::World& world = _model->world();
const URIs& uris = _world.uris();
@@ -205,7 +205,7 @@ Serialiser::Impl::write_bundle(const std::shared_ptr<const Node>& graph,
filesystem::create_directories(path);
const FilePath main_file = path / "main.ttl";
- const Raul::Path old_root_path = _root_path;
+ const raul::Path old_root_path = _root_path;
start_to_file(graph->path(), main_file);
@@ -225,7 +225,7 @@ Serialiser::Impl::write_bundle(const std::shared_ptr<const Node>& graph,
* This must be called before any serializing methods.
*/
void
-Serialiser::Impl::start_to_file(const Raul::Path& root,
+Serialiser::Impl::start_to_file(const raul::Path& root,
const FilePath& filename)
{
_base_uri = URI(filename);
@@ -240,7 +240,7 @@ Serialiser::Impl::start_to_file(const Raul::Path& root,
}
void
-Serialiser::start_to_string(const Raul::Path& root, const URI& base_uri)
+Serialiser::start_to_string(const raul::Path& root, const URI& base_uri)
{
me->_root_path = root;
me->_base_uri = base_uri;
@@ -249,7 +249,7 @@ Serialiser::start_to_string(const Raul::Path& root, const URI& base_uri)
}
void
-Serialiser::start_to_file(const Raul::Path& root, const FilePath& filename)
+Serialiser::start_to_file(const raul::Path& root, const FilePath& filename)
{
me->start_to_file(root, filename);
}
@@ -282,7 +282,7 @@ Serialiser::Impl::finish()
}
Sord::Node
-Serialiser::Impl::path_rdf_node(const Raul::Path& path) const
+Serialiser::Impl::path_rdf_node(const raul::Path& path) const
{
assert(_model);
assert(path == _root_path || path.is_child_of(_root_path));
diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp
index 11bc0b0c..e643b9a2 100644
--- a/src/SocketReader.cpp
+++ b/src/SocketReader.cpp
@@ -38,7 +38,7 @@ namespace ingen {
SocketReader::SocketReader(ingen::World& world,
Interface& iface,
- std::shared_ptr<Raul::Socket> sock)
+ std::shared_ptr<raul::Socket> sock)
: _world(world)
, _iface(iface)
, _env()
diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp
index 4e895135..0e5948e5 100644
--- a/src/SocketWriter.cpp
+++ b/src/SocketWriter.cpp
@@ -35,7 +35,7 @@ namespace ingen {
SocketWriter::SocketWriter(URIMap& map,
URIs& uris,
const URI& uri,
- std::shared_ptr<Raul::Socket> sock)
+ std::shared_ptr<raul::Socket> sock)
: TurtleWriter(map, uris, uri)
, _socket(std::move(sock))
{}
diff --git a/src/Store.cpp b/src/Store.cpp
index f176613e..fe5527a5 100644
--- a/src/Store.cpp
+++ b/src/Store.cpp
@@ -100,9 +100,9 @@ Store::remove(const iterator top, Objects& removed)
}
void
-Store::rename(const iterator top, const Raul::Path& new_path)
+Store::rename(const iterator top, const raul::Path& new_path)
{
- const Raul::Path old_path = top->first;
+ const raul::Path old_path = top->first;
// Remove the object and all its descendants
Objects removed;
@@ -110,10 +110,10 @@ Store::rename(const iterator top, const Raul::Path& new_path)
// Rename all the removed objects
for (Objects::const_iterator i = removed.begin(); i != removed.end(); ++i) {
- const Raul::Path path = (i->first == old_path)
+ const raul::Path path = (i->first == old_path)
? new_path
: new_path.child(
- Raul::Path(i->first.substr(old_path.base().length() - 1)));
+ raul::Path(i->first.substr(old_path.base().length() - 1)));
i->second->set_path(path);
assert(find(path) == end()); // Shouldn't be dropping objects!
@@ -122,8 +122,8 @@ Store::rename(const iterator top, const Raul::Path& new_path)
}
unsigned
-Store::child_name_offset(const Raul::Path& parent,
- const Raul::Symbol& symbol,
+Store::child_name_offset(const raul::Path& parent,
+ const raul::Symbol& symbol,
bool allow_zero) const
{
unsigned offset = 0;
@@ -134,7 +134,7 @@ Store::child_name_offset(const Raul::Path& parent,
if (offset > 0) {
ss << "_" << offset;
}
- if (find(parent.child(Raul::Symbol(ss.str()))) == end() &&
+ if (find(parent.child(raul::Symbol(ss.str()))) == end() &&
(allow_zero || offset > 0)) {
break;
} else if (offset == 0) {
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index a6e4a0a6..cdfb3fcd 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -40,7 +40,7 @@ namespace client {
BlockModel::BlockModel(URIs& uris,
const std::shared_ptr<PluginModel>& plugin,
- const Raul::Path& path)
+ const raul::Path& path)
: ObjectModel(uris, path)
, _plugin_uri(plugin->uri())
, _plugin(plugin)
@@ -50,7 +50,7 @@ BlockModel::BlockModel(URIs& uris,
{
}
-BlockModel::BlockModel(URIs& uris, URI plugin_uri, const Raul::Path& path)
+BlockModel::BlockModel(URIs& uris, URI plugin_uri, const raul::Path& path)
: ObjectModel(uris, path)
, _plugin_uri(std::move(plugin_uri))
, _num_values(0)
@@ -88,7 +88,7 @@ BlockModel::remove_port(const std::shared_ptr<PortModel>& port)
}
void
-BlockModel::remove_port(const Raul::Path& port_path)
+BlockModel::remove_port(const raul::Path& port_path)
{
for (auto i = _ports.begin(); i != _ports.end(); ++i) {
if ((*i)->path() == port_path) {
@@ -152,7 +152,7 @@ BlockModel::add_port(const std::shared_ptr<PortModel>& pm)
}
std::shared_ptr<const PortModel>
-BlockModel::get_port(const Raul::Symbol& symbol) const
+BlockModel::get_port(const raul::Symbol& symbol) const
{
for (auto p : _ports) {
if (p->symbol() == symbol) {
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 9c577673..d8238c8a 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -100,7 +100,7 @@ ClientStore::add_object(const std::shared_ptr<ObjectModel>& object)
}
std::shared_ptr<ObjectModel>
-ClientStore::remove_object(const Raul::Path& path)
+ClientStore::remove_object(const raul::Path& path)
{
// Find the object, the "top" of the tree to remove
const iterator top = find(path);
@@ -163,7 +163,7 @@ ClientStore::plugin(const URI& uri) const
}
std::shared_ptr<ObjectModel>
-ClientStore::_object(const Raul::Path& path)
+ClientStore::_object(const raul::Path& path)
{
const iterator i = find(path);
if (i == end()) {
@@ -177,7 +177,7 @@ ClientStore::_object(const Raul::Path& path)
}
std::shared_ptr<const ObjectModel>
-ClientStore::object(const Raul::Path& path) const
+ClientStore::object(const raul::Path& path) const
{
return const_cast<ClientStore*>(this)->_object(path);
}
@@ -297,7 +297,7 @@ ClientStore::operator()(const Put& msg)
return;
}
- const Raul::Path path(uri_to_path(uri));
+ const raul::Path path(uri_to_path(uri));
auto obj = std::dynamic_pointer_cast<ObjectModel>(_object(path));
if (obj) {
@@ -369,7 +369,7 @@ ClientStore::operator()(const Delta& msg)
return;
}
- const Raul::Path path(uri_to_path(uri));
+ const raul::Path path(uri_to_path(uri));
std::shared_ptr<ObjectModel> obj = _object(path);
if (obj) {
@@ -413,8 +413,8 @@ ClientStore::operator()(const SetProperty& msg)
}
std::shared_ptr<GraphModel>
-ClientStore::connection_graph(const Raul::Path& tail_path,
- const Raul::Path& head_path)
+ClientStore::connection_graph(const raul::Path& tail_path,
+ const raul::Path& head_path)
{
std::shared_ptr<GraphModel> graph;
@@ -443,8 +443,8 @@ ClientStore::connection_graph(const Raul::Path& tail_path,
}
bool
-ClientStore::attempt_connection(const Raul::Path& tail_path,
- const Raul::Path& head_path)
+ClientStore::attempt_connection(const raul::Path& tail_path,
+ const raul::Path& head_path)
{
auto tail = std::dynamic_pointer_cast<PortModel>(_object(tail_path));
auto head = std::dynamic_pointer_cast<PortModel>(_object(head_path));
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index b769d5f1..c172c445 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -32,7 +32,7 @@
namespace ingen {
namespace client {
-ObjectModel::ObjectModel(URIs& uris, const Raul::Path& path)
+ObjectModel::ObjectModel(URIs& uris, const raul::Path& path)
: Node(uris, path)
, _path(path)
, _symbol((path == "/") ? "root" : path.symbol())
@@ -100,10 +100,10 @@ ObjectModel::set(const std::shared_ptr<ObjectModel>& o)
}
void
-ObjectModel::set_path(const Raul::Path& p)
+ObjectModel::set_path(const raul::Path& p)
{
_path = p;
- _symbol = Raul::Symbol(p.is_root() ? "root" : p.symbol());
+ _symbol = raul::Symbol(p.is_root() ? "root" : p.symbol());
set_uri(path_to_uri(p));
_signal_moved.emit();
}
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index ca044114..4dddd147 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -111,7 +111,7 @@ PluginModel::get_property(const URI& key) const
}
str = str.substr(last_delim + 1);
- std::string symbol = Raul::Symbol::symbolify(str);
+ std::string symbol = raul::Symbol::symbolify(str);
set_property(_uris.lv2_symbol, _uris.forge.alloc(symbol));
return get_property(key);
}
@@ -175,14 +175,14 @@ PluginModel::add_preset(const URI& uri, const std::string& label)
_signal_preset.emit(uri, label);
}
-Raul::Symbol
+raul::Symbol
PluginModel::default_block_symbol() const
{
const Atom& name_atom = get_property(_uris.lv2_symbol);
if (name_atom.is_valid() && name_atom.type() == _uris.forge.String) {
- return Raul::Symbol::symbolify(name_atom.ptr<char>());
+ return raul::Symbol::symbolify(name_atom.ptr<char>());
} else {
- return Raul::Symbol("_");
+ return raul::Symbol("_");
}
}
diff --git a/src/gui/.clang-tidy b/src/gui/.clang-tidy
index 335a294c..7f216d2c 100644
--- a/src/gui/.clang-tidy
+++ b/src/gui/.clang-tidy
@@ -63,6 +63,12 @@ Checks: >
-readability-convert-member-functions-to-static,
-readability-implicit-bool-conversion,
-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/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index 5b90c55d..4e257d88 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -46,7 +46,7 @@ BreadCrumbs::BreadCrumbs(App& app)
}
std::shared_ptr<GraphView>
-BreadCrumbs::view(const Raul::Path& path)
+BreadCrumbs::view(const raul::Path& path)
{
for (const auto& b : _breadcrumbs) {
if (b->path() == path) {
@@ -63,7 +63,7 @@ BreadCrumbs::view(const Raul::Path& path)
* children preserved.
*/
void
-BreadCrumbs::build(const Raul::Path& path,
+BreadCrumbs::build(const raul::Path& path,
const std::shared_ptr<GraphView>& view)
{
bool old_enable_signal = _enable_signal;
@@ -98,7 +98,7 @@ BreadCrumbs::build(const Raul::Path& path,
suffix = suffix.substr(1);
}
const string name = suffix.substr(0, suffix.find('/'));
- _full_path = _full_path.child(Raul::Symbol(name));
+ _full_path = _full_path.child(raul::Symbol(name));
BreadCrumb* but = create_crumb(_full_path, view);
pack_start(*but, false, false, 1);
_breadcrumbs.push_back(but);
@@ -129,19 +129,19 @@ BreadCrumbs::build(const Raul::Path& path,
_breadcrumbs.clear();
// Add root
- BreadCrumb* root_but = create_crumb(Raul::Path("/"), view);
+ BreadCrumb* root_but = create_crumb(raul::Path("/"), view);
pack_start(*root_but, false, false, 1);
_breadcrumbs.push_front(root_but);
root_but->set_active(root_but->path() == _active_path);
- Raul::Path working_path("/");
+ raul::Path working_path("/");
string suffix = path.substr(1);
while (suffix.length() > 0) {
if (suffix[0] == '/') {
suffix = suffix.substr(1);
}
const string name = suffix.substr(0, suffix.find('/'));
- working_path = working_path.child(Raul::Symbol(name));
+ working_path = working_path.child(raul::Symbol(name));
BreadCrumb* but = create_crumb(working_path, view);
pack_start(*but, false, false, 1);
_breadcrumbs.push_back(but);
@@ -162,7 +162,7 @@ BreadCrumbs::build(const Raul::Path& path,
* match, otherwise ignoring `view`.
*/
BreadCrumbs::BreadCrumb*
-BreadCrumbs::create_crumb(const Raul::Path& path,
+BreadCrumbs::create_crumb(const raul::Path& path,
const std::shared_ptr<GraphView>& view)
{
BreadCrumb* but = manage(new BreadCrumb(
@@ -219,7 +219,7 @@ BreadCrumbs::object_destroyed(const URI& uri)
}
void
-BreadCrumbs::object_moved(const Raul::Path& old_path, const Raul::Path& new_path)
+BreadCrumbs::object_moved(const raul::Path& old_path, const raul::Path& new_path)
{
for (const auto& b : _breadcrumbs) {
if (b->path() == old_path) {
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 0b553faa..d877d0c5 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -50,11 +50,11 @@ class BreadCrumbs : public Gtk::HBox
public:
explicit BreadCrumbs(App& app);
- std::shared_ptr<GraphView> view(const Raul::Path& path);
+ std::shared_ptr<GraphView> view(const raul::Path& path);
- void build(const Raul::Path& path, const std::shared_ptr<GraphView>& view);
+ void build(const raul::Path& path, const std::shared_ptr<GraphView>& view);
- sigc::signal<void, const Raul::Path&, std::shared_ptr<GraphView>>
+ sigc::signal<void, const raul::Path&, std::shared_ptr<GraphView>>
signal_graph_selected;
private:
@@ -70,7 +70,7 @@ private:
class BreadCrumb : public Gtk::ToggleButton
{
public:
- BreadCrumb(const Raul::Path& path,
+ BreadCrumb(const raul::Path& path,
const std::shared_ptr<GraphView>& view = nullptr)
: _path(path), _view(view)
{
@@ -86,10 +86,10 @@ private:
_view = view;
}
- const Raul::Path& path() const { return _path; }
+ const raul::Path& path() const { return _path; }
std::shared_ptr<GraphView> view() const { return _view; }
- void set_path(const Raul::Path& path) {
+ void set_path(const raul::Path& path) {
remove();
const char* text = (path.is_root()) ? "/" : path.symbol();
Gtk::Label* lab = manage(new Gtk::Label(text));
@@ -103,21 +103,21 @@ private:
}
private:
- Raul::Path _path;
+ raul::Path _path;
std::shared_ptr<GraphView> _view;
};
- BreadCrumb* create_crumb(const Raul::Path& path,
+ BreadCrumb* create_crumb(const raul::Path& path,
const std::shared_ptr<GraphView>& view = nullptr);
void breadcrumb_clicked(BreadCrumb* crumb);
void message(const Message& msg);
void object_destroyed(const URI& uri);
- void object_moved(const Raul::Path& old_path, const Raul::Path& new_path);
+ void object_moved(const raul::Path& old_path, const raul::Path& new_path);
- Raul::Path _active_path;
- Raul::Path _full_path;
+ raul::Path _active_path;
+ raul::Path _full_path;
bool _enable_signal;
std::list<BreadCrumb*> _breadcrumbs;
};
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 8534c89c..ea1a6e27 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -274,7 +274,7 @@ ConnectWindow::connect(bool existing)
const std::string port = std::to_string(_port_spinbutton->get_value_as_int());
const char* cmd[] = { "ingen", "-e", "-E", port.c_str(), nullptr };
- if (!Raul::Process::launch(cmd)) {
+ if (!raul::Process::launch(cmd)) {
error("Failed to launch engine process");
return;
}
@@ -548,7 +548,7 @@ ConnectWindow::gtk_callback()
} else if (_connect_stage == 4) {
if (!_app->store()->empty()) {
auto root = std::dynamic_pointer_cast<const client::GraphModel>(
- _app->store()->object(Raul::Path("/")));
+ _app->store()->object(raul::Path("/")));
if (root) {
set_connected_to(_app->interface());
_app->window_factory()->present_graph(root);
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 9fef803b..f994d47c 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -299,7 +299,7 @@ GraphBox::set_status_text(const std::string& text)
}
void
-GraphBox::set_graph_from_path(const Raul::Path& path,
+GraphBox::set_graph_from_path(const raul::Path& path,
const std::shared_ptr<GraphView>& view)
{
if (view) {
@@ -654,7 +654,7 @@ GraphBox::event_save_as()
const std::string symbol(basename.substr(0, basename.find('.')));
- if (!Raul::Symbol::is_valid(symbol)) {
+ if (!raul::Symbol::is_valid(symbol)) {
error(
"<b>Ingen bundle names must be valid symbols.</b>",
"All characters must be _, a-z, A-Z, or 0-9, but the first may not be 0-9.");
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index b8f2cce0..cfc4a67f 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -42,9 +42,9 @@ class MenuItem;
class Statusbar;
} // namespace Gtk
-namespace Raul {
+namespace raul {
class Path;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -97,7 +97,7 @@ public:
void show_port_status(const client::PortModel* port,
const Atom& value);
- void set_graph_from_path(const Raul::Path& path,
+ void set_graph_from_path(const raul::Path& path,
const std::shared_ptr<GraphView>& view);
void object_entered(const client::ObjectModel* model);
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index c833f20f..77c33052 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -714,7 +714,7 @@ GraphCanvas::paste()
const Glib::ustring str = Gtk::Clipboard::get()->wait_for_text();
auto parser = _app.loader()->parser();
const URIs& uris = _app.uris();
- const Raul::Path& parent = _graph->path();
+ const raul::Path& parent = _graph->path();
if (!parser) {
_app.log().error("Unable to load parser, paste unavailable\n");
return;
@@ -736,7 +736,7 @@ GraphCanvas::paste()
_app.world(), clipboard, str, main_uri());
// Figure out the copy graph base path
- Raul::Path copy_root("/");
+ raul::Path copy_root("/");
if (base_uri) {
std::string base = *base_uri;
if (base[base.size() - 1] == '/') {
@@ -749,7 +749,7 @@ GraphCanvas::paste()
float min_x = std::numeric_limits<float>::max();
float min_y = std::numeric_limits<float>::max();
for (const auto& c : clipboard) {
- if (c.first.parent() == Raul::Path("/")) {
+ if (c.first.parent() == raul::Path("/")) {
const Atom& x = c.second->get_property(uris.ingen_canvasX);
const Atom& y = c.second->get_property(uris.ingen_canvasY);
if (x.type() == uris.atom_Float) {
@@ -776,14 +776,14 @@ GraphCanvas::paste()
// Put each top level object in the clipboard store
ClashAvoider avoider(*_app.store());
for (const auto& c : clipboard) {
- if (c.first.is_root() || c.first.parent() != Raul::Path("/")) {
+ if (c.first.is_root() || c.first.parent() != raul::Path("/")) {
continue;
}
const auto node = c.second;
- const Raul::Path& old_path = copy_root.child(node->path());
+ const raul::Path& old_path = copy_root.child(node->path());
const URI& old_uri = path_to_uri(old_path);
- const Raul::Path& new_path =
+ const raul::Path& new_path =
avoider.map_path(parent.child(node->path()));
// Copy properties, except those that should not be inherited in copies
@@ -825,7 +825,7 @@ GraphCanvas::paste()
}
// Connect objects
- for (const auto& a : clipboard.object(Raul::Path("/"))->arcs()) {
+ for (const auto& a : clipboard.object(raul::Path("/"))->arcs()) {
_app.interface()->connect(
avoider.map_path(parent.child(a.second->tail_path())),
avoider.map_path(parent.child(a.second->head_path())));
@@ -848,12 +848,12 @@ GraphCanvas::generate_port_name(
snprintf(num_buf, sizeof(num_buf), "%u", i);
symbol = sym_base + "_";
symbol += num_buf;
- if (!_graph->get_port(Raul::Symbol::symbolify(symbol))) {
+ if (!_graph->get_port(raul::Symbol::symbolify(symbol))) {
break;
}
}
- assert(Raul::Path::is_valid(string("/") + symbol));
+ assert(raul::Path::is_valid(string("/") + symbol));
name.append(" ").append(num_buf);
}
@@ -867,7 +867,7 @@ GraphCanvas::menu_add_port(const string& sym_base,
string sym;
string name;
generate_port_name(sym_base, sym, name_base, name);
- const Raul::Path& path = _graph->path().child(Raul::Symbol(sym));
+ const raul::Path& path = _graph->path().child(raul::Symbol(sym));
const URIs& uris = _app.uris();
@@ -893,16 +893,16 @@ GraphCanvas::load_plugin(const std::weak_ptr<PluginModel>& weak_plugin)
return;
}
- Raul::Symbol symbol = plugin->default_block_symbol();
+ raul::Symbol symbol = plugin->default_block_symbol();
unsigned offset = _app.store()->child_name_offset(_graph->path(), symbol);
if (offset != 0) {
std::stringstream ss;
ss << symbol << "_" << offset;
- symbol = Raul::Symbol(ss.str());
+ symbol = raul::Symbol(ss.str());
}
const URIs& uris = _app.uris();
- const Raul::Path path = _graph->path().child(symbol);
+ const raul::Path path = _graph->path().child(symbol);
// FIXME: polyphony?
Properties props = get_initial_data();
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index e413c194..b1e60aa3 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -149,7 +149,7 @@ private:
int _paste_count;
// Track pasted objects so they can be selected when they arrive
- std::set<Raul::Path> _pastees;
+ std::set<raul::Path> _pastees;
Gtk::Menu* _menu = nullptr;
Gtk::Menu* _internal_menu = nullptr;
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index bdd6c349..7a80a2bf 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -187,8 +187,8 @@ LoadGraphWindow::ok_clicked()
if (_import) {
// If unset load_graph will load value
- boost::optional<Raul::Path> parent;
- boost::optional<Raul::Symbol> symbol;
+ boost::optional<raul::Path> parent;
+ boost::optional<raul::Symbol> symbol;
if (!_graph->path().is_root()) {
parent = _graph->path().parent();
symbol = _graph->symbol();
@@ -206,9 +206,9 @@ LoadGraphWindow::ok_clicked()
Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
y = _app->forge().make(y.get<float>() + 20.0f);
- Raul::Symbol symbol(symbol_from_filename(u));
+ raul::Symbol symbol(symbol_from_filename(u));
if (uri_list.size() == 1 && !_symbol_entry->get_text().empty()) {
- symbol = Raul::Symbol::symbolify(_symbol_entry->get_text());
+ symbol = raul::Symbol::symbolify(_symbol_entry->get_text());
}
symbol = avoid_symbol_clash(symbol);
@@ -233,16 +233,16 @@ LoadGraphWindow::cancel_clicked()
hide();
}
-Raul::Symbol
+raul::Symbol
LoadGraphWindow::symbol_from_filename(const Glib::ustring& filename)
{
std::string symbol_str = Glib::path_get_basename(get_filename());
symbol_str = symbol_str.substr(0, symbol_str.find('.'));
- return Raul::Symbol::symbolify(symbol_str);
+ return raul::Symbol::symbolify(symbol_str);
}
-Raul::Symbol
-LoadGraphWindow::avoid_symbol_clash(const Raul::Symbol& symbol)
+raul::Symbol
+LoadGraphWindow::avoid_symbol_clash(const raul::Symbol& symbol)
{
unsigned offset = _app->store()->child_name_offset(
_graph->path(), symbol);
@@ -250,7 +250,7 @@ LoadGraphWindow::avoid_symbol_clash(const Raul::Symbol& symbol)
if (offset != 0) {
std::stringstream ss;
ss << symbol << "_" << offset;
- return Raul::Symbol(ss.str());
+ return raul::Symbol(ss.str());
} else {
return symbol;
}
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index f18998c7..b2063d75 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -77,8 +77,8 @@ private:
void cancel_clicked();
void ok_clicked();
- Raul::Symbol symbol_from_filename(const Glib::ustring& filename);
- Raul::Symbol avoid_symbol_clash(const Raul::Symbol& symbol);
+ raul::Symbol symbol_from_filename(const Glib::ustring& filename);
+ raul::Symbol avoid_symbol_clash(const raul::Symbol& symbol);
App* _app = nullptr;
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 67115cf3..5a9536a2 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -167,9 +167,9 @@ LoadPluginWindow::name_changed()
// Toggle add button sensitivity according name legality
if (_selection->get_selected_rows().size() == 1) {
const string sym = _name_entry->get_text();
- if (!Raul::Symbol::is_valid(sym)) {
+ if (!raul::Symbol::is_valid(sym)) {
_add_button->property_sensitive() = false;
- } else if (_app->store()->find(_graph->path().child(Raul::Symbol(sym)))
+ } else if (_app->store()->find(_graph->path().child(raul::Symbol(sym)))
!= _app->store()->end()) {
_add_button->property_sensitive() = false;
} else {
@@ -407,7 +407,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
name = generate_module_name(plugin, _name_offset);
}
- if (name.empty() || !Raul::Symbol::is_valid(name)) {
+ if (name.empty() || !raul::Symbol::is_valid(name)) {
Gtk::MessageDialog dialog(
*this,
"Unable to choose a default name, please provide one",
@@ -415,7 +415,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
dialog.run();
} else {
- Raul::Path path = _graph->path().child(Raul::Symbol::symbolify(name));
+ raul::Path path = _graph->path().child(raul::Symbol::symbolify(name));
Properties props = _initial_data;
props.emplace(uris.rdf_type, Property(uris.ingen_Block));
props.emplace(uris.lv2_prototype, _app->forge().make_urid(plugin->uri()));
diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp
index b6f1ccc1..9b6c4a1a 100644
--- a/src/gui/NewSubgraphWindow.cpp
+++ b/src/gui/NewSubgraphWindow.cpp
@@ -95,10 +95,10 @@ void
NewSubgraphWindow::name_changed()
{
std::string name = _name_entry->get_text();
- if (!Raul::Symbol::is_valid(name)) {
+ if (!raul::Symbol::is_valid(name)) {
_message_label->set_text("Name contains invalid characters.");
_ok_button->property_sensitive() = false;
- } else if (_app->store()->find(_graph->path().child(Raul::Symbol(name)))
+ } else if (_app->store()->find(_graph->path().child(raul::Symbol(name)))
!= _app->store()->end()) {
_message_label->set_text("An object already exists with that name.");
_ok_button->property_sensitive() = false;
@@ -112,8 +112,8 @@ void
NewSubgraphWindow::ok_clicked()
{
const uint32_t poly = _poly_spinbutton->get_value_as_int();
- const Raul::Path path = _graph->path().child(
- Raul::Symbol::symbolify(_name_entry->get_text()));
+ const raul::Path path = _graph->path().child(
+ raul::Symbol::symbolify(_name_entry->get_text()));
// Create graph
Properties props;
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index d0cb2e65..517d0018 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -239,9 +239,9 @@ NodeMenu::on_save_preset_activated()
const std::string user_path = Glib::filename_from_uri(user_uri);
const std::string dirname = Glib::path_get_dirname(user_path);
const std::string basename = Glib::path_get_basename(user_path);
- const std::string sym = Raul::Symbol::symbolify(basename);
+ const std::string sym = raul::Symbol::symbolify(basename);
const std::string plugname = block()->plugin_model()->human_name();
- const std::string prefix = Raul::Symbol::symbolify(plugname);
+ const std::string prefix = raul::Symbol::symbolify(plugname);
const std::string bundle = prefix + "_" + sym + ".preset.lv2/";
const std::string file = sym + ".ttl";
const std::string real_path = Glib::build_filename(dirname, bundle, file);
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 8a6acfce..652ac05d 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -169,7 +169,7 @@ PortMenu::on_menu_expose()
auto block = std::dynamic_pointer_cast<const BlockModel>(port->parent());
const std::string label = block->label() + " " + block->port_label(port);
- const Raul::Path path = Raul::Path(block->path() + Raul::Symbol("_" + port->symbol()));
+ const raul::Path path = raul::Path(block->path() + raul::Symbol("_" + port->symbol()));
ingen::Resource r(*_object);
r.remove_property(uris.lv2_index, uris.patch_wildcard);
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index af213129..e2c1e98c 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -95,12 +95,12 @@ void
RenameWindow::values_changed()
{
const std::string& symbol = _symbol_entry->get_text();
- if (!Raul::Symbol::is_valid(symbol)) {
+ if (!raul::Symbol::is_valid(symbol)) {
_message_label->set_text("Invalid symbol");
_ok_button->property_sensitive() = false;
} else if (_object->symbol() != symbol &&
_app->store()->object(
- _object->parent()->path().child(Raul::Symbol(symbol)))) {
+ _object->parent()->path().child(raul::Symbol(symbol)))) {
_message_label->set_text("An object already exists with that path");
_ok_button->property_sensitive() = false;
} else {
@@ -128,7 +128,7 @@ RenameWindow::ok_clicked()
const URIs& uris = _app->uris();
const std::string& symbol_str = _symbol_entry->get_text();
const std::string& label = _label_entry->get_text();
- Raul::Path path = _object->path();
+ raul::Path path = _object->path();
const Atom& name_atom = _object->get_property(uris.lv2_name);
if (!label.empty() && (name_atom.type() != uris.forge.String ||
@@ -138,8 +138,8 @@ RenameWindow::ok_clicked()
_app->forge().alloc(label));
}
- if (Raul::Symbol::is_valid(symbol_str)) {
- const Raul::Symbol symbol(symbol_str);
+ if (raul::Symbol::is_valid(symbol_str)) {
+ const raul::Symbol symbol(symbol_str);
if (symbol != _object->symbol()) {
path = _object->path().parent().child(symbol);
_app->interface()->move(_object->path(), path);
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index ff12e028..663529da 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -89,8 +89,8 @@ ThreadedLoader::run()
void
ThreadedLoader::load_graph(bool merge,
const FilePath& file_path,
- const optional<Raul::Path>& engine_parent,
- const optional<Raul::Symbol>& engine_symbol,
+ const optional<raul::Path>& engine_parent,
+ const optional<raul::Symbol>& engine_symbol,
const optional<Properties>& engine_data)
{
std::lock_guard<std::mutex> lock(_mutex);
@@ -116,8 +116,8 @@ ThreadedLoader::load_graph(bool merge,
void
ThreadedLoader::load_graph_event(const FilePath& file_path,
- const optional<Raul::Path>& engine_parent,
- const optional<Raul::Symbol>& engine_symbol,
+ const optional<raul::Path>& engine_parent,
+ const optional<raul::Symbol>& engine_symbol,
const optional<Properties>& engine_data)
{
std::lock_guard<std::mutex> lock(_app.world().rdf_mutex());
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index ebb84c40..5e9392bc 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -31,10 +31,10 @@ namespace boost {
template <class T> class optional;
} // namespace boost
-namespace Raul {
+namespace raul {
class Path;
class Symbol;
-} // namespace Raul
+} // namespace raul
namespace ingen {
@@ -70,8 +70,8 @@ public:
void load_graph(bool merge,
const FilePath& file_path,
- const boost::optional<Raul::Path>& engine_parent,
- const boost::optional<Raul::Symbol>& engine_symbol,
+ const boost::optional<raul::Path>& engine_parent,
+ const boost::optional<raul::Symbol>& engine_symbol,
const boost::optional<Properties>& engine_data);
void save_graph(const std::shared_ptr<const client::GraphModel>& model,
@@ -81,8 +81,8 @@ public:
private:
void load_graph_event(const FilePath& file_path,
- const boost::optional<Raul::Path>& engine_parent,
- const boost::optional<Raul::Symbol>& engine_symbol,
+ const boost::optional<raul::Path>& engine_parent,
+ const boost::optional<raul::Symbol>& engine_symbol,
const boost::optional<Properties>& engine_data);
void
@@ -95,7 +95,7 @@ private:
void run();
App& _app;
- Raul::Semaphore _sem;
+ raul::Semaphore _sem;
std::shared_ptr<Interface> _engine;
std::mutex _mutex;
std::list<Closure> _events;
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index 5230f516..581e2e0f 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -99,7 +99,7 @@ public:
void clear();
private:
- using GraphWindowMap = std::map<Raul::Path, GraphWindow*>;
+ using GraphWindowMap = std::map<raul::Path, GraphWindow*>;
GraphWindow*
new_graph_window(const std::shared_ptr<const client::GraphModel>& graph,
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 8efd65bc..ffa50779 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -160,7 +160,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
// Create a GraphBox for the root and set as the UI widget
auto root = std::dynamic_pointer_cast<const ingen::client::GraphModel>(
- ui->app->store()->object(Raul::Path("/")));
+ ui->app->store()->object(raul::Path("/")));
ui->view = ingen::gui::GraphBox::create(*ui->app, root);
ui->view->unparent();
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp
index 98fdd555..c7c3ef74 100644
--- a/src/ingen/ingen.cpp
+++ b/src/ingen/ingen.cpp
@@ -177,16 +177,16 @@ run(int argc, char** argv)
// Load a graph
if (conf.option("load").is_valid()) {
- boost::optional<Raul::Path> parent;
- boost::optional<Raul::Symbol> symbol;
+ boost::optional<raul::Path> parent;
+ boost::optional<raul::Symbol> symbol;
const Atom& path_option = conf.option("path");
if (path_option.is_valid()) {
- if (Raul::Path::is_valid(path_option.ptr<char>())) {
- const Raul::Path p(path_option.ptr<char>());
+ if (raul::Path::is_valid(path_option.ptr<char>())) {
+ const raul::Path p(path_option.ptr<char>());
if (!p.is_root()) {
parent = p.parent();
- symbol = Raul::Symbol(p.symbol());
+ symbol = raul::Symbol(p.symbol());
}
} else {
std::cerr << "Invalid path given: '" << path_option.ptr<char>()
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);
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index eaa6a0ab..87e02e9f 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -194,7 +194,7 @@ run(int argc, char** argv)
delete cmds;
// Save resulting graph
- auto r = world->store()->find(Raul::Path("/"));
+ auto r = world->store()->find(raul::Path("/"));
const std::string base = run_path.stem();
const std::string out_name = base.substr(0, base.find('.')) + ".out.ingen";
const FilePath out_path = filesystem::current_path() / out_name;
@@ -207,7 +207,7 @@ run(int argc, char** argv)
}
// Save completely undone graph
- r = world->store()->find(Raul::Path("/"));
+ r = world->store()->find(raul::Path("/"));
const std::string undo_name = base.substr(0, base.find('.')) + ".undo.ingen";
const FilePath undo_path = filesystem::current_path() / undo_name;
world->serialiser()->write_bundle(r->second, URI(undo_path));
@@ -219,7 +219,7 @@ run(int argc, char** argv)
}
// Save completely redone graph
- r = world->store()->find(Raul::Path("/"));
+ r = world->store()->find(raul::Path("/"));
const std::string redo_name = base.substr(0, base.find('.')) + ".redo.ingen";
const FilePath redo_path = filesystem::current_path() / redo_name;
world->serialiser()->write_bundle(r->second, URI(redo_path));
diff --git a/wscript b/wscript
index cec4c5ae..e110d719 100644
--- a/wscript
+++ b/wscript
@@ -115,7 +115,7 @@ def configure(conf):
conf.check_pkg('lilv-0 >= 0.21.5', uselib_store='LILV')
conf.check_pkg('suil-0 >= 0.8.7', uselib_store='SUIL')
conf.check_pkg('sratom-0 >= 0.4.6', uselib_store='SRATOM')
- conf.check_pkg('raul-1 >= 1.0.0', uselib_store='RAUL')
+ conf.check_pkg('raul-1 >= 1.1.0', uselib_store='RAUL')
conf.check_pkg('serd-0 >= 0.30.3', uselib_store='SERD', mandatory=False)
conf.check_pkg('sord-0 >= 0.12.0', uselib_store='SORD', mandatory=False)