summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-09-23 17:31:12 +0200
committerDavid Robillard <d@drobilla.net>2018-09-23 17:31:12 +0200
commit394b01da8e26dbe1b6a0520944d954ca0b16b1b5 (patch)
tree1c079badda98cb366d72d59aabcb68fcc38760cf /src
parent367f7c57028ce05f3d765fed678a64ad54a73312 (diff)
downloadingen-394b01da8e26dbe1b6a0520944d954ca0b16b1b5.tar.gz
ingen-394b01da8e26dbe1b6a0520944d954ca0b16b1b5.tar.bz2
ingen-394b01da8e26dbe1b6a0520944d954ca0b16b1b5.zip
Use lowercase namespace names
Diffstat (limited to 'src')
-rw-r--r--src/AtomReader.cpp14
-rw-r--r--src/AtomWriter.cpp4
-rw-r--r--src/ClashAvoider.cpp4
-rw-r--r--src/ColorContext.cpp4
-rw-r--r--src/Configuration.cpp4
-rw-r--r--src/FilePath.cpp4
-rw-r--r--src/Forge.cpp6
-rw-r--r--src/LV2Features.cpp4
-rw-r--r--src/Library.cpp4
-rw-r--r--src/Log.cpp4
-rw-r--r--src/Parser.cpp42
-rw-r--r--src/Resource.cpp4
-rw-r--r--src/Serialiser.cpp6
-rw-r--r--src/SocketReader.cpp6
-rw-r--r--src/SocketWriter.cpp4
-rw-r--r--src/Store.cpp4
-rw-r--r--src/StreamWriter.cpp4
-rw-r--r--src/TurtleWriter.cpp4
-rw-r--r--src/URI.cpp4
-rw-r--r--src/URIMap.cpp4
-rw-r--r--src/URIs.cpp4
-rw-r--r--src/World.cpp14
-rw-r--r--src/client/BlockModel.cpp14
-rw-r--r--src/client/ClientStore.cpp8
-rw-r--r--src/client/GraphModel.cpp8
-rw-r--r--src/client/ObjectModel.cpp8
-rw-r--r--src/client/PluginModel.cpp10
-rw-r--r--src/client/PluginUI.cpp12
-rw-r--r--src/client/PortModel.cpp8
-rw-r--r--src/client/ingen_client.cpp6
-rw-r--r--src/gui/App.cpp24
-rw-r--r--src/gui/App.hpp44
-rw-r--r--src/gui/Arc.cpp16
-rw-r--r--src/gui/Arc.hpp16
-rw-r--r--src/gui/BreadCrumbs.cpp8
-rw-r--r--src/gui/BreadCrumbs.hpp8
-rw-r--r--src/gui/ConnectWindow.cpp24
-rw-r--r--src/gui/ConnectWindow.hpp12
-rw-r--r--src/gui/GraphBox.cpp12
-rw-r--r--src/gui/GraphBox.hpp30
-rw-r--r--src/gui/GraphCanvas.cpp28
-rw-r--r--src/gui/GraphCanvas.hpp34
-rw-r--r--src/gui/GraphPortModule.cpp12
-rw-r--r--src/gui/GraphPortModule.hpp18
-rw-r--r--src/gui/GraphTreeWindow.cpp12
-rw-r--r--src/gui/GraphTreeWindow.hpp26
-rw-r--r--src/gui/GraphView.cpp10
-rw-r--r--src/gui/GraphView.hpp18
-rw-r--r--src/gui/GraphWindow.cpp8
-rw-r--r--src/gui/GraphWindow.hpp14
-rw-r--r--src/gui/LoadGraphWindow.cpp12
-rw-r--r--src/gui/LoadGraphWindow.hpp16
-rw-r--r--src/gui/LoadPluginWindow.cpp10
-rw-r--r--src/gui/LoadPluginWindow.hpp28
-rw-r--r--src/gui/MessagesWindow.cpp8
-rw-r--r--src/gui/MessagesWindow.hpp8
-rw-r--r--src/gui/NewSubgraphWindow.cpp12
-rw-r--r--src/gui/NewSubgraphWindow.hpp16
-rw-r--r--src/gui/NodeMenu.cpp12
-rw-r--r--src/gui/NodeMenu.hpp14
-rw-r--r--src/gui/NodeModule.cpp14
-rw-r--r--src/gui/NodeModule.hpp26
-rw-r--r--src/gui/ObjectMenu.cpp10
-rw-r--r--src/gui/ObjectMenu.hpp14
-rw-r--r--src/gui/PluginMenu.cpp16
-rw-r--r--src/gui/PluginMenu.hpp22
-rw-r--r--src/gui/Port.cpp16
-rw-r--r--src/gui/Port.hpp20
-rw-r--r--src/gui/PortMenu.cpp12
-rw-r--r--src/gui/PortMenu.hpp10
-rw-r--r--src/gui/PropertiesWindow.cpp38
-rw-r--r--src/gui/PropertiesWindow.hpp16
-rw-r--r--src/gui/RDFS.cpp24
-rw-r--r--src/gui/RDFS.hpp18
-rw-r--r--src/gui/RenameWindow.cpp10
-rw-r--r--src/gui/RenameWindow.hpp14
-rw-r--r--src/gui/Style.cpp12
-rw-r--r--src/gui/Style.hpp12
-rw-r--r--src/gui/SubgraphModule.cpp10
-rw-r--r--src/gui/SubgraphModule.hpp16
-rw-r--r--src/gui/ThreadedLoader.cpp12
-rw-r--r--src/gui/ThreadedLoader.hpp12
-rw-r--r--src/gui/URIEntry.cpp16
-rw-r--r--src/gui/URIEntry.hpp8
-rw-r--r--src/gui/WidgetFactory.cpp12
-rw-r--r--src/gui/WidgetFactory.hpp8
-rw-r--r--src/gui/Window.hpp8
-rw-r--r--src/gui/WindowFactory.cpp10
-rw-r--r--src/gui/WindowFactory.hpp32
-rw-r--r--src/gui/ingen_gui.cpp18
-rw-r--r--src/gui/ingen_gui_lv2.cpp54
-rw-r--r--src/gui/rgba.hpp8
-rw-r--r--src/ingen/ingen.cpp10
-rw-r--r--src/runtime_paths.cpp4
-rw-r--r--src/server/ArcImpl.cpp10
-rw-r--r--src/server/ArcImpl.hpp8
-rw-r--r--src/server/BlockFactory.cpp14
-rw-r--r--src/server/BlockFactory.hpp12
-rw-r--r--src/server/BlockImpl.cpp8
-rw-r--r--src/server/BlockImpl.hpp8
-rw-r--r--src/server/Broadcaster.cpp8
-rw-r--r--src/server/Broadcaster.hpp8
-rw-r--r--src/server/Buffer.cpp8
-rw-r--r--src/server/Buffer.hpp8
-rw-r--r--src/server/BufferFactory.cpp8
-rw-r--r--src/server/BufferFactory.hpp8
-rw-r--r--src/server/BufferRef.hpp8
-rw-r--r--src/server/ClientUpdate.cpp8
-rw-r--r--src/server/ClientUpdate.hpp8
-rw-r--r--src/server/CompiledGraph.cpp8
-rw-r--r--src/server/CompiledGraph.hpp8
-rw-r--r--src/server/ControlBindings.cpp22
-rw-r--r--src/server/ControlBindings.hpp8
-rw-r--r--src/server/DirectDriver.hpp8
-rw-r--r--src/server/Driver.hpp8
-rw-r--r--src/server/DuplexPort.cpp8
-rw-r--r--src/server/DuplexPort.hpp8
-rw-r--r--src/server/Engine.cpp20
-rw-r--r--src/server/Engine.hpp16
-rw-r--r--src/server/EnginePort.hpp8
-rw-r--r--src/server/Event.hpp8
-rw-r--r--src/server/EventWriter.cpp36
-rw-r--r--src/server/EventWriter.hpp8
-rw-r--r--src/server/FrameTimer.hpp8
-rw-r--r--src/server/GraphImpl.cpp8
-rw-r--r--src/server/GraphImpl.hpp8
-rw-r--r--src/server/GraphPlugin.hpp8
-rw-r--r--src/server/InputPort.cpp10
-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.cpp10
-rw-r--r--src/server/InternalPlugin.hpp8
-rw-r--r--src/server/JackDriver.cpp8
-rw-r--r--src/server/JackDriver.hpp8
-rw-r--r--src/server/LV2Block.cpp14
-rw-r--r--src/server/LV2Block.hpp8
-rw-r--r--src/server/LV2Options.hpp10
-rw-r--r--src/server/LV2Plugin.cpp8
-rw-r--r--src/server/LV2Plugin.hpp8
-rw-r--r--src/server/LV2ResizeFeature.hpp10
-rw-r--r--src/server/Load.hpp8
-rw-r--r--src/server/NodeImpl.cpp10
-rw-r--r--src/server/NodeImpl.hpp12
-rw-r--r--src/server/OutputPort.hpp8
-rw-r--r--src/server/PluginImpl.hpp10
-rw-r--r--src/server/PortAudioDriver.cpp8
-rw-r--r--src/server/PortAudioDriver.hpp8
-rw-r--r--src/server/PortImpl.cpp14
-rw-r--r--src/server/PortImpl.hpp8
-rw-r--r--src/server/PortType.hpp4
-rw-r--r--src/server/PostProcessor.cpp8
-rw-r--r--src/server/PostProcessor.hpp8
-rw-r--r--src/server/PreProcessContext.hpp8
-rw-r--r--src/server/PreProcessor.cpp8
-rw-r--r--src/server/PreProcessor.hpp8
-rw-r--r--src/server/RunContext.cpp8
-rw-r--r--src/server/RunContext.hpp8
-rw-r--r--src/server/SocketListener.cpp10
-rw-r--r--src/server/SocketListener.hpp8
-rw-r--r--src/server/SocketServer.hpp10
-rw-r--r--src/server/Task.cpp8
-rw-r--r--src/server/Task.hpp8
-rw-r--r--src/server/ThreadManager.hpp8
-rw-r--r--src/server/UndoStack.cpp8
-rw-r--r--src/server/UndoStack.hpp8
-rw-r--r--src/server/Worker.cpp8
-rw-r--r--src/server/Worker.hpp8
-rw-r--r--src/server/events/Connect.cpp16
-rw-r--r--src/server/events/Connect.hpp16
-rw-r--r--src/server/events/Copy.cpp14
-rw-r--r--src/server/events/Copy.hpp16
-rw-r--r--src/server/events/CreateBlock.cpp14
-rw-r--r--src/server/events/CreateBlock.hpp12
-rw-r--r--src/server/events/CreateGraph.cpp20
-rw-r--r--src/server/events/CreateGraph.hpp12
-rw-r--r--src/server/events/CreatePort.cpp14
-rw-r--r--src/server/events/CreatePort.hpp12
-rw-r--r--src/server/events/Delete.cpp20
-rw-r--r--src/server/events/Delete.hpp16
-rw-r--r--src/server/events/Delta.cpp30
-rw-r--r--src/server/events/Delta.hpp20
-rw-r--r--src/server/events/Disconnect.cpp14
-rw-r--r--src/server/events/Disconnect.hpp16
-rw-r--r--src/server/events/DisconnectAll.cpp14
-rw-r--r--src/server/events/DisconnectAll.hpp16
-rw-r--r--src/server/events/Get.cpp14
-rw-r--r--src/server/events/Get.hpp16
-rw-r--r--src/server/events/Mark.cpp16
-rw-r--r--src/server/events/Mark.hpp16
-rw-r--r--src/server/events/Move.cpp14
-rw-r--r--src/server/events/Move.hpp16
-rw-r--r--src/server/events/SetPortValue.cpp16
-rw-r--r--src/server/events/SetPortValue.hpp12
-rw-r--r--src/server/events/Undo.cpp16
-rw-r--r--src/server/events/Undo.hpp16
-rw-r--r--src/server/ingen_engine.cpp12
-rw-r--r--src/server/ingen_jack.cpp18
-rw-r--r--src/server/ingen_lv2.cpp52
-rw-r--r--src/server/ingen_portaudio.cpp18
-rw-r--r--src/server/internals/BlockDelay.cpp14
-rw-r--r--src/server/internals/BlockDelay.hpp12
-rw-r--r--src/server/internals/Controller.cpp14
-rw-r--r--src/server/internals/Controller.hpp12
-rw-r--r--src/server/internals/Note.cpp14
-rw-r--r--src/server/internals/Note.hpp12
-rw-r--r--src/server/internals/Time.cpp14
-rw-r--r--src/server/internals/Time.hpp12
-rw-r--r--src/server/internals/Trigger.cpp14
-rw-r--r--src/server/internals/Trigger.hpp12
-rw-r--r--src/server/mix.cpp8
-rw-r--r--src/server/mix.hpp8
-rw-r--r--src/server/util.hpp10
213 files changed, 1336 insertions, 1336 deletions
diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp
index 296c99cd..209966cf 100644
--- a/src/AtomReader.cpp
+++ b/src/AtomReader.cpp
@@ -26,7 +26,7 @@
#include "lv2/atom/util.h"
#include "raul/Path.hpp"
-namespace Ingen {
+namespace ingen {
AtomReader::AtomReader(URIMap& map, URIs& uris, Log& log, Interface& iface)
: _map(map)
@@ -55,7 +55,7 @@ AtomReader::get_atom(const LV2_Atom* in, Atom& out)
void
AtomReader::get_props(const LV2_Atom_Object* obj,
- Ingen::Properties& props)
+ ingen::Properties& props)
{
if (obj->body.otype) {
const Atom type(sizeof(int32_t), _uris.atom_URID, &obj->body.otype);
@@ -237,7 +237,7 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
_log.warn("Arc has non-path tail or head\n");
}
} else {
- Ingen::Properties props;
+ ingen::Properties props;
get_props(body, props);
_iface(Put{seq, *subject_uri, props, atom_to_context(context)});
}
@@ -292,10 +292,10 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
return false;
}
- Ingen::Properties add_props;
+ ingen::Properties add_props;
get_props(add, add_props);
- Ingen::Properties remove_props;
+ ingen::Properties remove_props;
get_props(remove, remove_props);
_iface(Delta{seq, *subject_uri, remove_props, add_props,
@@ -367,7 +367,7 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
return false;
}
_iface(Response{((const LV2_Atom_Int*)seq)->body,
- (Ingen::Status)((const LV2_Atom_Int*)body)->body,
+ (ingen::Status)((const LV2_Atom_Int*)body)->body,
subject_uri ? subject_uri->c_str() : ""});
} else if (obj->body.otype == _uris.ingen_BundleStart) {
_iface(BundleBegin{seq});
@@ -381,4 +381,4 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
return true;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp
index f235aafc..c83c5c5a 100644
--- a/src/AtomWriter.cpp
+++ b/src/AtomWriter.cpp
@@ -60,7 +60,7 @@
#include "raul/Path.hpp"
#include "serd/serd.h"
-namespace Ingen {
+namespace ingen {
AtomWriter::AtomWriter(URIMap& map, URIs& uris, AtomSink& sink)
: _map(map)
@@ -649,4 +649,4 @@ AtomWriter::operator()(const Error&)
* @endcode
*/
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp
index ae4438a4..fdbc45b4 100644
--- a/src/ClashAvoider.cpp
+++ b/src/ClashAvoider.cpp
@@ -24,7 +24,7 @@
#include "ingen/Store.hpp"
#include "ingen/paths.hpp"
-namespace Ingen {
+namespace ingen {
ClashAvoider::ClashAvoider(const Store& store)
: _store(store)
@@ -133,4 +133,4 @@ ClashAvoider::exists(const Raul::Path& path) const
return _store.find(path) != _store.end();
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/ColorContext.cpp b/src/ColorContext.cpp
index 23b568f1..9794e8ce 100644
--- a/src/ColorContext.cpp
+++ b/src/ColorContext.cpp
@@ -23,7 +23,7 @@
inline int isatty(int fd) { return 0; }
#endif
-namespace Ingen {
+namespace ingen {
ColorContext::ColorContext(FILE* stream, Color color)
: _stream(stream)
@@ -41,4 +41,4 @@ ColorContext::~ColorContext()
}
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index c797cf93..c05c516e 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -30,7 +30,7 @@
#include "sord/sordmm.hpp"
#include "sratom/sratom.h"
-namespace Ingen {
+namespace ingen {
Configuration::Configuration(Forge& forge)
: _forge(forge)
@@ -383,4 +383,4 @@ Configuration::set(const std::string& long_name, const Atom& value)
return false;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/FilePath.cpp b/src/FilePath.cpp
index 557fabc9..897dea7d 100644
--- a/src/FilePath.cpp
+++ b/src/FilePath.cpp
@@ -16,7 +16,7 @@
#include "ingen/FilePath.hpp"
-namespace Ingen {
+namespace ingen {
template <typename Char>
static bool
@@ -239,4 +239,4 @@ operator/(const FilePath& lhs, const FilePath& rhs)
return FilePath(lhs) /= rhs;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Forge.cpp b/src/Forge.cpp
index 16c482c6..9ac406fc 100644
--- a/src/Forge.cpp
+++ b/src/Forge.cpp
@@ -21,7 +21,7 @@
#include "ingen/URIMap.hpp"
#include "lv2/atom/atom.h"
-namespace Ingen {
+namespace ingen {
Forge::Forge(URIMap& map)
: _map(map)
@@ -30,7 +30,7 @@ Forge::Forge(URIMap& map)
}
Atom
-Forge::make_urid(const Ingen::URI& u)
+Forge::make_urid(const ingen::URI& u)
{
const LV2_URID urid = _map.map_uri(u.string());
return Atom(sizeof(int32_t), URID, &urid);
@@ -66,4 +66,4 @@ Forge::str(const Atom& atom, bool quoted)
return ss.str();
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/LV2Features.cpp b/src/LV2Features.cpp
index 356df42c..b63ed980 100644
--- a/src/LV2Features.cpp
+++ b/src/LV2Features.cpp
@@ -18,7 +18,7 @@
#include "ingen/LV2Features.hpp"
-namespace Ingen {
+namespace ingen {
void
LV2Features::Feature::free_feature(LV2_Feature* feature)
@@ -80,4 +80,4 @@ LV2Features::lv2_features(World* world, Node* node) const
return SPtr<FeatureArray>(new FeatureArray(vec));
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Library.cpp b/src/Library.cpp
index 148b27d0..48002ef0 100644
--- a/src/Library.cpp
+++ b/src/Library.cpp
@@ -25,7 +25,7 @@
# include <dlfcn.h>
#endif
-namespace Ingen {
+namespace ingen {
Library::Library(const FilePath& path) : _lib(dlopen(path.c_str(), RTLD_NOW))
{}
@@ -53,4 +53,4 @@ Library::get_last_error()
return dlerror();
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Log.cpp b/src/Log.cpp
index 6145bcd1..c1f8cb0a 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -22,7 +22,7 @@
#include "ingen/World.hpp"
#include "ingen/ColorContext.hpp"
-namespace Ingen {
+namespace ingen {
Log::Log(LV2_Log_Log* log, URIs& uris)
: _log(log)
@@ -159,4 +159,4 @@ Log::Feature::feature(World* world, Node* block)
return SPtr<LV2_Feature>(f, &free_log_feature);
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Parser.cpp b/src/Parser.cpp
index a49f76d3..c9736a71 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -39,7 +39,7 @@
#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#"
-namespace Ingen {
+namespace ingen {
std::set<Parser::ResourceRecord>
Parser::find_resources(Sord::World& world,
@@ -84,7 +84,7 @@ get_path(const URI base, const URI uri)
}
static bool
-skip_property(Ingen::URIs& uris, const Sord::Node& predicate)
+skip_property(ingen::URIs& uris, const Sord::Node& predicate)
{
return (predicate == INGEN__file ||
predicate == uris.ingen_arc ||
@@ -93,7 +93,7 @@ skip_property(Ingen::URIs& uris, const Sord::Node& predicate)
}
static Properties
-get_properties(Ingen::World* world,
+get_properties(ingen::World* world,
Sord::Model& model,
const Sord::Node& subject,
Resource::Graph ctx)
@@ -128,7 +128,7 @@ get_properties(Ingen::World* world,
typedef std::pair<Raul::Path, Properties> PortRecord;
static boost::optional<PortRecord>
-get_port(Ingen::World* world,
+get_port(ingen::World* world,
Sord::Model& model,
const Sord::Node& subject,
Resource::Graph ctx,
@@ -232,8 +232,8 @@ parse_arcs(
const Raul::Path& graph);
static boost::optional<Raul::Path>
-parse_block(Ingen::World* world,
- Ingen::Interface* target,
+parse_block(ingen::World* world,
+ ingen::Interface* target,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
@@ -307,8 +307,8 @@ parse_block(Ingen::World* world,
}
static boost::optional<Raul::Path>
-parse_graph(Ingen::World* world,
- Ingen::Interface* target,
+parse_graph(ingen::World* world,
+ ingen::Interface* target,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
@@ -423,8 +423,8 @@ parse_graph(Ingen::World* world,
}
static bool
-parse_arc(Ingen::World* world,
- Ingen::Interface* target,
+parse_arc(ingen::World* world,
+ ingen::Interface* target,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
@@ -475,8 +475,8 @@ parse_arc(Ingen::World* world,
}
static bool
-parse_arcs(Ingen::World* world,
- Ingen::Interface* target,
+parse_arcs(ingen::World* world,
+ ingen::Interface* target,
Sord::Model& model,
const URI& base_uri,
const Sord::Node& subject,
@@ -493,8 +493,8 @@ parse_arcs(Ingen::World* world,
}
static bool
-parse_properties(Ingen::World* world,
- Ingen::Interface* target,
+parse_properties(ingen::World* world,
+ ingen::Interface* target,
Sord::Model& model,
const Sord::Node& subject,
Resource::Graph ctx,
@@ -514,8 +514,8 @@ parse_properties(Ingen::World* world,
}
static boost::optional<Raul::Path>
-parse(Ingen::World* world,
- Ingen::Interface* target,
+parse(ingen::World* world,
+ ingen::Interface* target,
Sord::Model& model,
const URI& base_uri,
Sord::Node& subject,
@@ -593,8 +593,8 @@ parse(Ingen::World* world,
}
bool
-Parser::parse_file(Ingen::World* world,
- Ingen::Interface* target,
+Parser::parse_file(ingen::World* world,
+ ingen::Interface* target,
const FilePath& path,
boost::optional<Raul::Path> parent,
boost::optional<Raul::Symbol> symbol,
@@ -681,8 +681,8 @@ Parser::parse_file(Ingen::World* world,
}
boost::optional<URI>
-Parser::parse_string(Ingen::World* world,
- Ingen::Interface* target,
+Parser::parse_string(ingen::World* world,
+ ingen::Interface* target,
const std::string& str,
const URI& base_uri,
boost::optional<Raul::Path> parent,
@@ -710,4 +710,4 @@ Parser::parse_string(Ingen::World* world,
return actual_base;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Resource.cpp b/src/Resource.cpp
index d0261eee..28bdaa52 100644
--- a/src/Resource.cpp
+++ b/src/Resource.cpp
@@ -22,7 +22,7 @@
#include "ingen/Resource.hpp"
#include "ingen/URIs.hpp"
-namespace Ingen {
+namespace ingen {
bool
Resource::add_property(const URI& uri, const Atom& value, Graph ctx)
@@ -231,4 +231,4 @@ Resource::properties(Resource::Graph ctx) const
return props;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp
index f187c288..38a2c860 100644
--- a/src/Serialiser.cpp
+++ b/src/Serialiser.cpp
@@ -43,7 +43,7 @@
#include "sord/sordmm.hpp"
#include "sratom/sratom.h"
-namespace Ingen {
+namespace ingen {
struct Serialiser::Impl {
explicit Impl(World& world)
@@ -530,7 +530,7 @@ Serialiser::Impl::serialise_arc(const Sord::Node& parent,
}
static bool
-skip_property(Ingen::URIs& uris, const Sord::Node& predicate)
+skip_property(ingen::URIs& uris, const Sord::Node& predicate)
{
return (predicate == INGEN__file ||
predicate == uris.ingen_arc ||
@@ -580,4 +580,4 @@ Serialiser::Impl::serialise_properties(Sord::Node id,
serd_env_free(env);
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp
index 13e95430..de2f3342 100644
--- a/src/SocketReader.cpp
+++ b/src/SocketReader.cpp
@@ -29,9 +29,9 @@
#include "sord/sordmm.hpp"
#include "sratom/sratom.h"
-namespace Ingen {
+namespace ingen {
-SocketReader::SocketReader(Ingen::World& world,
+SocketReader::SocketReader(ingen::World& world,
Interface& iface,
SPtr<Raul::Socket> sock)
: _world(world)
@@ -196,4 +196,4 @@ SocketReader::run()
_socket.reset();
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp
index 68091bcc..f3ab671d 100644
--- a/src/SocketWriter.cpp
+++ b/src/SocketWriter.cpp
@@ -25,7 +25,7 @@
# define MSG_NOSIGNAL 0
#endif
-namespace Ingen {
+namespace ingen {
SocketWriter::SocketWriter(URIMap& map,
URIs& uris,
@@ -55,4 +55,4 @@ SocketWriter::bundle_end()
send(_socket->fd(), end, 1, MSG_NOSIGNAL);
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/Store.cpp b/src/Store.cpp
index 327ce416..0bbeea30 100644
--- a/src/Store.cpp
+++ b/src/Store.cpp
@@ -19,7 +19,7 @@
#include "ingen/Node.hpp"
#include "ingen/Store.hpp"
-namespace Ingen {
+namespace ingen {
void
Store::add(Node* o)
@@ -140,4 +140,4 @@ Store::child_name_offset(const Raul::Path& parent,
return offset;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/StreamWriter.cpp b/src/StreamWriter.cpp
index 45853055..631369b6 100644
--- a/src/StreamWriter.cpp
+++ b/src/StreamWriter.cpp
@@ -17,7 +17,7 @@
#include "ingen/ColorContext.hpp"
#include "ingen/StreamWriter.hpp"
-namespace Ingen {
+namespace ingen {
StreamWriter::StreamWriter(URIMap& map,
URIs& uris,
@@ -36,4 +36,4 @@ StreamWriter::text_sink(const void* buf, size_t len)
return fwrite(buf, 1, len, _stream);
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/TurtleWriter.cpp b/src/TurtleWriter.cpp
index 368184d4..9bceaa06 100644
--- a/src/TurtleWriter.cpp
+++ b/src/TurtleWriter.cpp
@@ -19,7 +19,7 @@
#define USTR(s) ((const uint8_t*)(s))
-namespace Ingen {
+namespace ingen {
static size_t
c_text_sink(const void* buf, size_t len, void* stream)
@@ -98,4 +98,4 @@ TurtleWriter::write(const LV2_Atom* msg, int32_t default_id)
return true;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/URI.cpp b/src/URI.cpp
index 3e2d2a29..5de447a6 100644
--- a/src/URI.cpp
+++ b/src/URI.cpp
@@ -19,7 +19,7 @@
#include "ingen/FilePath.hpp"
#include "ingen/URI.hpp"
-namespace Ingen {
+namespace ingen {
URI::URI()
: _node(SERD_NODE_NULL)
@@ -110,4 +110,4 @@ URI::make_relative(const URI& base) const
return URI(node, uri);
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/URIMap.cpp b/src/URIMap.cpp
index 9ce1f178..db1cd9e3 100644
--- a/src/URIMap.cpp
+++ b/src/URIMap.cpp
@@ -20,7 +20,7 @@
#include "ingen/URI.hpp"
#include "ingen/URIMap.hpp"
-namespace Ingen {
+namespace ingen {
URIMap::URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap)
: _urid_map_feature(new URIDMapFeature(this, map, log))
@@ -120,4 +120,4 @@ URIMap::unmap_uri(uint32_t urid) const
return uri;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/URIs.cpp b/src/URIs.cpp
index aa91ffe0..90f351b1 100644
--- a/src/URIs.cpp
+++ b/src/URIs.cpp
@@ -34,7 +34,7 @@
#include "lv2/time/time.h"
#include "lv2/worker/worker.h"
-namespace Ingen {
+namespace ingen {
URIs::Quark::Quark(Forge& forge,
URIMap* map,
@@ -201,4 +201,4 @@ URIs::URIs(Forge& forge, URIMap* map, LilvWorld* lworld)
, work_schedule (forge, map, lworld, LV2_WORKER__schedule)
{}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/World.cpp b/src/World.cpp
index 568ab405..2daff6a6 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -41,7 +41,7 @@
using std::string;
-namespace Ingen {
+namespace ingen {
class EngineBase;
class Interface;
@@ -68,7 +68,7 @@ ingen_load_library(Log& log, const string& name)
string dir;
std::istringstream iss(module_path);
while (getline(iss, dir, search_path_separator)) {
- FilePath filename = Ingen::ingen_module_path(name, FilePath(dir));
+ FilePath filename = ingen::ingen_module_path(name, FilePath(dir));
if (filesystem::exists(filename)) {
library = std::unique_ptr<Library>(new Library(filename));
if (*library) {
@@ -81,7 +81,7 @@ ingen_load_library(Log& log, const string& name)
}
// Try default directory if not found
- library = std::unique_ptr<Library>(new Library(Ingen::ingen_module_path(name)));
+ library = std::unique_ptr<Library>(new Library(ingen::ingen_module_path(name)));
if (*library) {
return library;
@@ -275,9 +275,9 @@ World::load_module(const char* name)
return true;
}
log().info(fmt("Loading %1% module\n") % name);
- std::unique_ptr<Ingen::Library> lib = ingen_load_library(log(), name);
- Ingen::Module* (*module_load)() =
- lib ? (Ingen::Module* (*)())lib->get_function("ingen_module_load")
+ std::unique_ptr<ingen::Library> lib = ingen_load_library(log(), name);
+ ingen::Module* (*module_load)() =
+ lib ? (ingen::Module* (*)())lib->get_function("ingen_module_load")
: nullptr;
if (module_load) {
Module* module = module_load();
@@ -352,4 +352,4 @@ World::jack_uuid()
return _impl->jack_uuid;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index 910f7037..a15674d4 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -22,8 +22,8 @@
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
-namespace Ingen {
-namespace Client {
+namespace ingen {
+namespace client {
BlockModel::BlockModel(URIs& uris,
SPtr<PluginModel> plugin,
@@ -157,12 +157,12 @@ BlockModel::get_port(uint32_t index) const
return _ports[index];
}
-Ingen::Node*
+ingen::Node*
BlockModel::port(uint32_t index) const
{
assert(index < num_ports());
- return const_cast<Ingen::Node*>(
- dynamic_cast<const Ingen::Node*>(_ports[index].get()));
+ return const_cast<ingen::Node*>(
+ dynamic_cast<const ingen::Node*>(_ports[index].get()));
}
void
@@ -281,5 +281,5 @@ BlockModel::set(SPtr<ObjectModel> model)
ObjectModel::set(model);
}
-} // namespace Client
-} // namespace Ingen
+} // namespace client
+} // namespace ingen
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 792f8949..ad3b3c0d 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -26,8 +26,8 @@
#include "ingen/client/PortModel.hpp"
#include "ingen/client/SigClientInterface.hpp"
-namespace Ingen {
-namespace Client {
+namespace ingen {
+namespace client {
ClientStore::ClientStore(URIs& uris,
Log& log,
@@ -483,5 +483,5 @@ ClientStore::operator()(const DisconnectAll& msg)
}
}
-} // namespace Client
-} // namespace Ingen
+} // namespace client
+} // namespace ingen
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 0723e59b..31947ba7 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -22,8 +22,8 @@
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/GraphModel.hpp"
-namespace Ingen {
-namespace Client {
+namespace ingen {
+namespace client {
void
GraphModel::add_child(SPtr<ObjectModel> c)
@@ -172,5 +172,5 @@ GraphModel::polyphonic() const
return poly.is_valid() && poly.get<int32_t>();
}
-} // namespace Client
-} // namespace Ingen
+} // namespace client
+} // namespace ingen
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 8d40b120..65dd1a37 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -18,8 +18,8 @@
#include "ingen/URIs.hpp"
#include "ingen/client/ObjectModel.hpp"
-namespace Ingen {
-namespace Client {
+namespace ingen {
+namespace client {
ObjectModel::ObjectModel(URIs& uris, const Raul::Path& path)
: Node(uris, path)
@@ -104,5 +104,5 @@ ObjectModel::set_parent(SPtr<ObjectModel> p)
_parent = p;
}
-} // namespace Client
-} // namespace Ingen
+} // namespace client
+} // namespace ingen
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 5427b75e..99269831 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -30,8 +30,8 @@
using std::string;
-namespace Ingen {
-namespace Client {
+namespace ingen {
+namespace client {
LilvWorld* PluginModel::_lilv_world = nullptr;
const LilvPlugins* PluginModel::_lilv_plugins = nullptr;
@@ -240,7 +240,7 @@ PluginModel::has_ui() const
}
SPtr<PluginUI>
-PluginModel::ui(Ingen::World* world,
+PluginModel::ui(ingen::World* world,
SPtr<const BlockModel> block) const
{
if (!_lilv_plugin) {
@@ -356,5 +356,5 @@ PluginModel::set_lilv_world(LilvWorld* world)
_lilv_plugins = lilv_world_get_all_plugins(_lilv_world);
}
-} // namespace Client
-} // namespace Ingen
+} // namespace client
+} // namespace ingen
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 222a7d55..2368ad63 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -23,8 +23,8 @@
#include "lv2/atom/atom.h"
#include "lv2/ui/ui.h"
-namespace Ingen {
-namespace Client {
+namespace ingen {
+namespace client {
SuilHost* PluginUI::ui_host = nullptr;
@@ -145,7 +145,7 @@ lv2_ui_unsubscribe(SuilController controller,
return 0;
}
-PluginUI::PluginUI(Ingen::World* world,
+PluginUI::PluginUI(ingen::World* world,
SPtr<const BlockModel> block,
LilvUIs* uis,
const LilvUI* ui,
@@ -173,7 +173,7 @@ PluginUI::~PluginUI()
}
SPtr<PluginUI>
-PluginUI::create(Ingen::World* world,
+PluginUI::create(ingen::World* world,
SPtr<const BlockModel> block,
const LilvPlugin* plugin)
{
@@ -332,5 +332,5 @@ PluginUI::is_resizable() const
return !fs_matches && !nrs_matches;
}
-} // namespace Client
-} // namespace Ingen
+} // namespace client
+} // namespace ingen
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index 5c9a8c77..f83e043b 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -17,8 +17,8 @@
#include "ingen/client/BlockModel.hpp"
#include "ingen/client/PortModel.hpp"
-namespace Ingen {
-namespace Client {
+namespace ingen {
+namespace client {
void
PortModel::on_property(const URI& uri, const Atom& value)
@@ -74,5 +74,5 @@ PortModel::set(SPtr<ObjectModel> model)
}
}
-} // namespace Client
-} // namespace Ingen
+} // namespace client
+} // namespace ingen
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index fe9d6605..64162ed6 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -19,13 +19,13 @@
#include "ingen_config.h"
-struct IngenClientModule : public Ingen::Module {
- void load(Ingen::World* world) {}
+struct IngenClientModule : public ingen::Module {
+ void load(ingen::World* world) {}
};
extern "C" {
-Ingen::Module*
+ingen::Module*
ingen_module_load()
{
return new IngenClientModule();
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 9f1a29ca..8a33fe46 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -58,19 +58,19 @@
namespace Raul { class Deletable; }
-namespace Ingen {
+namespace ingen {
-namespace Client { class PluginModel; }
+namespace client { class PluginModel; }
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
class Port;
Gtk::Main* App::_main = nullptr;
-App::App(Ingen::World* world)
+App::App(ingen::World* world)
: _style(new Style(*this))
, _about_dialog(nullptr)
, _window_factory(new WindowFactory(*this))
@@ -111,12 +111,12 @@ App::~App()
}
SPtr<App>
-App::create(Ingen::World* world)
+App::create(ingen::World* world)
{
suil_init(&world->argc(), &world->argv(), SUIL_ARG_NONE);
// Add RC file for embedded GUI Gtk style
- const std::string rc_path = Ingen::data_file_path("ingen_style.rc");
+ const std::string rc_path = ingen::data_file_path("ingen_style.rc");
Gtk::RC::add_default_file(rc_path);
_main = Gtk::Main::instance();
@@ -158,7 +158,7 @@ App::run()
}
void
-App::attach(SPtr<Ingen::Interface> client)
+App::attach(SPtr<ingen::Interface> client)
{
assert(!_client);
assert(!_store);
@@ -282,7 +282,7 @@ App::set_property(const URI& subject,
void
App::set_tooltip(Gtk::Widget* widget, const LilvNode* node)
{
- const std::string comment = RDFS::comment(_world, node);
+ const std::string comment = rdfs::comment(_world, node);
if (!comment.empty()) {
widget->set_tooltip_text(comment);
}
@@ -480,7 +480,7 @@ App::quit(Gtk::Window* dialog_parent)
}
bool
-App::can_control(const Client::PortModel* port) const
+App::can_control(const client::PortModel* port) const
{
return port->is_a(uris().lv2_ControlPort)
|| port->is_a(uris().lv2_CVPort)
@@ -495,5 +495,5 @@ App::sample_rate() const
return _sample_rate;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 75661449..76465bfb 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -34,7 +34,7 @@
#include "lilv/lilv.h"
#include "raul/Deletable.hpp"
-namespace Ingen {
+namespace ingen {
class Interface;
class Log;
@@ -43,7 +43,7 @@ class Serialiser;
class StreamWriter;
class World;
-namespace Client {
+namespace client {
class ClientStore;
class GraphModel;
@@ -53,7 +53,7 @@ class SigClientInterface;
}
-namespace GUI {
+namespace gui {
class ConnectWindow;
class GraphCanvas;
@@ -75,7 +75,7 @@ public:
void error_message(const std::string& str);
- void attach(SPtr<Ingen::Interface> client);
+ void attach(SPtr<ingen::Interface> client);
void detach();
@@ -89,7 +89,7 @@ public:
void port_activity(Port* port);
void activity_port_destroyed(Port* port);
- bool can_control(const Client::PortModel* port) const;
+ bool can_control(const client::PortModel* port) const;
bool signal() const { return _enable_signal; }
void enable_signals(bool b) { _enable_signal = b; }
@@ -118,17 +118,17 @@ public:
Style* style() const { return _style; }
WindowFactory* window_factory() const { return _window_factory; }
- Ingen::Forge& forge() const { return _world->forge(); }
- SPtr<Ingen::Interface> interface() const { return _world->interface(); }
- SPtr<Ingen::Interface> client() const { return _client; }
- SPtr<Client::ClientStore> store() const { return _store; }
+ ingen::Forge& forge() const { return _world->forge(); }
+ SPtr<ingen::Interface> interface() const { return _world->interface(); }
+ SPtr<ingen::Interface> client() const { return _client; }
+ SPtr<client::ClientStore> store() const { return _store; }
SPtr<ThreadedLoader> loader() const { return _loader; }
- SPtr<Client::SigClientInterface> sig_client();
+ SPtr<client::SigClientInterface> sig_client();
SPtr<Serialiser> serialiser();
- static SPtr<App> create(Ingen::World* world);
+ static SPtr<App> create(ingen::World* world);
void run();
@@ -136,17 +136,17 @@ public:
sigc::signal<void, const std::string&> signal_status_text_changed;
- inline Ingen::World* world() const { return _world; }
- inline Ingen::URIs& uris() const { return _world->uris(); }
- inline Ingen::Log& log() const { return _world->log(); }
+ inline ingen::World* world() const { return _world; }
+ inline ingen::URIs& uris() const { return _world->uris(); }
+ inline ingen::Log& log() const { return _world->log(); }
protected:
- explicit App(Ingen::World* world);
+ explicit App(ingen::World* world);
- void message(const Ingen::Message& msg);
+ void message(const ingen::Message& msg);
bool animate();
- void response(int32_t id, Ingen::Status status, const std::string& subject);
+ void response(int32_t id, ingen::Status status, const std::string& subject);
void put(const URI& uri,
const Properties& properties,
@@ -159,8 +159,8 @@ protected:
static Gtk::Main* _main;
- SPtr<Ingen::Interface> _client;
- SPtr<Client::ClientStore> _store;
+ SPtr<ingen::Interface> _client;
+ SPtr<client::ClientStore> _store;
SPtr<ThreadedLoader> _loader;
SPtr<StreamWriter> _dumper;
@@ -172,7 +172,7 @@ protected:
Gtk::AboutDialog* _about_dialog;
WindowFactory* _window_factory;
- Ingen::World* _world;
+ ingen::World* _world;
int32_t _sample_rate;
int32_t _block_length;
@@ -190,7 +190,7 @@ protected:
bool _is_plugin;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_APP_HPP
diff --git a/src/gui/Arc.cpp b/src/gui/Arc.cpp
index c14b2e88..db8b3a85 100644
--- a/src/gui/Arc.cpp
+++ b/src/gui/Arc.cpp
@@ -20,19 +20,19 @@
#define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
Arc::Arc(Ganv::Canvas& canvas,
- SPtr<const Client::ArcModel> model,
+ SPtr<const client::ArcModel> model,
Ganv::Node* src,
Ganv::Node* dst)
: Ganv::Edge(canvas, src, dst)
, _arc_model(model)
{
- SPtr<const Client::ObjectModel> tparent = model->tail()->parent();
- SPtr<const Client::BlockModel> tparent_block;
- if ((tparent_block = dynamic_ptr_cast<const Client::BlockModel>(tparent))) {
+ SPtr<const client::ObjectModel> tparent = model->tail()->parent();
+ SPtr<const client::BlockModel> tparent_block;
+ if ((tparent_block = dynamic_ptr_cast<const client::BlockModel>(tparent))) {
if (tparent_block->plugin_uri() == NS_INTERNALS "BlockDelay") {
g_object_set(_gobj, "dash-length", 4.0, NULL);
set_constraining(false);
@@ -40,5 +40,5 @@ Arc::Arc(Ganv::Canvas& canvas,
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/Arc.hpp b/src/gui/Arc.hpp
index 382ca305..4eedde88 100644
--- a/src/gui/Arc.hpp
+++ b/src/gui/Arc.hpp
@@ -22,11 +22,11 @@
#include "ganv/Edge.hpp"
#include "ingen/types.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client { class ArcModel; }
+namespace client { class ArcModel; }
-namespace GUI {
+namespace gui {
/** An Arc (directed edge) in a Graph.
*
@@ -36,17 +36,17 @@ class Arc : public Ganv::Edge
{
public:
Arc(Ganv::Canvas& canvas,
- SPtr<const Client::ArcModel> model,
+ SPtr<const client::ArcModel> model,
Ganv::Node* src,
Ganv::Node* dst);
- SPtr<const Client::ArcModel> model() const { return _arc_model; }
+ SPtr<const client::ArcModel> model() const { return _arc_model; }
private:
- SPtr<const Client::ArcModel> _arc_model;
+ SPtr<const client::ArcModel> _arc_model;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_ARC_HPP
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index ae7882e3..2d2c535e 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -24,8 +24,8 @@
#include "App.hpp"
#include "BreadCrumbs.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
using std::string;
@@ -225,5 +225,5 @@ BreadCrumbs::object_moved(const Raul::Path& old_path, const Raul::Path& new_path
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 467d3bfc..35c97fd0 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -30,8 +30,8 @@
#include "GraphView.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
/** Collection of breadcrumb buttons forming a path.
* This doubles as a cache for GraphViews.
@@ -113,7 +113,7 @@ private:
std::list<BreadCrumb*> _breadcrumbs;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_BREADCRUMBS_HPP
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 458a43dd..e76fbc06 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -41,10 +41,10 @@
#include "ConnectWindow.hpp"
#include "WindowFactory.hpp"
-using namespace Ingen::Client;
+using namespace ingen::client;
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
ConnectWindow::ConnectWindow(BaseObjectType* cobject,
Glib::RefPtr<Gtk::Builder> xml)
@@ -102,7 +102,7 @@ ConnectWindow::error(const std::string& msg)
}
void
-ConnectWindow::start(App& app, Ingen::World* world)
+ConnectWindow::start(App& app, ingen::World* world)
{
_app = &app;
@@ -129,7 +129,7 @@ ConnectWindow::ingen_response(int32_t id,
}
void
-ConnectWindow::set_connected_to(SPtr<Ingen::Interface> engine)
+ConnectWindow::set_connected_to(SPtr<ingen::Interface> engine)
{
_app->world()->set_interface(engine);
@@ -193,12 +193,12 @@ ConnectWindow::set_connecting_widget_states()
bool
ConnectWindow::connect_remote(const URI& uri)
{
- Ingen::World* world = _app->world();
+ ingen::World* world = _app->world();
SPtr<SigClientInterface> sci(new SigClientInterface());
SPtr<QueuedInterface> qi(new QueuedInterface(sci));
- SPtr<Ingen::Interface> iface(world->new_interface(uri, qi));
+ SPtr<ingen::Interface> iface(world->new_interface(uri, qi));
if (iface) {
world->set_interface(iface);
_app->attach(qi);
@@ -223,14 +223,14 @@ ConnectWindow::connect(bool existing)
set_connecting_widget_states();
_connect_stage = 0;
- Ingen::World* world = _app->world();
+ ingen::World* world = _app->world();
if (_mode == Mode::CONNECT_REMOTE) {
std::string uri_str = world->conf().option("connect").ptr<char>();
if (existing) {
uri_str = world->interface()->uri();
_connect_stage = 1;
- SPtr<Client::SocketClient> client = dynamic_ptr_cast<Client::SocketClient>(world->interface());
+ SPtr<client::SocketClient> client = dynamic_ptr_cast<client::SocketClient>(world->interface());
if (client) {
_app->attach(client->respondee());
_app->register_callbacks();
@@ -290,7 +290,7 @@ ConnectWindow::disconnect()
_attached = false;
_app->detach();
- set_connected_to(SPtr<Ingen::Interface>());
+ set_connected_to(SPtr<ingen::Interface>());
if (!_widgets_loaded) {
return;
@@ -568,5 +568,5 @@ ConnectWindow::quit()
Gtk::Main::quit();
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index 08560361..a6874dfc 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -31,8 +31,8 @@
#include "Window.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
class App;
@@ -49,8 +49,8 @@ public:
ConnectWindow(BaseObjectType* cobject,
Glib::RefPtr<Gtk::Builder> xml);
- void set_connected_to(SPtr<Ingen::Interface> engine);
- void start(App& app, Ingen::World* world);
+ void set_connected_to(SPtr<ingen::Interface> engine);
+ void start(App& app, ingen::World* world);
bool attached() const { return _finished_connecting; }
bool quit_flag() const { return _quit_flag; }
@@ -110,7 +110,7 @@ private:
bool _quit_flag;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_CONNECTWINDOW_HPP
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 6f9969be..be076f6c 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -50,11 +50,11 @@
#include <webkit/webkit.h>
#endif
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
static const int STATUS_CONTEXT_ENGINE = 0;
static const int STATUS_CONTEXT_GRAPH = 1;
@@ -818,7 +818,7 @@ GraphBox::event_arrange()
void
GraphBox::event_parent_activated()
{
- SPtr<Client::GraphModel> parent = dynamic_ptr_cast<Client::GraphModel>(_graph->parent());
+ SPtr<client::GraphModel> parent = dynamic_ptr_cast<client::GraphModel>(_graph->parent());
if (parent) {
_app->window_factory()->present_graph(parent, _window);
}
@@ -918,5 +918,5 @@ GraphBox::event_port_names_toggled()
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp
index fd9bf9c0..93599e0b 100644
--- a/src/gui/GraphBox.hpp
+++ b/src/gui/GraphBox.hpp
@@ -38,17 +38,17 @@ class Atom;
class Path;
}
-namespace Ingen {
+namespace ingen {
class URI;
-namespace Client {
+namespace client {
class GraphModel;
class PortModel;
class ObjectModel;
}
-namespace GUI {
+namespace gui {
class BreadCrumbs;
class LoadGraphBox;
@@ -71,13 +71,13 @@ public:
~GraphBox();
static SPtr<GraphBox> create(
- App& app, SPtr<const Client::GraphModel> graph);
+ App& app, SPtr<const client::GraphModel> graph);
void init_box(App& app);
void set_status_text(const std::string& text);
- void set_graph(SPtr<const Client::GraphModel> graph,
+ void set_graph(SPtr<const client::GraphModel> graph,
SPtr<GraphView> view);
void set_window(GraphWindow* win) { _window = win; }
@@ -85,22 +85,22 @@ public:
bool documentation_is_visible() { return _doc_scrolledwindow->is_visible(); }
void set_documentation(const std::string& doc, bool html);
- SPtr<const Client::GraphModel> graph() const { return _graph; }
+ SPtr<const client::GraphModel> graph() const { return _graph; }
SPtr<GraphView> view() const { return _view; }
- void show_port_status(const Client::PortModel* port,
+ void show_port_status(const client::PortModel* port,
const Atom& value);
void set_graph_from_path(const Raul::Path& path, SPtr<GraphView> view);
- void object_entered(const Client::ObjectModel* model);
- void object_left(const Client::ObjectModel* model);
+ void object_entered(const client::ObjectModel* model);
+ void object_left(const client::ObjectModel* model);
private:
- void graph_port_added(SPtr<const Client::PortModel> port);
- void graph_port_removed(SPtr<const Client::PortModel> port);
+ void graph_port_added(SPtr<const client::PortModel> port);
+ void graph_port_removed(SPtr<const client::PortModel> port);
void property_changed(const URI& predicate, const Atom& value);
- void show_status(const Client::ObjectModel* model);
+ void show_status(const client::ObjectModel* model);
void error(const Glib::ustring& message,
const Glib::ustring& secondary_text="");
@@ -144,7 +144,7 @@ private:
void event_clipboard_changed(GdkEventOwnerChange* ev);
App* _app;
- SPtr<const Client::GraphModel> _graph;
+ SPtr<const client::GraphModel> _graph;
SPtr<GraphView> _view;
GraphWindow* _window;
@@ -207,7 +207,7 @@ private:
bool _enable_signal;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_GRAPH_BOX_HPP
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index ed1a7153..37974d1e 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -55,11 +55,11 @@
using std::string;
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
static int
port_order(const GanvPort* a, const GanvPort* b, void* data)
@@ -291,7 +291,7 @@ ensure_port_labels(GanvNode* node, void* data)
if (GANV_IS_MODULE(node)) {
Ganv::Module* module = Glib::wrap(GANV_MODULE(node));
for (Ganv::Port* p : *module) {
- Ingen::GUI::Port* port = dynamic_cast<Ingen::GUI::Port*>(p);
+ ingen::gui::Port* port = dynamic_cast<ingen::gui::Port*>(p);
if (port) {
port->ensure_label();
}
@@ -400,7 +400,7 @@ GraphCanvas::get_port_view(SPtr<PortModel> port)
module = dynamic_cast<NodeModule*>(_views[port->parent()]);
if (module) {
for (const auto& p : *module) {
- GUI::Port* pv = dynamic_cast<GUI::Port*>(p);
+ gui::Port* pv = dynamic_cast<gui::Port*>(p);
if (pv && pv->model() == port) {
return pv;
}
@@ -419,7 +419,7 @@ GraphCanvas::connection(SPtr<const ArcModel> arc)
Ganv::Port* const head = get_port_view(arc->head());
if (tail && head) {
- new GUI::Arc(*this, arc, tail, head);
+ new gui::Arc(*this, arc, tail, head);
} else {
_app.log().error(fmt("Unable to find ports to connect %1% => %2%\n")
% arc->tail_path() % arc->head_path());
@@ -436,7 +436,7 @@ GraphCanvas::disconnection(SPtr<const ArcModel> arc)
if (tail && head) {
remove_edge_between(tail, head);
if (arc->head()->is_a(_app.uris().lv2_AudioPort)) {
- GUI::Port* const h = dynamic_cast<GUI::Port*>(head);
+ gui::Port* const h = dynamic_cast<gui::Port*>(head);
if (h) {
h->activity(_app.forge().make(0.0f)); // Reset peaks
}
@@ -451,8 +451,8 @@ GraphCanvas::disconnection(SPtr<const ArcModel> arc)
void
GraphCanvas::connect(Ganv::Node* tail, Ganv::Node* head)
{
- const GUI::Port* const t = dynamic_cast<GUI::Port*>(tail);
- const GUI::Port* const h = dynamic_cast<GUI::Port*>(head);
+ const gui::Port* const t = dynamic_cast<gui::Port*>(tail);
+ const gui::Port* const h = dynamic_cast<gui::Port*>(head);
if (t && h) {
_app.interface()->connect(t->model()->path(), h->model()->path());
@@ -463,8 +463,8 @@ GraphCanvas::connect(Ganv::Node* tail, Ganv::Node* head)
void
GraphCanvas::disconnect(Ganv::Node* tail, Ganv::Node* head)
{
- const GUI::Port* const t = dynamic_cast<GUI::Port*>(tail);
- const GUI::Port* const h = dynamic_cast<GUI::Port*>(head);
+ const gui::Port* const t = dynamic_cast<gui::Port*>(tail);
+ const gui::Port* const h = dynamic_cast<gui::Port*>(head);
if (t && h) {
_app.interface()->disconnect(t->model()->path(), h->model()->path());
@@ -634,7 +634,7 @@ serialise_arc(GanvEdge* arc, void* data)
return;
}
- GUI::Arc* garc = dynamic_cast<GUI::Arc*>(Glib::wrap(GANV_EDGE(arc)));
+ gui::Arc* garc = dynamic_cast<gui::Arc*>(Glib::wrap(GANV_EDGE(arc)));
if (garc) {
serialiser->serialise_arc(Sord::Node(), garc->model());
}
@@ -895,5 +895,5 @@ GraphCanvas::menu_properties()
_app.window_factory()->present_properties(_graph);
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index a7340744..86e47faa 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -32,11 +32,11 @@
#include "NodeModule.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client { class GraphModel; }
+namespace client { class GraphModel; }
-namespace GUI {
+namespace gui {
class NodeModule;
class PluginMenu;
@@ -49,7 +49,7 @@ class GraphCanvas : public Ganv::Canvas
{
public:
GraphCanvas(App& app,
- SPtr<const Client::GraphModel> graph,
+ SPtr<const client::GraphModel> graph,
int width,
int height);
@@ -62,14 +62,14 @@ public:
void show_port_names(bool b);
bool show_port_names() const { return _show_port_names; }
- void add_plugin(SPtr<Client::PluginModel> p);
+ void add_plugin(SPtr<client::PluginModel> p);
void remove_plugin(const URI& uri);
- void add_block(SPtr<const Client::BlockModel> bm);
- void remove_block(SPtr<const Client::BlockModel> bm);
- void add_port(SPtr<const Client::PortModel> pm);
- void remove_port(SPtr<const Client::PortModel> pm);
- void connection(SPtr<const Client::ArcModel> arc);
- void disconnection(SPtr<const Client::ArcModel> arc);
+ void add_block(SPtr<const client::BlockModel> bm);
+ void remove_block(SPtr<const client::BlockModel> bm);
+ void add_port(SPtr<const client::PortModel> pm);
+ void remove_port(SPtr<const client::PortModel> pm);
+ void connection(SPtr<const client::ArcModel> arc);
+ void disconnection(SPtr<const client::ArcModel> arc);
void get_new_module_location(double& x, double& y);
@@ -97,7 +97,7 @@ private:
void menu_new_graph();
void menu_load_graph();
void menu_properties();
- void load_plugin(WPtr<Client::PluginModel> weak_plugin);
+ void load_plugin(WPtr<client::PluginModel> weak_plugin);
void build_menus();
@@ -107,7 +107,7 @@ private:
Properties get_initial_data(Resource::Graph ctx=Resource::Graph::DEFAULT);
- Ganv::Port* get_port_view(SPtr<Client::PortModel> port);
+ Ganv::Port* get_port_view(SPtr<client::PortModel> port);
void connect(Ganv::Node* tail,
Ganv::Node* head);
@@ -116,9 +116,9 @@ private:
Ganv::Node* head);
App& _app;
- SPtr<const Client::GraphModel> _graph;
+ SPtr<const client::GraphModel> _graph;
- typedef std::map<SPtr<const Client::ObjectModel>, Ganv::Module*> Views;
+ typedef std::map<SPtr<const client::ObjectModel>, Ganv::Module*> Views;
Views _views;
int _auto_position_count;
@@ -153,7 +153,7 @@ private:
bool _menu_dirty;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_GRAPHCANVAS_HPP
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 5987b0e3..b5b234c4 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -34,14 +34,14 @@
#include "WidgetFactory.hpp"
#include "WindowFactory.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
GraphPortModule::GraphPortModule(GraphCanvas& canvas,
- SPtr<const Client::PortModel> model)
+ SPtr<const client::PortModel> model)
: Ganv::Module(canvas, "", 0, 0, false) // FIXME: coords?
, _model(model)
, _port(nullptr)
@@ -162,5 +162,5 @@ GraphPortModule::set_selected(gboolean b)
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp
index 97bc2e5b..2e060eae 100644
--- a/src/gui/GraphPortModule.hpp
+++ b/src/gui/GraphPortModule.hpp
@@ -25,12 +25,12 @@
namespace Raul { class Atom; }
-namespace Ingen { namespace Client {
+namespace ingen { namespace client {
class PortModel;
} }
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
class GraphCanvas;
class Port;
@@ -47,7 +47,7 @@ class GraphPortModule : public Ganv::Module
public:
static GraphPortModule* create(
GraphCanvas& canvas,
- SPtr<const Client::PortModel> model);
+ SPtr<const client::PortModel> model);
App& app() const;
@@ -56,11 +56,11 @@ public:
void set_name(const std::string& n);
- SPtr<const Client::PortModel> port() const { return _model; }
+ SPtr<const client::PortModel> port() const { return _model; }
protected:
GraphPortModule(GraphCanvas& canvas,
- SPtr<const Client::PortModel> model);
+ SPtr<const client::PortModel> model);
bool show_menu(GdkEventButton* ev);
void set_selected(gboolean b);
@@ -69,11 +69,11 @@ protected:
void property_changed(const URI& key, const Atom& value);
- SPtr<const Client::PortModel> _model;
+ SPtr<const client::PortModel> _model;
Port* _port;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_GRAPHPORTMODULE_HPP
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index 1eb6557b..2edf8a44 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -24,11 +24,11 @@
#include "ingen/client/GraphModel.hpp"
#include "raul/Path.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
GraphTreeWindow::GraphTreeWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -133,7 +133,7 @@ GraphTreeWindow::remove_graph(SPtr<GraphModel> pm)
Gtk::TreeModel::iterator
GraphTreeWindow::find_graph(Gtk::TreeModel::Children root,
- SPtr<Client::ObjectModel> graph)
+ SPtr<client::ObjectModel> graph)
{
for (Gtk::TreeModel::iterator c = root.begin(); c != root.end(); ++c) {
SPtr<GraphModel> pm = (*c)[_graph_tree_columns.graph_model_col];
@@ -231,5 +231,5 @@ GraphTreeWindow::graph_moved(SPtr<GraphModel> graph)
_enable_signal = true;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp
index 005f39a8..3991671d 100644
--- a/src/gui/GraphTreeWindow.hpp
+++ b/src/gui/GraphTreeWindow.hpp
@@ -26,11 +26,11 @@
namespace Raul { class Path; }
-namespace Ingen {
+namespace ingen {
-namespace Client { class ClientStore; class ObjectModel; }
+namespace client { class ClientStore; class ObjectModel; }
-namespace GUI {
+namespace gui {
class GraphWindow;
class GraphTreeView;
@@ -45,18 +45,18 @@ public:
GraphTreeWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void init(App& app, Client::ClientStore& store);
+ void init(App& app, client::ClientStore& store);
- void new_object(SPtr<Client::ObjectModel> object);
+ void new_object(SPtr<client::ObjectModel> object);
void graph_property_changed(const URI& key,
const Atom& value,
- SPtr<Client::GraphModel> graph);
+ SPtr<client::GraphModel> graph);
- void graph_moved(SPtr<Client::GraphModel> graph);
+ void graph_moved(SPtr<client::GraphModel> graph);
- void add_graph(SPtr<Client::GraphModel> pm);
- void remove_graph(SPtr<Client::GraphModel> pm);
+ void add_graph(SPtr<client::GraphModel> pm);
+ void remove_graph(SPtr<client::GraphModel> pm);
void show_graph_menu(GdkEventButton* ev);
protected:
@@ -67,7 +67,7 @@ protected:
Gtk::TreeModel::iterator find_graph(
Gtk::TreeModel::Children root,
- SPtr<Client::ObjectModel> graph);
+ SPtr<client::ObjectModel> graph);
GraphTreeView* _graphs_treeview;
@@ -81,7 +81,7 @@ protected:
Gtk::TreeModelColumn<Glib::ustring> name_col;
Gtk::TreeModelColumn<bool> enabled_col;
- Gtk::TreeModelColumn<SPtr<Client::GraphModel> > graph_model_col;
+ Gtk::TreeModelColumn<SPtr<client::GraphModel> > graph_model_col;
};
App* _app;
@@ -117,7 +117,7 @@ private:
}; // struct GraphTreeView
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_GRAPHTREEWINDOW_HPP
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index e6361249..42e19344 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -28,11 +28,11 @@
#include "GraphView.hpp"
#include "WidgetFactory.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
GraphView::GraphView(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -150,5 +150,5 @@ GraphView::property_changed(const URI& predicate, const Atom& value)
_enable_signal = true;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/GraphView.hpp b/src/gui/GraphView.hpp
index 03569831..57a210a3 100644
--- a/src/gui/GraphView.hpp
+++ b/src/gui/GraphView.hpp
@@ -30,16 +30,16 @@
namespace Raul { class Atom; }
-namespace Ingen {
+namespace ingen {
-namespace Client {
+namespace client {
class PortModel;
class MetadataModel;
class GraphModel;
class ObjectModel;
}
-namespace GUI {
+namespace gui {
class App;
class LoadPluginWindow;
@@ -63,14 +63,14 @@ public:
void init(App& app);
SPtr<GraphCanvas> canvas() const { return _canvas; }
- SPtr<const Client::GraphModel> graph() const { return _graph; }
+ SPtr<const client::GraphModel> graph() const { return _graph; }
Gtk::ToolItem* breadcrumb_container() const { return _breadcrumb_container; }
static SPtr<GraphView> create(App& app,
- SPtr<const Client::GraphModel> graph);
+ SPtr<const client::GraphModel> graph);
private:
- void set_graph(SPtr<const Client::GraphModel> graph);
+ void set_graph(SPtr<const client::GraphModel> graph);
void process_toggled();
void poly_changed();
@@ -80,7 +80,7 @@ private:
App* _app;
- SPtr<const Client::GraphModel> _graph;
+ SPtr<const client::GraphModel> _graph;
SPtr<GraphCanvas> _canvas;
Gtk::ScrolledWindow* _canvas_scrolledwindow;
@@ -92,7 +92,7 @@ private:
bool _enable_signal;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_GRAPHVIEW_HPP
diff --git a/src/gui/GraphWindow.cpp b/src/gui/GraphWindow.cpp
index b5a89c79..086886ef 100644
--- a/src/gui/GraphWindow.cpp
+++ b/src/gui/GraphWindow.cpp
@@ -23,8 +23,8 @@
#include "GraphWindow.hpp"
#include "WindowFactory.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
GraphWindow::GraphWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -81,5 +81,5 @@ GraphWindow::on_key_press_event(GdkEventKey* event)
return Gtk::Window::on_key_press_event(event);
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/GraphWindow.hpp b/src/gui/GraphWindow.hpp
index b4e51d7b..69b8a3d4 100644
--- a/src/gui/GraphWindow.hpp
+++ b/src/gui/GraphWindow.hpp
@@ -26,13 +26,13 @@
#include "GraphBox.hpp"
#include "Window.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client {
+namespace client {
class GraphModel;
}
-namespace GUI {
+namespace gui {
/** A window for a graph.
*
@@ -48,7 +48,7 @@ public:
void init_window(App& app);
- SPtr<const Client::GraphModel> graph() const { return _box->graph(); }
+ SPtr<const client::GraphModel> graph() const { return _box->graph(); }
GraphBox* box() const { return _box; }
bool documentation_is_visible() { return _box->documentation_is_visible(); }
@@ -57,7 +57,7 @@ public:
_box->set_documentation(doc, html);
}
- void show_port_status(const Client::PortModel* model,
+ void show_port_status(const client::PortModel* model,
const Atom& value) {
_box->show_port_status(model, value);
}
@@ -74,7 +74,7 @@ private:
int _y;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_GRAPH_WINDOW_HPP
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index b02ca510..a8bbd94a 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -34,11 +34,11 @@
#include "Style.hpp"
#include "ThreadedLoader.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
LoadGraphWindow::LoadGraphWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -88,7 +88,7 @@ LoadGraphWindow::LoadGraphWindow(BaseObjectType* cobject,
property_select_multiple() = true;
// Add global examples directory to "shortcut folders" (bookmarks)
- const FilePath examples_dir = Ingen::data_file_path("graphs");
+ const FilePath examples_dir = ingen::data_file_path("graphs");
if (Glib::file_test(examples_dir, Glib::FILE_TEST_IS_DIR)) {
add_shortcut_folder(examples_dir.string());
}
@@ -253,5 +253,5 @@ LoadGraphWindow::selection_changed()
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/LoadGraphWindow.hpp b/src/gui/LoadGraphWindow.hpp
index 8ec5ed4b..d4b36a26 100644
--- a/src/gui/LoadGraphWindow.hpp
+++ b/src/gui/LoadGraphWindow.hpp
@@ -28,11 +28,11 @@
#include "ingen/Node.hpp"
#include "ingen/types.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client { class GraphModel; }
+namespace client { class GraphModel; }
-namespace GUI {
+namespace gui {
/** 'Load Graph' Window.
*
@@ -48,9 +48,9 @@ public:
void init(App& app) { _app = &app; }
- void set_graph(SPtr<const Client::GraphModel> graph);
+ void set_graph(SPtr<const client::GraphModel> graph);
- void present(SPtr<const Client::GraphModel> graph,
+ void present(SPtr<const client::GraphModel> graph,
bool import,
Properties data);
@@ -72,7 +72,7 @@ private:
Properties _initial_data;
- SPtr<const Client::GraphModel> _graph;
+ SPtr<const client::GraphModel> _graph;
Gtk::Label* _symbol_label;
Gtk::Entry* _symbol_entry;
@@ -89,7 +89,7 @@ private:
bool _merge_ports;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_LOADGRAPHWINDOW_HPP
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index bd08f457..743c0f11 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -35,11 +35,11 @@
using std::string;
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -507,5 +507,5 @@ LoadPluginWindow::plugin_property_changed(const URI& plugin,
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 29314c7a..dcea9d6b 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -33,14 +33,14 @@
#include "Window.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client {
+namespace client {
class GraphModel;
class PluginModel;
}
-namespace GUI {
+namespace gui {
/** 'Load Plugin' window.
*
@@ -54,12 +54,12 @@ public:
LoadPluginWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void set_graph(SPtr<const Client::GraphModel> graph);
- void set_plugins(SPtr<const Client::ClientStore::Plugins> plugins);
+ void set_graph(SPtr<const client::GraphModel> graph);
+ void set_plugins(SPtr<const client::ClientStore::Plugins> plugins);
- void add_plugin(SPtr<const Client::PluginModel> plugin);
+ void add_plugin(SPtr<const client::PluginModel> plugin);
- void present(SPtr<const Client::GraphModel> graph,
+ void present(SPtr<const client::GraphModel> graph,
Properties data);
protected:
@@ -86,7 +86,7 @@ private:
Gtk::TreeModelColumn<Glib::ustring> _col_uri;
// Not displayed:
- Gtk::TreeModelColumn< SPtr<const Client::PluginModel> > _col_plugin;
+ Gtk::TreeModelColumn< SPtr<const client::PluginModel> > _col_plugin;
};
/** Column for the filter criteria combo box. */
@@ -110,9 +110,9 @@ private:
void name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event);
void set_row(Gtk::TreeModel::Row& row,
- SPtr<const Client::PluginModel> plugin);
+ SPtr<const client::PluginModel> plugin);
- void new_plugin(SPtr<const Client::PluginModel> pm);
+ void new_plugin(SPtr<const client::PluginModel> pm);
void plugin_property_changed(const URI& plugin,
const URI& predicate,
@@ -121,14 +121,14 @@ private:
void plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col);
void plugin_selection_changed();
- std::string generate_module_name(SPtr<const Client::PluginModel> plugin,
+ std::string generate_module_name(SPtr<const client::PluginModel> plugin,
int offset=0);
void load_plugin(const Gtk::TreeModel::iterator& iter);
Properties _initial_data;
- SPtr<const Client::GraphModel> _graph;
+ SPtr<const client::GraphModel> _graph;
typedef std::map<URI, Gtk::TreeModel::iterator> Rows;
Rows _rows;
@@ -154,7 +154,7 @@ private:
Gtk::Entry* _search_entry;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_LOADPLUGINWINDOW_HPP
diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp
index 581e732c..2b980a53 100644
--- a/src/gui/MessagesWindow.cpp
+++ b/src/gui/MessagesWindow.cpp
@@ -21,8 +21,8 @@
#include "App.hpp"
#include "MessagesWindow.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
using std::string;
MessagesWindow::MessagesWindow(BaseObjectType* cobject,
@@ -137,5 +137,5 @@ MessagesWindow::clear_clicked()
_clear_button->set_sensitive(false);
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index b83a8047..b3c5114d 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -28,8 +28,8 @@
#include "Window.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
/** Messages Window.
*
@@ -64,7 +64,7 @@ private:
std::map< LV2_URID, Glib::RefPtr<Gtk::TextTag> > _tags;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_MESSAGESWINDOW_HPP
diff --git a/src/gui/NewSubgraphWindow.cpp b/src/gui/NewSubgraphWindow.cpp
index f9dc8fc4..4f8197f2 100644
--- a/src/gui/NewSubgraphWindow.cpp
+++ b/src/gui/NewSubgraphWindow.cpp
@@ -24,8 +24,8 @@
#include "NewSubgraphWindow.hpp"
#include "GraphView.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
NewSubgraphWindow::NewSubgraphWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -47,7 +47,7 @@ NewSubgraphWindow::NewSubgraphWindow(BaseObjectType* cobject,
}
void
-NewSubgraphWindow::present(SPtr<const Client::GraphModel> graph,
+NewSubgraphWindow::present(SPtr<const client::GraphModel> graph,
Properties data)
{
set_graph(graph);
@@ -60,7 +60,7 @@ NewSubgraphWindow::present(SPtr<const Client::GraphModel> graph,
* This function MUST be called before using the window in any way!
*/
void
-NewSubgraphWindow::set_graph(SPtr<const Client::GraphModel> graph)
+NewSubgraphWindow::set_graph(SPtr<const client::GraphModel> graph)
{
_graph = graph;
}
@@ -115,5 +115,5 @@ NewSubgraphWindow::cancel_clicked()
hide();
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/NewSubgraphWindow.hpp b/src/gui/NewSubgraphWindow.hpp
index 395856ba..403faa42 100644
--- a/src/gui/NewSubgraphWindow.hpp
+++ b/src/gui/NewSubgraphWindow.hpp
@@ -28,11 +28,11 @@
#include "Window.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client { class GraphModel; }
+namespace client { class GraphModel; }
-namespace GUI {
+namespace gui {
/** 'New Subgraph' window.
*
@@ -46,9 +46,9 @@ public:
NewSubgraphWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void set_graph(SPtr<const Client::GraphModel> graph);
+ void set_graph(SPtr<const client::GraphModel> graph);
- void present(SPtr<const Client::GraphModel> graph,
+ void present(SPtr<const client::GraphModel> graph,
Properties data);
private:
@@ -57,7 +57,7 @@ private:
void cancel_clicked();
Properties _initial_data;
- SPtr<const Client::GraphModel> _graph;
+ SPtr<const client::GraphModel> _graph;
Gtk::Entry* _name_entry;
Gtk::Label* _message_label;
@@ -66,7 +66,7 @@ private:
Gtk::Button* _cancel_button;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_NEWSUBGRAPHWINDOW_HPP
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 1fea97f4..45f1e7cd 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -33,11 +33,11 @@
#include "WidgetFactory.hpp"
#include "WindowFactory.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
NodeMenu::NodeMenu(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -51,7 +51,7 @@ NodeMenu::NodeMenu(BaseObjectType* cobject,
}
void
-NodeMenu::init(App& app, SPtr<const Client::BlockModel> block)
+NodeMenu::init(App& app, SPtr<const client::BlockModel> block)
{
ObjectMenu::init(app, block);
@@ -249,5 +249,5 @@ NodeMenu::has_control_inputs()
return false;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index 5d9f1e6d..e92e48fc 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -27,8 +27,8 @@
#include "ingen/client/BlockModel.hpp"
#include "ingen/types.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
/** Menu for a Node.
*
@@ -40,7 +40,7 @@ public:
NodeMenu(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void init(App& app, SPtr<const Client::BlockModel> block);
+ void init(App& app, SPtr<const client::BlockModel> block);
bool has_control_inputs();
@@ -48,8 +48,8 @@ public:
sigc::signal<void, bool> signal_embed_gui;
protected:
- SPtr<const Client::BlockModel> block() const {
- return dynamic_ptr_cast<const Client::BlockModel>(_object);
+ SPtr<const client::BlockModel> block() const {
+ return dynamic_ptr_cast<const client::BlockModel>(_object);
}
void add_preset(const URI& uri, const std::string& label);
@@ -69,7 +69,7 @@ protected:
sigc::connection _preset_connection;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_NODEMENU_HPP
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 6163c1c1..8605e91d 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -43,11 +43,11 @@
#include "WindowFactory.hpp"
#include "ingen_config.h"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
NodeModule::NodeModule(GraphCanvas& canvas,
SPtr<const BlockModel> block)
@@ -178,7 +178,7 @@ NodeModule::show_human_names(bool b)
}
for (iterator i = begin(); i != end(); ++i) {
- Ingen::GUI::Port* const port = dynamic_cast<Ingen::GUI::Port*>(*i);
+ ingen::gui::Port* const port = dynamic_cast<ingen::gui::Port*>(*i);
Glib::ustring label(port->model()->symbol().c_str());
if (b) {
const Atom& name_property = port->model()->get_property(uris.lv2_name);
@@ -235,7 +235,7 @@ void
NodeModule::plugin_changed()
{
for (iterator p = begin(); p != end(); ++p) {
- dynamic_cast<Ingen::GUI::Port*>(*p)->update_metadata();
+ dynamic_cast<ingen::gui::Port*>(*p)->update_metadata();
}
}
@@ -514,5 +514,5 @@ NodeModule::on_selected(gboolean selected)
return true;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 863b6ffb..51692451 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -24,14 +24,14 @@
namespace Raul { class Atom; }
-namespace Ingen { namespace Client {
+namespace ingen { namespace client {
class BlockModel;
class PluginUI;
class PortModel;
} }
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
class GraphCanvas;
class Port;
@@ -48,24 +48,24 @@ class NodeModule : public Ganv::Module
public:
static NodeModule* create(
GraphCanvas& canvas,
- SPtr<const Client::BlockModel> block,
+ SPtr<const client::BlockModel> block,
bool human);
virtual ~NodeModule();
App& app() const;
- Port* port(SPtr<const Client::PortModel> model);
+ Port* port(SPtr<const client::PortModel> model);
- void delete_port_view(SPtr<const Client::PortModel> model);
+ void delete_port_view(SPtr<const client::PortModel> model);
virtual void store_location(double ax, double ay);
void show_human_names(bool b);
- SPtr<const Client::BlockModel> block() const { return _block; }
+ SPtr<const client::BlockModel> block() const { return _block; }
protected:
- NodeModule(GraphCanvas& canvas, SPtr<const Client::BlockModel> block);
+ NodeModule(GraphCanvas& canvas, SPtr<const client::BlockModel> block);
virtual bool on_double_click(GdkEventButton* ev);
@@ -81,7 +81,7 @@ protected:
void rename();
void property_changed(const URI& key, const Atom& value);
- void new_port_view(SPtr<const Client::PortModel> port);
+ void new_port_view(SPtr<const client::PortModel> port);
void port_activity(uint32_t index, const Atom& value);
void port_value_changed(uint32_t index, const Atom& value);
@@ -90,15 +90,15 @@ protected:
bool show_menu(GdkEventButton* ev);
- SPtr<const Client::BlockModel> _block;
+ SPtr<const client::BlockModel> _block;
NodeMenu* _menu;
- SPtr<Client::PluginUI> _plugin_ui;
+ SPtr<client::PluginUI> _plugin_ui;
Gtk::Widget* _gui_widget;
Gtk::Window* _gui_window; ///< iff popped up
bool _initialised;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_NODEMODULE_HPP
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index bfce4248..7c81adf2 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -25,11 +25,11 @@
#include "WidgetFactory.hpp"
#include "WindowFactory.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
ObjectMenu::ObjectMenu(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -141,5 +141,5 @@ ObjectMenu::on_menu_properties()
_app->window_factory()->present_properties(_object);
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index a9b07fd5..b0a0cc10 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -25,8 +25,8 @@
#include "ingen/client/ObjectModel.hpp"
#include "ingen/types.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
class ObjectControlWindow;
class ObjectPropertiesWindow;
@@ -42,9 +42,9 @@ public:
ObjectMenu(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void init(App& app, SPtr<const Client::ObjectModel> object);
+ void init(App& app, SPtr<const client::ObjectModel> object);
- SPtr<const Client::ObjectModel> object() const { return _object; }
+ SPtr<const client::ObjectModel> object() const { return _object; }
App* app() const { return _app; }
protected:
@@ -58,7 +58,7 @@ protected:
void property_changed(const URI& predicate, const Atom& value);
App* _app;
- SPtr<const Client::ObjectModel> _object;
+ SPtr<const client::ObjectModel> _object;
Gtk::MenuItem* _learn_menuitem;
Gtk::MenuItem* _unlearn_menuitem;
Gtk::CheckMenuItem* _polyphonic_menuitem;
@@ -71,7 +71,7 @@ protected:
bool _enable_signal;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_OBJECTMENU_HPP
diff --git a/src/gui/PluginMenu.cpp b/src/gui/PluginMenu.cpp
index fc385773..e85d1da7 100644
--- a/src/gui/PluginMenu.cpp
+++ b/src/gui/PluginMenu.cpp
@@ -18,10 +18,10 @@
#include "ingen/Log.hpp"
#include "ingen/client/PluginModel.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
-PluginMenu::PluginMenu(Ingen::World& world)
+PluginMenu::PluginMenu(ingen::World& world)
: _world(world)
, _classless_menu(nullptr, nullptr)
{
@@ -62,7 +62,7 @@ PluginMenu::clear()
}
void
-PluginMenu::add_plugin(SPtr<Client::PluginModel> p)
+PluginMenu::add_plugin(SPtr<client::PluginModel> p)
{
typedef ClassMenus::iterator iterator;
@@ -141,7 +141,7 @@ PluginMenu::build_plugin_class_menu(Gtk::Menu* menu,
}
void
-PluginMenu::add_plugin_to_menu(MenuRecord& menu, SPtr<Client::PluginModel> p)
+PluginMenu::add_plugin_to_menu(MenuRecord& menu, SPtr<client::PluginModel> p)
{
const URIs& uris = _world.uris();
LilvWorld* lworld = _world.lilv_world();
@@ -167,10 +167,10 @@ PluginMenu::add_plugin_to_menu(MenuRecord& menu, SPtr<Client::PluginModel> p)
}
void
-PluginMenu::load_plugin(WPtr<Client::PluginModel> weak_plugin)
+PluginMenu::load_plugin(WPtr<client::PluginModel> weak_plugin)
{
signal_load_plugin.emit(weak_plugin);
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/PluginMenu.hpp b/src/gui/PluginMenu.hpp
index bc654db5..e4343ed7 100644
--- a/src/gui/PluginMenu.hpp
+++ b/src/gui/PluginMenu.hpp
@@ -27,11 +27,11 @@
#include "ingen/types.hpp"
#include "lilv/lilv.h"
-namespace Ingen {
+namespace ingen {
-namespace Client { class PluginModel; }
+namespace client { class PluginModel; }
-namespace GUI {
+namespace gui {
/**
Type-hierarchical plugin menu.
@@ -41,12 +41,12 @@ namespace GUI {
class PluginMenu : public Gtk::Menu
{
public:
- PluginMenu(Ingen::World& world);
+ PluginMenu(ingen::World& world);
void clear();
- void add_plugin(SPtr<Client::PluginModel> p);
+ void add_plugin(SPtr<client::PluginModel> p);
- sigc::signal< void, WPtr<Client::PluginModel> > signal_load_plugin;
+ sigc::signal< void, WPtr<client::PluginModel> > signal_load_plugin;
private:
struct MenuRecord {
@@ -65,16 +65,16 @@ private:
const LV2Children& children,
std::set<const char*>& ancestors);
- void add_plugin_to_menu(MenuRecord& menu, SPtr<Client::PluginModel> p);
+ void add_plugin_to_menu(MenuRecord& menu, SPtr<client::PluginModel> p);
- void load_plugin(WPtr<Client::PluginModel> weak_plugin);
+ void load_plugin(WPtr<client::PluginModel> weak_plugin);
- Ingen::World& _world;
+ ingen::World& _world;
MenuRecord _classless_menu;
ClassMenus _class_menus;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_PLUGINMENU_HPP
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 9742cee3..60e11471 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -36,10 +36,10 @@
#include "ingen_config.h"
#include "rgba.hpp"
-using namespace Ingen::Client;
+using namespace ingen::client;
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
Port*
Port::create(App& app,
@@ -274,16 +274,16 @@ Port::build_uri_menu()
world->lilv_world(), LILV_NS_RDFS "range");
// Get every class in the range of the port's property
- RDFS::URISet ranges;
+ rdfs::URISet ranges;
LilvNodes* range = lilv_world_find_nodes(
world->lilv_world(), designation, rdfs_range, nullptr);
LILV_FOREACH(nodes, r, range) {
ranges.insert(URI(lilv_node_as_string(lilv_nodes_get(range, r))));
}
- RDFS::classes(world, ranges, false);
+ rdfs::classes(world, ranges, false);
// Get all objects in range
- RDFS::Objects values = RDFS::instances(world, ranges);
+ rdfs::Objects values = rdfs::instances(world, ranges);
// Add a menu item for each such class
for (const auto& v : values) {
@@ -530,5 +530,5 @@ Port::on_selected(gboolean b)
return true;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index c714feae..d459f7b3 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -29,13 +29,13 @@ namespace Raul {
class Atom;
}
-namespace Ingen {
+namespace ingen {
class URI;
-namespace Client { class PortModel; }
+namespace client { class PortModel; }
-namespace GUI {
+namespace gui {
class App;
class GraphBox;
@@ -50,12 +50,12 @@ public:
static Port* create(
App& app,
Ganv::Module& module,
- SPtr<const Client::PortModel> pm,
+ SPtr<const client::PortModel> pm,
bool flip = false);
~Port();
- SPtr<const Client::PortModel> model() const { return _port_model.lock(); }
+ SPtr<const client::PortModel> model() const { return _port_model.lock(); }
bool show_menu(GdkEventButton* ev);
void update_metadata();
@@ -69,11 +69,11 @@ public:
private:
Port(App& app,
Ganv::Module& module,
- SPtr<const Client::PortModel> pm,
+ SPtr<const client::PortModel> pm,
const std::string& name,
bool flip = false);
- static std::string port_label(App& app, SPtr<const Client::PortModel> pm);
+ static std::string port_label(App& app, SPtr<const client::PortModel> pm);
Gtk::Menu* build_enum_menu();
Gtk::Menu* build_uri_menu();
@@ -91,12 +91,12 @@ private:
void set_type_tag();
App& _app;
- WPtr<const Client::PortModel> _port_model;
+ WPtr<const client::PortModel> _port_model;
bool _entered : 1;
bool _flipped : 1;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_PORT_HPP
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index c6ec8fa1..3a5b510d 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -25,11 +25,11 @@
#include "PortMenu.hpp"
#include "WindowFactory.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
PortMenu::PortMenu(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -148,7 +148,7 @@ PortMenu::on_menu_expose()
const std::string label = block->label() + " " + block->port_label(port);
const Raul::Path path = Raul::Path(block->path() + Raul::Symbol("_" + port->symbol()));
- Ingen::Resource r(*_object.get());
+ ingen::Resource r(*_object.get());
r.remove_property(uris.lv2_index, uris.patch_wildcard);
r.set_property(uris.lv2_symbol, _app->forge().alloc(path.symbol()));
r.set_property(uris.lv2_name, _app->forge().alloc(label.c_str()));
@@ -170,5 +170,5 @@ PortMenu::on_menu_expose()
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index db567980..3de51fae 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -26,8 +26,8 @@
#include "ObjectMenu.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
/** Menu for a Port.
*
@@ -40,7 +40,7 @@ public:
const Glib::RefPtr<Gtk::Builder>& xml);
void init(App& app,
- SPtr<const Client::PortModel> port,
+ SPtr<const client::PortModel> port,
bool internal_graph_port = false);
private:
@@ -60,7 +60,7 @@ private:
bool _internal_graph_port;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_PORTMENU_HPP
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 4d47b3ae..80565dd5 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -33,11 +33,11 @@
#include "RDFS.hpp"
#include "URIEntry.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
typedef std::set<URI> URISet;
@@ -109,7 +109,7 @@ PropertiesWindow::add_property(const URI& key, const Atom& value)
// Column 0: Property
LilvNode* prop = lilv_new_uri(world->lilv_world(), key.c_str());
- std::string name = RDFS::label(world, prop);
+ std::string name = rdfs::label(world, prop);
if (name.empty()) {
name = world->rdf_world()->prefixes().qualify(key);
}
@@ -145,7 +145,7 @@ PropertiesWindow::add_property(const URI& key, const Atom& value)
}
bool
-PropertiesWindow::datatype_supported(const RDFS::URISet& types,
+PropertiesWindow::datatype_supported(const rdfs::URISet& types,
URI* widget_type)
{
if (types.find(_app->uris().atom_Int) != types.end()) {
@@ -169,7 +169,7 @@ PropertiesWindow::datatype_supported(const RDFS::URISet& types,
}
bool
-PropertiesWindow::class_supported(const RDFS::URISet& types)
+PropertiesWindow::class_supported(const rdfs::URISet& types)
{
World* world = _app->world();
LilvNode* rdf_type = lilv_new_uri(
@@ -213,12 +213,12 @@ PropertiesWindow::set_object(SPtr<const ObjectModel> model)
world->lilv_world(), LILV_NS_RDFS "Datatype");
// Populate key combo
- const URISet props = RDFS::properties(world, model);
+ const URISet props = rdfs::properties(world, model);
std::map<std::string, URI> entries;
for (const auto& p : props) {
LilvNode* prop = lilv_new_uri(world->lilv_world(), p.c_str());
- const std::string label = RDFS::label(world, prop);
- URISet ranges = RDFS::range(world, prop, true);
+ const std::string label = rdfs::label(world, prop);
+ URISet ranges = rdfs::range(world, prop, true);
lilv_node_free(prop);
if (label.empty() || ranges.empty()) {
@@ -227,9 +227,9 @@ PropertiesWindow::set_object(SPtr<const ObjectModel> model)
}
LilvNode* range = lilv_new_uri(world->lilv_world(), (*ranges.begin()).c_str());
- if (RDFS::is_a(world, range, rdfs_DataType)) {
+ if (rdfs::is_a(world, range, rdfs_DataType)) {
// Range is a datatype, show if type or any subtype is supported
- RDFS::datatypes(_app->world(), ranges, false);
+ rdfs::datatypes(_app->world(), ranges, false);
URI widget_type("urn:nothing");
if (datatype_supported(ranges, &widget_type)) {
entries.emplace(label, p);
@@ -274,12 +274,12 @@ PropertiesWindow::create_value_widget(const URI& key,
}
URI type(type_uri);
- Ingen::World* world = _app->world();
+ ingen::World* world = _app->world();
LilvWorld* lworld = world->lilv_world();
// See if type is a datatype we support
std::set<URI> types{type};
- RDFS::datatypes(_app->world(), types, false);
+ rdfs::datatypes(_app->world(), types, false);
URI widget_type("urn:nothing");
const bool supported = datatype_supported(types, &widget_type);
@@ -333,7 +333,7 @@ PropertiesWindow::create_value_widget(const URI& key,
: "");
LilvNode* pred = lilv_new_uri(lworld, key.c_str());
- URISet ranges = RDFS::range(world, pred, true);
+ URISet ranges = rdfs::range(world, pred, true);
URIEntry* widget = manage(new URIEntry(_app, ranges, str ? str : ""));
widget->signal_changed().connect(
sigc::bind(sigc::mem_fun(this, &PropertiesWindow::on_change), key));
@@ -343,7 +343,7 @@ PropertiesWindow::create_value_widget(const URI& key,
LilvNode* type_node = lilv_new_uri(lworld, type.c_str());
LilvNode* rdfs_Class = lilv_new_uri(lworld, LILV_NS_RDFS "Class");
- const bool is_class = RDFS::is_a(world, type_node, rdfs_Class);
+ const bool is_class = rdfs::is_a(world, type_node, rdfs_Class);
lilv_node_free(rdfs_Class);
lilv_node_free(type_node);
@@ -351,7 +351,7 @@ PropertiesWindow::create_value_widget(const URI& key,
type == _app->uris().rdfs_Class ||
is_class) {
LilvNode* pred = lilv_new_uri(lworld, key.c_str());
- URISet ranges = RDFS::range(world, pred, true);
+ URISet ranges = rdfs::range(world, pred, true);
const char* str = value.is_valid() ? value.ptr<const char>() : "";
URIEntry* widget = manage(new URIEntry(_app, ranges, str));
widget->signal_changed().connect(
@@ -511,7 +511,7 @@ PropertiesWindow::key_changed()
LilvNode* prop = lilv_new_uri(lworld, key_uri.c_str());
// Try to create a value widget in the range of this property
- const URISet ranges = RDFS::range(_app->world(), prop, true);
+ const URISet ranges = rdfs::range(_app->world(), prop, true);
for (const auto& r : ranges) {
Gtk::Widget* value_widget = create_value_widget(
URI(key_uri), r.c_str(), Atom());
@@ -587,5 +587,5 @@ PropertiesWindow::ok_clicked()
Gtk::Window::hide();
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index f4a8dd0d..0cbd8b91 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -34,11 +34,11 @@
#include "Window.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client { class ObjectModel; }
+namespace client { class ObjectModel; }
-namespace GUI {
+namespace gui {
/** Object properties window.
*
@@ -52,8 +52,8 @@ public:
PropertiesWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void present(SPtr<const Client::ObjectModel> model);
- void set_object(SPtr<const Client::ObjectModel> model);
+ void present(SPtr<const client::ObjectModel> model);
+ void set_object(SPtr<const client::ObjectModel> model);
private:
/** Record of a property (row in the table) */
@@ -106,7 +106,7 @@ private:
typedef std::map<URI, Record> Records;
Records _records;
- SPtr<const Client::ObjectModel> _model;
+ SPtr<const client::ObjectModel> _model;
ComboColumns _combo_columns;
Glib::RefPtr<Gtk::ListStore> _key_store;
sigc::connection _property_connection;
@@ -123,7 +123,7 @@ private:
Gtk::Button* _ok_button;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_PROPERTIES_WINDOW_HPP
diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp
index 71b3441a..4ff26914 100644
--- a/src/gui/RDFS.cpp
+++ b/src/gui/RDFS.cpp
@@ -23,9 +23,9 @@
#include "RDFS.hpp"
-namespace Ingen {
-namespace GUI {
-namespace RDFS {
+namespace ingen {
+namespace gui {
+namespace rdfs {
std::string
label(World* world, const LilvNode* node)
@@ -113,7 +113,7 @@ datatypes(World* world, URISet& types, bool super)
}
URISet
-types(World* world, SPtr<const Client::ObjectModel> model)
+types(World* world, SPtr<const client::ObjectModel> model)
{
typedef Properties::const_iterator PropIter;
typedef std::pair<PropIter, PropIter> PropRange;
@@ -137,16 +137,16 @@ types(World* world, SPtr<const Client::ObjectModel> model)
}
// Add every superclass of every type, recursively
- RDFS::classes(world, types, true);
+ rdfs::classes(world, types, true);
return types;
}
URISet
-properties(World* world, SPtr<const Client::ObjectModel> model)
+properties(World* world, SPtr<const client::ObjectModel> model)
{
URISet properties;
- URISet types = RDFS::types(world, model);
+ URISet types = rdfs::types(world, model);
LilvNode* rdf_type = lilv_new_uri(world->lilv_world(),
LILV_NS_RDF "type");
@@ -209,7 +209,7 @@ instances(World* world, const URISet& types)
if (!lilv_node_is_uri(object)) {
continue;
}
- const std::string label = RDFS::label(world, object);
+ const std::string label = rdfs::label(world, object);
result.emplace(label, URI(lilv_node_as_string(object)));
}
lilv_node_free(type);
@@ -234,7 +234,7 @@ range(World* world, const LilvNode* prop, bool recursive)
}
if (recursive) {
- RDFS::classes(world, ranges, false);
+ rdfs::classes(world, ranges, false);
}
lilv_nodes_free(nodes);
@@ -254,6 +254,6 @@ is_a(World* world, const LilvNode* inst, const LilvNode* klass)
return is_instance;
}
-} // namespace RDFS
-} // namespace GUI
-} // namespace Ingen
+} // namespace rdfs
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/RDFS.hpp b/src/gui/RDFS.hpp
index f59bbdf5..8de9076d 100644
--- a/src/gui/RDFS.hpp
+++ b/src/gui/RDFS.hpp
@@ -24,15 +24,15 @@
#include "ingen/types.hpp"
#include "lilv/lilv.h"
-namespace Ingen {
+namespace ingen {
class World;
-namespace Client { class ObjectModel; }
+namespace client { class ObjectModel; }
-namespace GUI {
+namespace gui {
-namespace RDFS {
+namespace rdfs {
/** Set of URIs. */
typedef std::set<URI> URISet;
@@ -60,10 +60,10 @@ void datatypes(World* world, URISet& types, bool super);
Objects instances(World* world, const URISet& types);
/** Get all the types which `model` is an instance of. */
-URISet types(World* world, SPtr<const Client::ObjectModel> model);
+URISet types(World* world, SPtr<const client::ObjectModel> model);
/** Get all the properties with domains appropriate for `model`. */
-URISet properties(World* world, SPtr<const Client::ObjectModel> model);
+URISet properties(World* world, SPtr<const client::ObjectModel> model);
/** Return the range (value types) of `prop`.
* @param recursive If true, include all subclasses.
@@ -73,8 +73,8 @@ URISet range(World* world, const LilvNode* prop, bool recursive);
/** Return true iff `inst` is-a `klass`. */
bool is_a(World* world, const LilvNode* inst, const LilvNode* klass);
-} // namespace RDFS
-} // namespace GUI
-} // namespace Ingen
+} // namespace rdfs
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_RDF_HPP
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index 518f2439..33516c2d 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -26,11 +26,11 @@
#include "App.hpp"
#include "RenameWindow.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
RenameWindow::RenameWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
@@ -133,5 +133,5 @@ RenameWindow::ok_clicked()
hide();
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index 36264879..89d90f26 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -27,8 +27,8 @@
#include "Window.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
/** Rename window. Handles renaming of any (Ingen) object.
*
@@ -40,16 +40,16 @@ public:
RenameWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void present(SPtr<const Client::ObjectModel> object);
+ void present(SPtr<const client::ObjectModel> object);
private:
- void set_object(SPtr<const Client::ObjectModel> object);
+ void set_object(SPtr<const client::ObjectModel> object);
void values_changed();
void cancel_clicked();
void ok_clicked();
- SPtr<const Client::ObjectModel> _object;
+ SPtr<const client::ObjectModel> _object;
Gtk::Entry* _symbol_entry;
Gtk::Entry* _label_entry;
@@ -58,7 +58,7 @@ private:
Gtk::Button* _ok_button;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_RENAMEWINDOW_HPP
diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp
index 81e6fb6c..3a122e45 100644
--- a/src/gui/Style.cpp
+++ b/src/gui/Style.cpp
@@ -30,10 +30,10 @@
#include "Style.hpp"
#include "Port.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
-using namespace Ingen::Client;
+using namespace ingen::client;
Style::Style(App& app)
// Colours from the Tango palette with modified V
@@ -82,7 +82,7 @@ Style::apply_settings()
}
uint32_t
-Style::get_port_color(const Client::PortModel* p)
+Style::get_port_color(const client::PortModel* p)
{
const URIs& uris = _app.uris();
if (p->is_a(uris.lv2_AudioPort)) {
@@ -102,5 +102,5 @@ Style::get_port_color(const Client::PortModel* p)
return 0x555555FF;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/Style.hpp b/src/gui/Style.hpp
index 8e628a3d..bb403ffd 100644
--- a/src/gui/Style.hpp
+++ b/src/gui/Style.hpp
@@ -20,10 +20,10 @@
#include <cstdint>
#include <string>
-namespace Ingen { namespace Client { class PortModel; } }
+namespace ingen { namespace client { class PortModel; } }
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
class App;
class Port;
@@ -38,7 +38,7 @@ public:
void apply_settings();
- uint32_t get_port_color(const Client::PortModel* p);
+ uint32_t get_port_color(const client::PortModel* p);
private:
App& _app;
@@ -50,7 +50,7 @@ private:
uint32_t _string_port_color;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_STYLE_HPP
diff --git a/src/gui/SubgraphModule.cpp b/src/gui/SubgraphModule.cpp
index 6bbcf534..9c836644 100644
--- a/src/gui/SubgraphModule.cpp
+++ b/src/gui/SubgraphModule.cpp
@@ -28,11 +28,11 @@
#include "SubgraphModule.hpp"
#include "WindowFactory.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
SubgraphModule::SubgraphModule(GraphCanvas& canvas,
SPtr<const GraphModel> graph)
@@ -98,5 +98,5 @@ SubgraphModule::menu_remove()
app().interface()->del(_graph->uri());
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp
index 1b8df2fa..44241638 100644
--- a/src/gui/SubgraphModule.hpp
+++ b/src/gui/SubgraphModule.hpp
@@ -22,14 +22,14 @@
#include "NodeModule.hpp"
#include "GraphPortModule.hpp"
-namespace Ingen { namespace Client {
+namespace ingen { namespace client {
class GraphModel;
class GraphWindow;
class PortModel;
} }
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
class GraphCanvas;
@@ -41,7 +41,7 @@ class SubgraphModule : public NodeModule
{
public:
SubgraphModule(GraphCanvas& canvas,
- SPtr<const Client::GraphModel> graph);
+ SPtr<const client::GraphModel> graph);
virtual ~SubgraphModule() {}
@@ -52,13 +52,13 @@ public:
void browse_to_graph();
void menu_remove();
- SPtr<const Client::GraphModel> graph() const { return _graph; }
+ SPtr<const client::GraphModel> graph() const { return _graph; }
protected:
- SPtr<const Client::GraphModel> _graph;
+ SPtr<const client::GraphModel> _graph;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_SUBGRAPHMODULE_HPP
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 7a80fa6e..cd7b1594 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -27,8 +27,8 @@
using boost::optional;
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
ThreadedLoader::ThreadedLoader(App& app, SPtr<Interface> engine)
: _app(app)
@@ -114,7 +114,7 @@ ThreadedLoader::load_graph_event(const FilePath& file_path,
}
void
-ThreadedLoader::save_graph(SPtr<const Client::GraphModel> model, const URI& uri)
+ThreadedLoader::save_graph(SPtr<const client::GraphModel> model, const URI& uri)
{
std::lock_guard<std::mutex> lock(_mutex);
@@ -127,7 +127,7 @@ ThreadedLoader::save_graph(SPtr<const Client::GraphModel> model, const URI& uri)
}
void
-ThreadedLoader::save_graph_event(SPtr<const Client::GraphModel> model,
+ThreadedLoader::save_graph_event(SPtr<const client::GraphModel> model,
const URI& uri)
{
assert(uri.scheme() == "file");
@@ -144,5 +144,5 @@ ThreadedLoader::save_graph_event(SPtr<const Client::GraphModel> model,
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 79ef6466..70e13fce 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -32,11 +32,11 @@
#include "ingen/Serialiser.hpp"
#include "raul/Semaphore.hpp"
-namespace Ingen {
+namespace ingen {
class URI;
-namespace GUI {
+namespace gui {
/** Thread for loading graph files.
*
@@ -63,7 +63,7 @@ public:
boost::optional<Raul::Symbol> engine_symbol,
boost::optional<Properties> engine_data);
- void save_graph(SPtr<const Client::GraphModel> model, const URI& uri);
+ void save_graph(SPtr<const client::GraphModel> model, const URI& uri);
SPtr<Parser> parser();
@@ -73,7 +73,7 @@ private:
boost::optional<Raul::Symbol> engine_symbol,
boost::optional<Properties> engine_data);
- void save_graph_event(SPtr<const Client::GraphModel> model,
+ void save_graph_event(SPtr<const client::GraphModel> model,
const URI& filename);
/** Returns nothing and takes no parameters (because they have all been bound) */
@@ -90,7 +90,7 @@ private:
std::thread _thread;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_LOADERRTHREAD_HPP
diff --git a/src/gui/URIEntry.cpp b/src/gui/URIEntry.cpp
index 0b81afd7..97099b46 100644
--- a/src/gui/URIEntry.cpp
+++ b/src/gui/URIEntry.cpp
@@ -20,8 +20,8 @@
#include "RDFS.hpp"
#include "URIEntry.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
URIEntry::URIEntry(App* app, std::set<URI> types, const std::string& value)
: Gtk::HBox(false, 4)
@@ -52,7 +52,7 @@ URIEntry::build_value_menu()
LilvNode* rdfs_Datatype = lilv_new_uri(lworld, LILV_NS_RDFS "Datatype");
LilvNode* rdfs_subClassOf = lilv_new_uri(lworld, LILV_NS_RDFS "subClassOf");
- RDFS::Objects values = RDFS::instances(world, _types);
+ rdfs::Objects values = rdfs::instances(world, _types);
for (const auto& v : values) {
const LilvNode* inst = lilv_new_uri(lworld, v.second.c_str());
@@ -111,18 +111,18 @@ URIEntry::build_subclass_menu(const LilvNode* klass)
Gtk::Menu* menu = new Gtk::Menu();
// Add "header" item for choosing this class itself
- add_leaf_menu_item(menu, klass, RDFS::label(world, klass));
+ add_leaf_menu_item(menu, klass, rdfs::label(world, klass));
menu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
// Put subclasses/types in a map keyed by label (to sort menu)
std::map<std::string, const LilvNode*> entries;
LILV_FOREACH(nodes, s, subclasses) {
const LilvNode* node = lilv_nodes_get(subclasses, s);
- entries.emplace(RDFS::label(world, node), node);
+ entries.emplace(rdfs::label(world, node), node);
}
LILV_FOREACH(nodes, s, subtypes) {
const LilvNode* node = lilv_nodes_get(subtypes, s);
- entries.emplace(RDFS::label(world, node), node);
+ entries.emplace(rdfs::label(world, node), node);
}
// Add an item (possibly with a submenu) for each subclass/type
@@ -188,5 +188,5 @@ URIEntry::menu_button_event(GdkEvent* ev)
return true;
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp
index 2f55a3d9..247c4a6d 100644
--- a/src/gui/URIEntry.hpp
+++ b/src/gui/URIEntry.hpp
@@ -24,8 +24,8 @@
#include "lilv/lilv.h"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
class App;
@@ -62,7 +62,7 @@ private:
Gtk::Entry* _entry;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_URI_ENTRY_HPP
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index afb6a07f..3ca4eec4 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -22,8 +22,8 @@
#include "WidgetFactory.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
Glib::ustring WidgetFactory::ui_filename = "";
@@ -40,7 +40,7 @@ void
WidgetFactory::find_ui_file()
{
// Try file in bundle (directory where executable resides)
- ui_filename = Ingen::bundle_file_path("ingen_gui.ui");
+ ui_filename = ingen::bundle_file_path("ingen_gui.ui");
if (is_readable(ui_filename)) {
return;
}
@@ -53,7 +53,7 @@ WidgetFactory::find_ui_file()
}
// Try the default system installed path
- ui_filename = Ingen::data_file_path("ingen_gui.ui");
+ ui_filename = ingen::data_file_path("ingen_gui.ui");
if (is_readable(ui_filename)) {
return;
}
@@ -76,5 +76,5 @@ WidgetFactory::create(const std::string& toplevel_widget)
}
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp
index 92f4dffe..e640e2a7 100644
--- a/src/gui/WidgetFactory.hpp
+++ b/src/gui/WidgetFactory.hpp
@@ -22,8 +22,8 @@
#include <glibmm.h>
#include <gtkmm/builder.h>
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
/** Loads widgets from an XML description.
* Purely static.
@@ -52,7 +52,7 @@ private:
static Glib::ustring ui_filename;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_GLADEFACTORY_HPP
diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp
index 2a5c9843..6bf5e586 100644
--- a/src/gui/Window.hpp
+++ b/src/gui/Window.hpp
@@ -20,9 +20,9 @@
#include <gtkmm/dialog.h>
#include <gtkmm/window.h>
-namespace Ingen {
+namespace ingen {
-namespace GUI {
+namespace gui {
class App;
@@ -72,7 +72,7 @@ public:
App* _app;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_WINDOW_HPP
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 5dbdbe98..c5f9c089 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -31,11 +31,11 @@
#include "WidgetFactory.hpp"
#include "WindowFactory.hpp"
-namespace Ingen {
+namespace ingen {
-using namespace Client;
+using namespace client;
-namespace GUI {
+namespace gui {
WindowFactory::WindowFactory(App& app)
: _app(app)
@@ -298,5 +298,5 @@ WindowFactory::present_properties(SPtr<const ObjectModel> object)
_properties_win->present(object);
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index ea8b909b..a6ddb682 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -22,15 +22,15 @@
#include "ingen/Node.hpp"
#include "ingen/types.hpp"
-namespace Ingen {
+namespace ingen {
-namespace Client {
+namespace client {
class BlockModel;
class ObjectModel;
class GraphModel;
}
-namespace GUI {
+namespace gui {
class App;
class GraphBox;
@@ -55,21 +55,21 @@ public:
size_t num_open_graph_windows();
- GraphBox* graph_box(SPtr<const Client::GraphModel> graph);
- GraphWindow* graph_window(SPtr<const Client::GraphModel> graph);
- GraphWindow* parent_graph_window(SPtr<const Client::BlockModel> block);
+ GraphBox* graph_box(SPtr<const client::GraphModel> graph);
+ GraphWindow* graph_window(SPtr<const client::GraphModel> graph);
+ GraphWindow* parent_graph_window(SPtr<const client::BlockModel> block);
void present_graph(
- SPtr<const Client::GraphModel> graph,
+ SPtr<const client::GraphModel> graph,
GraphWindow* preferred = NULL,
SPtr<GraphView> view = SPtr<GraphView>());
- void present_load_plugin(SPtr<const Client::GraphModel> graph, Properties data=Properties());
- void present_load_graph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
- void present_load_subgraph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
- void present_new_subgraph(SPtr<const Client::GraphModel> graph, Properties data=Properties());
- void present_rename(SPtr<const Client::ObjectModel> object);
- void present_properties(SPtr<const Client::ObjectModel> object);
+ void present_load_plugin(SPtr<const client::GraphModel> graph, Properties data=Properties());
+ void present_load_graph(SPtr<const client::GraphModel> graph, Properties data=Properties());
+ void present_load_subgraph(SPtr<const client::GraphModel> graph, Properties data=Properties());
+ void present_new_subgraph(SPtr<const client::GraphModel> graph, Properties data=Properties());
+ void present_rename(SPtr<const client::ObjectModel> object);
+ void present_properties(SPtr<const client::ObjectModel> object);
bool remove_graph_window(GraphWindow* win, GdkEventAny* ignored = NULL);
@@ -80,7 +80,7 @@ public:
private:
typedef std::map<Raul::Path, GraphWindow*> GraphWindowMap;
- GraphWindow* new_graph_window(SPtr<const Client::GraphModel> graph,
+ GraphWindow* new_graph_window(SPtr<const client::GraphModel> graph,
SPtr<GraphView> view);
App& _app;
@@ -93,7 +93,7 @@ private:
RenameWindow* _rename_win;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_WINDOWFACTORY_HPP
diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp
index 677296fd..cf1fb88f 100644
--- a/src/gui/ingen_gui.cpp
+++ b/src/gui/ingen_gui.cpp
@@ -21,11 +21,11 @@
#include "App.hpp"
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
struct GUIModule : public Module {
- using SigClientInterface = Client::SigClientInterface;
+ using SigClientInterface = client::SigClientInterface;
void load(World* world) {
URI uri(world->conf().option("connect").ptr<char>());
@@ -37,7 +37,7 @@ struct GUIModule : public Module {
world->interface()->set_respondee(make_client(world));
}
- app = GUI::App::create(world);
+ app = gui::App::create(world);
}
void run(World* world) {
@@ -49,19 +49,19 @@ struct GUIModule : public Module {
return world->engine() ? sci : SPtr<Interface>(new QueuedInterface(sci));
}
- SPtr<GUI::App> app;
+ SPtr<gui::App> app;
};
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
extern "C" {
-Ingen::Module*
+ingen::Module*
ingen_module_load()
{
Glib::thread_init();
- return new Ingen::GUI::GUIModule();
+ return new ingen::gui::GUIModule();
}
} // extern "C"
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 75f67b03..56e07b44 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -31,7 +31,7 @@
#define INGEN_LV2_UI_URI INGEN_NS "GraphUIGtk2"
-namespace Ingen {
+namespace ingen {
/** A sink that writes atoms to a port via the UI extension. */
struct IngenLV2AtomSink : public AtomSink {
@@ -71,14 +71,14 @@ struct IngenLV2UI {
Forge* forge;
World* world;
IngenLV2AtomSink* sink;
- SPtr<GUI::App> app;
- SPtr<GUI::GraphBox> view;
+ SPtr<gui::App> app;
+ SPtr<gui::GraphBox> view;
SPtr<Interface> engine;
SPtr<AtomReader> reader;
- SPtr<Client::SigClientInterface> client;
+ SPtr<client::SigClientInterface> client;
};
-} // namespace Ingen
+} // namespace ingen
static LV2UI_Handle
instantiate(const LV2UI_Descriptor* descriptor,
@@ -90,12 +90,12 @@ instantiate(const LV2UI_Descriptor* descriptor,
const LV2_Feature* const* features)
{
#if __cplusplus >= 201103L
- using Ingen::SPtr;
+ using ingen::SPtr;
#endif
- Ingen::set_bundle_path(bundle_path);
+ ingen::set_bundle_path(bundle_path);
- Ingen::IngenLV2UI* ui = new Ingen::IngenLV2UI();
+ ingen::IngenLV2UI* ui = new ingen::IngenLV2UI();
LV2_URID_Map* map = nullptr;
LV2_URID_Unmap* unmap = nullptr;
@@ -110,8 +110,8 @@ instantiate(const LV2UI_Descriptor* descriptor,
}
}
- ui->world = new Ingen::World(map, unmap, log);
- ui->forge = new Ingen::Forge(ui->world->uri_map());
+ ui->world = new ingen::World(map, unmap, log);
+ ui->forge = new ingen::Forge(ui->world->uri_map());
ui->world->load_configuration(ui->argc, ui->argv);
@@ -120,45 +120,45 @@ instantiate(const LV2UI_Descriptor* descriptor,
return nullptr;
}
- ui->sink = new Ingen::IngenLV2AtomSink(
+ ui->sink = new ingen::IngenLV2AtomSink(
ui->world->uris(), write_function, controller);
// Set up an engine interface that writes LV2 atoms
- ui->engine = SPtr<Ingen::Interface>(
- new Ingen::AtomWriter(
+ ui->engine = SPtr<ingen::Interface>(
+ new ingen::AtomWriter(
ui->world->uri_map(), ui->world->uris(), *ui->sink));
ui->world->set_interface(ui->engine);
// Create App and client
- ui->app = Ingen::GUI::App::create(ui->world);
- ui->client = SPtr<Ingen::Client::SigClientInterface>(
- new Ingen::Client::SigClientInterface());
+ ui->app = ingen::gui::App::create(ui->world);
+ ui->client = SPtr<ingen::client::SigClientInterface>(
+ new ingen::client::SigClientInterface());
ui->app->set_is_plugin(true);
ui->app->attach(ui->client);
- ui->reader = SPtr<Ingen::AtomReader>(
- new Ingen::AtomReader(ui->world->uri_map(),
+ ui->reader = SPtr<ingen::AtomReader>(
+ new ingen::AtomReader(ui->world->uri_map(),
ui->world->uris(),
ui->world->log(),
*ui->client.get()));
// Create empty root graph model
- Ingen::Properties props;
+ ingen::Properties props;
props.emplace(ui->app->uris().rdf_type,
- Ingen::Property(ui->app->uris().ingen_Graph));
- ui->app->store()->put(Ingen::main_uri(), props);
+ ingen::Property(ui->app->uris().ingen_Graph));
+ ui->app->store()->put(ingen::main_uri(), props);
// Create a GraphBox for the root and set as the UI widget
- SPtr<const Ingen::Client::GraphModel> root =
- Ingen::dynamic_ptr_cast<const Ingen::Client::GraphModel>(
+ SPtr<const ingen::client::GraphModel> root =
+ ingen::dynamic_ptr_cast<const ingen::client::GraphModel>(
ui->app->store()->object(Raul::Path("/")));
- ui->view = Ingen::GUI::GraphBox::create(*ui->app, root);
+ ui->view = ingen::gui::GraphBox::create(*ui->app, root);
ui->view->unparent();
*widget = ui->view->gobj();
// Request the actual root graph
- ui->world->interface()->get(Ingen::main_uri());
+ ui->world->interface()->get(ingen::main_uri());
return ui;
}
@@ -166,7 +166,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
static void
cleanup(LV2UI_Handle handle)
{
- Ingen::IngenLV2UI* ui = (Ingen::IngenLV2UI*)handle;
+ ingen::IngenLV2UI* ui = (ingen::IngenLV2UI*)handle;
delete ui;
}
@@ -177,7 +177,7 @@ port_event(LV2UI_Handle handle,
uint32_t format,
const void* buffer)
{
- Ingen::IngenLV2UI* ui = (Ingen::IngenLV2UI*)handle;
+ ingen::IngenLV2UI* ui = (ingen::IngenLV2UI*)handle;
const LV2_Atom* atom = (const LV2_Atom*)buffer;
ui->reader->write(atom);
}
diff --git a/src/gui/rgba.hpp b/src/gui/rgba.hpp
index dae3f179..f31e958c 100644
--- a/src/gui/rgba.hpp
+++ b/src/gui/rgba.hpp
@@ -19,8 +19,8 @@
#include <cmath>
-namespace Ingen {
-namespace GUI {
+namespace ingen {
+namespace gui {
static inline uint32_t
rgba_to_uint(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
@@ -52,7 +52,7 @@ rgba_interpolate(uint32_t c1, uint32_t c2, float f)
mono_interpolate(RGBA_A(c1), RGBA_A(c2), f));
}
-} // namespace GUI
-} // namespace Ingen
+} // namespace gui
+} // namespace ingen
#endif // INGEN_GUI_RGBA_HPP
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp
index d812d862..bf18f0dd 100644
--- a/src/ingen/ingen.cpp
+++ b/src/ingen/ingen.cpp
@@ -40,7 +40,7 @@
#endif
using namespace std;
-using namespace Ingen;
+using namespace ingen;
class DummyInterface : public Interface
{
@@ -48,7 +48,7 @@ class DummyInterface : public Interface
void message(const Message& msg) override {}
};
-unique_ptr<Ingen::World> world;
+unique_ptr<ingen::World> world;
static void
ingen_interrupt(int signal)
@@ -88,11 +88,11 @@ print_version()
int
main(int argc, char** argv)
{
- Ingen::set_bundle_path_from_code((void*)&print_version);
+ ingen::set_bundle_path_from_code((void*)&print_version);
// Create world
try {
- world = unique_ptr<Ingen::World>(new Ingen::World(nullptr, NULL, NULL));
+ world = unique_ptr<ingen::World>(new ingen::World(nullptr, NULL, NULL));
world->load_configuration(argc, argv);
if (argc <= 1) {
world->conf().print_usage("ingen", cout);
@@ -127,7 +127,7 @@ main(int argc, char** argv)
}
#ifdef HAVE_SOCKET
- Client::SocketClient::register_factories(world.get());
+ client::SocketClient::register_factories(world.get());
#endif
// Load GUI if requested
diff --git a/src/runtime_paths.cpp b/src/runtime_paths.cpp
index 8dbe5c0c..15b83084 100644
--- a/src/runtime_paths.cpp
+++ b/src/runtime_paths.cpp
@@ -27,7 +27,7 @@
#include "ingen_config.h"
-namespace Ingen {
+namespace ingen {
static FilePath bundle_path;
@@ -143,4 +143,4 @@ system_config_dirs()
return paths;
}
-} // namespace Ingen
+} // namespace ingen
diff --git a/src/server/ArcImpl.cpp b/src/server/ArcImpl.cpp
index a4889890..b92f817d 100644
--- a/src/server/ArcImpl.cpp
+++ b/src/server/ArcImpl.cpp
@@ -26,8 +26,8 @@
#include "OutputPort.hpp"
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Constructor for an arc from a block's output port.
*
@@ -80,7 +80,7 @@ ArcImpl::must_mix() const
bool
ArcImpl::can_connect(const PortImpl* src, const InputPort* dst)
{
- const Ingen::URIs& uris = src->bufs().uris();
+ const ingen::URIs& uris = src->bufs().uris();
return (
// (Audio | Control | CV) => (Audio | Control | CV)
( (src->is_a(PortType::ID::CONTROL) ||
@@ -110,5 +110,5 @@ ArcImpl::can_connect(const PortImpl* src, const InputPort* dst)
|| (src->supports(uris.atom_Sound) && dst->is_a(PortType::ID::AUDIO)));
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/ArcImpl.hpp b/src/server/ArcImpl.hpp
index c907a424..e42571d0 100644
--- a/src/server/ArcImpl.hpp
+++ b/src/server/ArcImpl.hpp
@@ -28,8 +28,8 @@
#include "BufferRef.hpp"
#include "RunContext.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class PortImpl;
class InputPort;
@@ -78,7 +78,7 @@ protected:
PortImpl* const _head;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_ARC_IMPL_HPP
diff --git a/src/server/BlockFactory.cpp b/src/server/BlockFactory.cpp
index 7dcfd6af..de983df6 100644
--- a/src/server/BlockFactory.cpp
+++ b/src/server/BlockFactory.cpp
@@ -32,12 +32,12 @@
#include "LV2Plugin.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
-using namespace Internals;
+using namespace internals;
-BlockFactory::BlockFactory(Ingen::World* world)
+BlockFactory::BlockFactory(ingen::World* world)
: _world(world)
, _has_loaded(false)
{
@@ -109,7 +109,7 @@ BlockFactory::plugin(const URI& uri)
void
BlockFactory::load_internal_plugins()
{
- Ingen::URIs& uris = _world->uris();
+ ingen::URIs& uris = _world->uris();
InternalPlugin* block_delay_plug = BlockDelayNode::internal_plugin(uris);
_plugins.emplace(block_delay_plug->uri(), block_delay_plug);
@@ -225,5 +225,5 @@ BlockFactory::load_lv2_plugins()
_world->log().info(fmt("Loaded %1% plugins\n") % _plugins.size());
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp
index 25885f75..47309f69 100644
--- a/src/server/BlockFactory.hpp
+++ b/src/server/BlockFactory.hpp
@@ -24,8 +24,8 @@
#include "ingen/types.hpp"
#include "raul/Noncopyable.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class PluginImpl;
@@ -36,7 +36,7 @@ class PluginImpl;
class BlockFactory : public Raul::Noncopyable
{
public:
- explicit BlockFactory(Ingen::World* world);
+ explicit BlockFactory(ingen::World* world);
~BlockFactory();
/** Reload plugin list.
@@ -57,11 +57,11 @@ private:
void load_internal_plugins();
Plugins _plugins;
- Ingen::World* _world;
+ ingen::World* _world;
bool _has_loaded;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_BLOCKFACTORY_HPP
diff --git a/src/server/BlockImpl.cpp b/src/server/BlockImpl.cpp
index e95645f9..17462ab4 100644
--- a/src/server/BlockImpl.cpp
+++ b/src/server/BlockImpl.cpp
@@ -28,8 +28,8 @@
#include "RunContext.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
BlockImpl::BlockImpl(PluginImpl* plugin,
const Raul::Symbol& symbol,
@@ -299,5 +299,5 @@ BlockImpl::set_port_buffer(uint32_t voice,
<< " buffer " << buf << " offset " << offset << std::endl;*/
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp
index d663e319..fe20c1ec 100644
--- a/src/server/BlockImpl.hpp
+++ b/src/server/BlockImpl.hpp
@@ -37,8 +37,8 @@ namespace Raul {
class Maid;
}
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Buffer;
class BufferFactory;
@@ -201,7 +201,7 @@ protected:
bool _enabled;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_BLOCKIMPL_HPP
diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp
index 00fefddd..f8b58beb 100644
--- a/src/server/Broadcaster.cpp
+++ b/src/server/Broadcaster.cpp
@@ -22,8 +22,8 @@
#include "PluginImpl.hpp"
#include "BlockFactory.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
Broadcaster::Broadcaster()
: _must_broadcast(false)
@@ -93,5 +93,5 @@ Broadcaster::send_plugins_to(Interface* client,
client->bundle_end();
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 3981b265..1d5dd16e 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -28,8 +28,8 @@
#include "BlockFactory.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Broadcaster for all clients.
*
@@ -112,7 +112,7 @@ private:
SPtr<Interface> _ignore_client;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_BROADCASTER_HPP
diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index 023de393..eef594a3 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -37,8 +37,8 @@
#include "Engine.hpp"
#include "RunContext.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
Buffer::Buffer(BufferFactory& bufs,
LV2_URID type,
@@ -464,5 +464,5 @@ intrusive_ptr_release(Buffer* b)
b->deref();
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index 8d1f29ae..d9b4e7ad 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -30,8 +30,8 @@
#include "PortType.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BufferFactory;
class Engine;
@@ -238,7 +238,7 @@ private:
bool _external; ///< Buffer is externally allocated
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_BUFFER_HPP
diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index d5d947d0..c9eeed49 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -22,8 +22,8 @@
#include "BufferFactory.hpp"
#include "Engine.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
BufferFactory::BufferFactory(Engine& engine, URIs& uris)
: _free_audio(nullptr)
@@ -186,5 +186,5 @@ BufferFactory::recycle(Buffer* buf)
} while (!head_ptr.compare_exchange_weak(try_head, buf));
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 8265fc98..e8f05864 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -34,11 +34,11 @@
namespace Raul { class Maid; }
-namespace Ingen {
+namespace ingen {
class URIs;
-namespace Server {
+namespace server {
class Engine;
@@ -112,7 +112,7 @@ private:
BufferRef _silent_buffer;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_BUFFERFACTORY_HPP
diff --git a/src/server/BufferRef.hpp b/src/server/BufferRef.hpp
index 2a1cbc27..f3a2ef5c 100644
--- a/src/server/BufferRef.hpp
+++ b/src/server/BufferRef.hpp
@@ -21,8 +21,8 @@
#include "ingen/ingen.h"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Buffer;
@@ -32,7 +32,7 @@ typedef boost::intrusive_ptr<Buffer> BufferRef;
INGEN_API void intrusive_ptr_add_ref(Buffer* b);
INGEN_API void intrusive_ptr_release(Buffer* b);
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_BUFFER_REF_HPP
diff --git a/src/server/ClientUpdate.cpp b/src/server/ClientUpdate.cpp
index 60dd02e3..3273c399 100644
--- a/src/server/ClientUpdate.cpp
+++ b/src/server/ClientUpdate.cpp
@@ -23,8 +23,8 @@
#include "GraphImpl.hpp"
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
void
ClientUpdate::put(const URI& uri,
@@ -151,5 +151,5 @@ ClientUpdate::send(Interface& dest)
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/ClientUpdate.hpp b/src/server/ClientUpdate.hpp
index f1a361f7..514997a1 100644
--- a/src/server/ClientUpdate.hpp
+++ b/src/server/ClientUpdate.hpp
@@ -23,12 +23,12 @@
#include "ingen/Resource.hpp"
#include "raul/Path.hpp"
-namespace Ingen {
+namespace ingen {
class Interface;
class URIs;
-namespace Server {
+namespace server {
class PortImpl;
class BlockImpl;
@@ -74,7 +74,7 @@ struct ClientUpdate {
std::vector<Connect> connects;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_CLIENTUPDATE_HPP
diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp
index 35b07935..67752340 100644
--- a/src/server/CompiledGraph.cpp
+++ b/src/server/CompiledGraph.cpp
@@ -26,8 +26,8 @@
#include "GraphImpl.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Graph contains ambiguous feedback with no delay nodes. */
class FeedbackException : public std::exception {
@@ -270,5 +270,5 @@ CompiledGraph::dump(const std::string& name) const
sink(")\n");
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp
index 6b802611..664fea85 100644
--- a/src/server/CompiledGraph.hpp
+++ b/src/server/CompiledGraph.hpp
@@ -27,8 +27,8 @@
#include "Task.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class GraphImpl;
@@ -78,7 +78,7 @@ inline MPtr<CompiledGraph> compile(Raul::Maid& maid, GraphImpl& graph)
return CompiledGraph::compile(maid, graph);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_COMPILEDGRAPH_HPP
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 24503155..45df0e8f 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -30,8 +30,8 @@
#include "RunContext.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
ControlBindings::ControlBindings(Engine& engine)
: _engine(engine)
@@ -56,7 +56,7 @@ ControlBindings::Key
ControlBindings::port_binding(PortImpl* port) const
{
ThreadManager::assert_thread(THREAD_PRE_PROCESS);
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
const Atom& binding = port->get_property(uris.midi_binding);
return binding_key(binding);
}
@@ -64,7 +64,7 @@ ControlBindings::port_binding(PortImpl* port) const
ControlBindings::Key
ControlBindings::binding_key(const Atom& binding) const
{
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
Key key;
LV2_Atom* num = nullptr;
if (binding.type() == uris.atom_Object) {
@@ -145,8 +145,8 @@ ControlBindings::port_value_changed(RunContext& ctx,
Key key,
const Atom& value_atom)
{
- Ingen::World* world = ctx.engine().world();
- const Ingen::URIs& uris = world->uris();
+ ingen::World* world = ctx.engine().world();
+ const ingen::URIs& uris = world->uris();
if (!!key) {
int16_t value = port_value_to_control(
ctx, port, key.type, value_atom);
@@ -338,7 +338,7 @@ ControlBindings::set_port_value(RunContext& context,
bool
ControlBindings::finish_learn(RunContext& context, Key key)
{
- const Ingen::URIs& uris = context.engine().world()->uris();
+ const ingen::URIs& uris = context.engine().world()->uris();
Binding* binding = _learn_binding.exchange(nullptr);
if (!binding || (key.type == Type::MIDI_NOTE && !binding->port->is_toggled())) {
return false;
@@ -384,8 +384,8 @@ void
ControlBindings::pre_process(RunContext& ctx, Buffer* buffer)
{
uint16_t value = 0;
- Ingen::World* world = ctx.engine().world();
- const Ingen::URIs& uris = world->uris();
+ ingen::World* world = ctx.engine().world();
+ const ingen::URIs& uris = world->uris();
_feedback->clear();
if ((!_learn_binding && _bindings->empty()) || !buffer->get<LV2_Atom>()) {
@@ -421,5 +421,5 @@ ControlBindings::post_process(RunContext& context, Buffer* buffer)
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index ad5aa7bd..ea170f81 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -32,8 +32,8 @@
#include "BufferFactory.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
class RunContext;
@@ -142,7 +142,7 @@ private:
LV2_Atom_Forge _forge;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_CONTROLBINDINGS_HPP
diff --git a/src/server/DirectDriver.hpp b/src/server/DirectDriver.hpp
index 58b4f898..27ae322c 100644
--- a/src/server/DirectDriver.hpp
+++ b/src/server/DirectDriver.hpp
@@ -22,8 +22,8 @@
#include "Driver.hpp"
#include "Engine.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Driver for running Ingen directly as a library.
* \ingroup engine
@@ -102,7 +102,7 @@ private:
size_t _seq_size;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_DIRECT_DRIVER_HPP
diff --git a/src/server/Driver.hpp b/src/server/Driver.hpp
index 9ae4b836..dbb67bf3 100644
--- a/src/server/Driver.hpp
+++ b/src/server/Driver.hpp
@@ -24,8 +24,8 @@
namespace Raul { class Path; }
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class DuplexPort;
class EnginePort;
@@ -104,7 +104,7 @@ public:
virtual int real_time_priority() = 0;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_DRIVER_HPP
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index 1b62ff38..2823da05 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -22,8 +22,8 @@
#include "Engine.hpp"
#include "GraphImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
DuplexPort::DuplexPort(BufferFactory& bufs,
GraphImpl* parent,
@@ -232,5 +232,5 @@ DuplexPort::next_value_offset(SampleCount offset, SampleCount end) const
return PortImpl::next_value_offset(offset, end);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/DuplexPort.hpp b/src/server/DuplexPort.hpp
index b0066164..db97e7fb 100644
--- a/src/server/DuplexPort.hpp
+++ b/src/server/DuplexPort.hpp
@@ -22,8 +22,8 @@
#include "BufferRef.hpp"
#include "InputPort.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
@@ -92,7 +92,7 @@ public:
SampleCount next_value_offset(SampleCount offset, SampleCount end) const;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_DUPLEXPORT_HPP
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index dd87500e..b880abf7 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -58,13 +58,13 @@
#include "SocketListener.hpp"
#endif
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
INGEN_THREAD_LOCAL unsigned ThreadManager::flags(0);
bool ThreadManager::single_threaded(true);
-Engine::Engine(Ingen::World* world)
+Engine::Engine(ingen::World* world)
: _world(world)
, _options(new LV2Options(world->uris()))
, _buffer_factory(new BufferFactory(*this, world->uris()))
@@ -92,7 +92,7 @@ Engine::Engine(Ingen::World* world)
, _activated(false)
{
if (!world->store()) {
- world->set_store(SPtr<Ingen::Store>(new Store()));
+ world->set_store(SPtr<ingen::Store>(new Store()));
}
for (int i = 0; i < world->conf().option("threads").get<int32_t>(); ++i) {
@@ -167,7 +167,7 @@ Engine::~Engine()
store->clear();
}
- _world->set_store(SPtr<Ingen::Store>());
+ _world->set_store(SPtr<ingen::Store>());
}
void
@@ -310,7 +310,7 @@ Engine::quit()
Properties
Engine::load_properties() const
{
- const Ingen::URIs& uris = world()->uris();
+ const ingen::URIs& uris = world()->uris();
return { { uris.ingen_meanRunLoad,
uris.forge.make(floorf(_run_load.mean) / 100.0f) },
@@ -392,7 +392,7 @@ Engine::activate()
ThreadManager::single_threaded = true;
- const Ingen::URIs& uris = world()->uris();
+ const ingen::URIs& uris = world()->uris();
if (!_root_graph) {
// No root graph has been loaded, create an empty one
@@ -403,7 +403,7 @@ Engine::activate()
Resource::Graph::INTERNAL)}};
enqueue_event(
- new Events::CreateGraph(
+ new events::CreateGraph(
*this, SPtr<Interface>(), -1, 0, Raul::Path("/"), properties));
flush_events(std::chrono::milliseconds(10));
@@ -522,5 +522,5 @@ Engine::unregister_client(SPtr<Interface> client)
return _broadcaster->unregister_client(client);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp
index f5ba1feb..9a6534fc 100644
--- a/src/server/Engine.hpp
+++ b/src/server/Engine.hpp
@@ -36,7 +36,7 @@ class Maid;
class RingBuffer;
}
-namespace Ingen {
+namespace ingen {
class AtomReader;
class Interface;
@@ -44,7 +44,7 @@ class Log;
class Store;
class World;
-namespace Server {
+namespace server {
class BlockFactory;
class Broadcaster;
@@ -67,14 +67,14 @@ class Worker;
This is a simple class that provides pointers to the various components
that make up the engine implementation. In processes with a local engine,
- it can be accessed via the Ingen::World.
+ it can be accessed via the ingen::World.
@ingroup engine
*/
class INGEN_API Engine : public EngineBase
{
public:
- explicit Engine(Ingen::World* world);
+ explicit Engine(ingen::World* world);
virtual ~Engine();
Engine(const Engine&) = delete;
@@ -129,7 +129,7 @@ public:
/** Process all events (no RT limits). */
unsigned process_all_events();
- Ingen::World* world() const { return _world; }
+ ingen::World* world() const { return _world; }
Log& log() const;
const SPtr<Interface>& interface() const { return _interface; }
@@ -176,7 +176,7 @@ public:
Properties load_properties() const;
private:
- Ingen::World* _world;
+ ingen::World* _world;
SPtr<LV2Options> _options;
UPtr<BufferFactory> _buffer_factory;
@@ -215,7 +215,7 @@ private:
bool _activated;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_ENGINE_HPP
diff --git a/src/server/EnginePort.hpp b/src/server/EnginePort.hpp
index c14f363c..294bf45a 100644
--- a/src/server/EnginePort.hpp
+++ b/src/server/EnginePort.hpp
@@ -24,8 +24,8 @@
#include "DuplexPort.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** A "system" port (e.g. a Jack port, an external port on Ingen).
*
@@ -60,7 +60,7 @@ protected:
uint32_t _driver_index;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_ENGINE_PORT_HPP
diff --git a/src/server/Event.hpp b/src/server/Event.hpp
index d9095def..9cd97a35 100644
--- a/src/server/Event.hpp
+++ b/src/server/Event.hpp
@@ -30,8 +30,8 @@
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
class RunContext;
@@ -157,7 +157,7 @@ protected:
Mode _mode;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_EVENT_HPP
diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index ebdf7562..695be88e 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -22,8 +22,8 @@
#include "EventWriter.hpp"
#include "events.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
EventWriter::EventWriter(Engine& engine)
: _engine(engine)
@@ -46,56 +46,56 @@ EventWriter::message(const Message& msg)
void
EventWriter::operator()(const BundleBegin& msg)
{
- _engine.enqueue_event(new Events::Mark(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Mark(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const BundleEnd& msg)
{
- _engine.enqueue_event(new Events::Mark(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Mark(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Put& msg)
{
- _engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Delta(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Delta& msg)
{
- _engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Delta(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Copy& msg)
{
- _engine.enqueue_event(new Events::Copy(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Copy(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Move& msg)
{
- _engine.enqueue_event(new Events::Move(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Move(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Del& msg)
{
- _engine.enqueue_event(new Events::Delete(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Delete(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Connect& msg)
{
- _engine.enqueue_event(new Events::Connect(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Connect(_engine, _respondee, now(), msg),
_event_mode);
}
@@ -103,7 +103,7 @@ void
EventWriter::operator()(const Disconnect& msg)
{
_engine.enqueue_event(
- new Events::Disconnect(_engine, _respondee, now(), msg),
+ new events::Disconnect(_engine, _respondee, now(), msg),
_event_mode);
}
@@ -111,37 +111,37 @@ void
EventWriter::operator()(const DisconnectAll& msg)
{
_engine.enqueue_event(
- new Events::DisconnectAll(_engine, _respondee, now(), msg),
+ new events::DisconnectAll(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const SetProperty& msg)
{
- _engine.enqueue_event(new Events::Delta(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Delta(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Undo& msg)
{
- _engine.enqueue_event(new Events::Undo(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Undo(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Redo& msg)
{
- _engine.enqueue_event(new Events::Undo(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Undo(_engine, _respondee, now(), msg),
_event_mode);
}
void
EventWriter::operator()(const Get& msg)
{
- _engine.enqueue_event(new Events::Get(_engine, _respondee, now(), msg),
+ _engine.enqueue_event(new events::Get(_engine, _respondee, now(), msg),
_event_mode);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp
index 2d4b9724..aad15a76 100644
--- a/src/server/EventWriter.hpp
+++ b/src/server/EventWriter.hpp
@@ -27,8 +27,8 @@
#include "Event.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
@@ -80,7 +80,7 @@ private:
SampleCount now() const;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_EVENTWRITER_HPP
diff --git a/src/server/FrameTimer.hpp b/src/server/FrameTimer.hpp
index 367ac900..57acbaa5 100644
--- a/src/server/FrameTimer.hpp
+++ b/src/server/FrameTimer.hpp
@@ -21,8 +21,8 @@
#include <cmath>
#include <cstdint>
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Delay-locked loop for monotonic sample time.
*
@@ -104,7 +104,7 @@ private:
bool initialized;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_FRAMETIMER_HPP
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index f9c4cb54..ae9b8f6e 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -32,8 +32,8 @@
#include "PortImpl.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
GraphImpl::GraphImpl(Engine& engine,
const Raul::Symbol& symbol,
@@ -375,5 +375,5 @@ GraphImpl::build_ports_array(Raul::Maid& maid)
return result;
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp
index 3f11a84a..d0dd8b7d 100644
--- a/src/server/GraphImpl.hpp
+++ b/src/server/GraphImpl.hpp
@@ -28,11 +28,11 @@
#include "PortType.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
+namespace ingen {
class Arc;
-namespace Server {
+namespace server {
class ArcImpl;
class CompiledGraph;
@@ -194,7 +194,7 @@ private:
bool _process; ///< True iff graph is enabled
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_GRAPHIMPL_HPP
diff --git a/src/server/GraphPlugin.hpp b/src/server/GraphPlugin.hpp
index 308ed91a..ae59b986 100644
--- a/src/server/GraphPlugin.hpp
+++ b/src/server/GraphPlugin.hpp
@@ -20,8 +20,8 @@
#include <string>
#include "PluginImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
@@ -57,7 +57,7 @@ private:
const std::string _name;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_GRAPHPLUGIN_HPP
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index 2f22491f..a9ff1738 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -30,8 +30,8 @@
#include "RunContext.hpp"
#include "mix.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
InputPort::InputPort(BufferFactory& bufs,
BlockImpl* parent,
@@ -45,7 +45,7 @@ InputPort::InputPort(BufferFactory& bufs,
: PortImpl(bufs, parent, symbol, index, poly, type, buffer_type, value, buffer_size, false)
, _num_arcs(0)
{
- const Ingen::URIs& uris = bufs.uris();
+ const ingen::URIs& uris = bufs.uris();
if (parent->graph_type() != Node::GraphType::GRAPH) {
add_property(uris.rdf_type, uris.lv2_InputPort.urid);
@@ -257,5 +257,5 @@ InputPort::direct_connect() const
&& buffer(0)->type() != _bufs.uris().atom_Sequence;
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp
index 708f7ea2..92756b57 100644
--- a/src/server/InputPort.hpp
+++ b/src/server/InputPort.hpp
@@ -27,8 +27,8 @@
#include "ArcImpl.hpp"
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class ArcImpl;
class BlockImpl;
@@ -122,7 +122,7 @@ protected:
Arcs _arcs; ///< Audio thread
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_INPUTPORT_HPP
diff --git a/src/server/InternalBlock.cpp b/src/server/InternalBlock.cpp
index 3d8f7390..04cb32dc 100644
--- a/src/server/InternalBlock.cpp
+++ b/src/server/InternalBlock.cpp
@@ -20,8 +20,8 @@
#include "InternalPlugin.hpp"
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
InternalBlock::InternalBlock(PluginImpl* plugin,
const Raul::Symbol& symbol,
@@ -69,5 +69,5 @@ InternalBlock::pre_process(RunContext& context)
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/InternalBlock.hpp b/src/server/InternalBlock.hpp
index a57bd89f..5b3270c3 100644
--- a/src/server/InternalBlock.hpp
+++ b/src/server/InternalBlock.hpp
@@ -19,8 +19,8 @@
#include "BlockImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** An internal Block implemented inside Ingen.
*
@@ -42,7 +42,7 @@ public:
virtual void pre_process(RunContext& context);
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_BLOCKIMPL_HPP
diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp
index 6529b9c0..49590b24 100644
--- a/src/server/InternalPlugin.cpp
+++ b/src/server/InternalPlugin.cpp
@@ -24,10 +24,10 @@
#include "Engine.hpp"
#include "InternalPlugin.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
-using namespace Internals;
+using namespace internals;
InternalPlugin::InternalPlugin(URIs& uris,
const URI& uri,
@@ -63,5 +63,5 @@ InternalPlugin::instantiate(BufferFactory& bufs,
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp
index 79309beb..403db02e 100644
--- a/src/server/InternalPlugin.hpp
+++ b/src/server/InternalPlugin.hpp
@@ -23,8 +23,8 @@
#define NS_INTERNALS "http://drobilla.net/ns/ingen-internals#"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class BufferFactory;
@@ -51,7 +51,7 @@ private:
const Raul::Symbol _symbol;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_INTERNALPLUGIN_HPP
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 9e95b796..a331811e 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -49,8 +49,8 @@
typedef jack_default_audio_sample_t jack_sample_t;
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
JackDriver::JackDriver(Engine& engine)
: _engine(engine)
@@ -580,5 +580,5 @@ JackDriver::_session_cb(jack_session_event_t* event)
}
#endif
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index b2871fa6..fcda8edd 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -38,8 +38,8 @@
namespace Raul { class Path; }
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class DuplexPort;
class Engine;
@@ -163,7 +163,7 @@ protected:
bool _old_rolling;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_JACKAUDIODRIVER_HPP
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index 9ebf7dcf..c2b8e973 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -45,8 +45,8 @@
#include "RunContext.hpp"
#include "Worker.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Partially construct a LV2Block.
*
@@ -217,10 +217,10 @@ LV2Block::apply_poly(RunContext& context, uint32_t poly)
bool
LV2Block::instantiate(BufferFactory& bufs, const LilvState* state)
{
- const Ingen::URIs& uris = bufs.uris();
- Ingen::World* world = bufs.engine().world();
+ const ingen::URIs& uris = bufs.uris();
+ ingen::World* world = bufs.engine().world();
const LilvPlugin* plug = _lv2_plugin->lilv_plugin();
- Ingen::Forge& forge = bufs.forge();
+ ingen::Forge& forge = bufs.forge();
const uint32_t num_ports = lilv_plugin_get_num_ports(plug);
LilvNode* lv2_connectionOptional = lilv_new_uri(
@@ -738,5 +738,5 @@ LV2Block::set_port_buffer(uint32_t voice,
buf ? buf->port_data(_ports->at(port_num)->type(), offset) : nullptr);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index c9bbabf3..27287c5e 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -28,8 +28,8 @@
#include "ingen/LV2Features.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class LV2Plugin;
@@ -146,7 +146,7 @@ protected:
SPtr<LV2Features::FeatureArray> _features;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_LV2BLOCK_HPP
diff --git a/src/server/LV2Options.hpp b/src/server/LV2Options.hpp
index 75dbd41e..f5f18f3d 100644
--- a/src/server/LV2Options.hpp
+++ b/src/server/LV2Options.hpp
@@ -21,10 +21,10 @@
#include "ingen/URIs.hpp"
#include "lv2/options/options.h"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
-class LV2Options : public Ingen::LV2Features::Feature {
+class LV2Options : public ingen::LV2Features::Feature {
public:
explicit LV2Options(const URIs& uris)
: _uris(uris)
@@ -65,7 +65,7 @@ private:
int32_t _seq_size;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_LV2OPTIONS_HPP
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index bc10755a..4b97e9f1 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -26,8 +26,8 @@
#include "LV2Block.hpp"
#include "LV2Plugin.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
LV2Plugin::LV2Plugin(World* world, const LilvPlugin* lplugin)
: PluginImpl(world->uris(),
@@ -139,5 +139,5 @@ LV2Plugin::load_presets()
PluginImpl::load_presets();
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp
index 43d0fba9..9608b4e5 100644
--- a/src/server/LV2Plugin.hpp
+++ b/src/server/LV2Plugin.hpp
@@ -24,11 +24,11 @@
#include "PluginImpl.hpp"
-namespace Ingen {
+namespace ingen {
class World;
-namespace Server {
+namespace server {
class GraphImpl;
class BlockImpl;
@@ -66,7 +66,7 @@ private:
const LilvPlugin* _lilv_plugin;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_LV2PLUGIN_HPP
diff --git a/src/server/LV2ResizeFeature.hpp b/src/server/LV2ResizeFeature.hpp
index 8ef84896..4d7dd1f8 100644
--- a/src/server/LV2ResizeFeature.hpp
+++ b/src/server/LV2ResizeFeature.hpp
@@ -24,10 +24,10 @@
#include "Buffer.hpp"
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
-struct ResizeFeature : public Ingen::LV2Features::Feature {
+struct ResizeFeature : public ingen::LV2Features::Feature {
static LV2_Resize_Port_Status resize_port(
LV2_Resize_Port_Feature_Data data,
uint32_t index,
@@ -59,7 +59,7 @@ struct ResizeFeature : public Ingen::LV2Features::Feature {
}
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_LV2RESIZEFEATURE_HPP
diff --git a/src/server/Load.hpp b/src/server/Load.hpp
index ed9ee406..b94a8fed 100644
--- a/src/server/Load.hpp
+++ b/src/server/Load.hpp
@@ -17,8 +17,8 @@
#ifndef INGEN_ENGINE_LOAD_HPP
#define INGEN_ENGINE_LOAD_HPP
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
struct Load
{
@@ -51,7 +51,7 @@ struct Load
bool changed = false;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_LOAD_HPP
diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp
index 778ba15a..a28d7baf 100644
--- a/src/server/NodeImpl.cpp
+++ b/src/server/NodeImpl.cpp
@@ -18,10 +18,10 @@
#include "NodeImpl.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
-NodeImpl::NodeImpl(const Ingen::URIs& uris,
+NodeImpl::NodeImpl(const ingen::URIs& uris,
NodeImpl* parent,
const Raul::Symbol& symbol)
: Node(uris, parent ? parent->path().child(symbol) : Raul::Path("/"))
@@ -46,5 +46,5 @@ NodeImpl::parent_graph() const
return dynamic_cast<GraphImpl*>((BlockImpl*)_parent);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp
index 614801eb..9a9f1c95 100644
--- a/src/server/NodeImpl.hpp
+++ b/src/server/NodeImpl.hpp
@@ -28,11 +28,11 @@
namespace Raul { class Maid; }
-namespace Ingen {
+namespace ingen {
-namespace Shared { class URIs; }
+class URIs;
-namespace Server {
+namespace server {
class BufferFactory;
class GraphImpl;
@@ -94,7 +94,7 @@ public:
bool is_main() const { return !_parent; }
protected:
- NodeImpl(const Ingen::URIs& uris,
+ NodeImpl(const ingen::URIs& uris,
NodeImpl* parent,
const Raul::Symbol& symbol);
@@ -103,7 +103,7 @@ protected:
Raul::Symbol _symbol;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_NODEIMPL_HPP
diff --git a/src/server/OutputPort.hpp b/src/server/OutputPort.hpp
index 1058defb..0437c367 100644
--- a/src/server/OutputPort.hpp
+++ b/src/server/OutputPort.hpp
@@ -19,8 +19,8 @@
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** An output port.
*
@@ -45,7 +45,7 @@ public:
{}
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_OUTPUTPORT_HPP
diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp
index ebd4b3e5..fd1fcc66 100644
--- a/src/server/PluginImpl.hpp
+++ b/src/server/PluginImpl.hpp
@@ -22,11 +22,11 @@
#include "ingen/Resource.hpp"
#include "raul/Symbol.hpp"
-namespace Ingen {
+namespace ingen {
class URIs;
-namespace Server {
+namespace server {
class BlockImpl;
class BufferFactory;
@@ -40,7 +40,7 @@ class GraphImpl;
class PluginImpl : public Resource
{
public:
- PluginImpl(Ingen::URIs& uris, const Atom& type, const URI& uri)
+ PluginImpl(ingen::URIs& uris, const Atom& type, const URI& uri)
: Resource(uris, uri)
, _type(type)
, _presets_loaded(false)
@@ -90,7 +90,7 @@ private:
PluginImpl& operator=(const PluginImpl&) = delete;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_PLUGINIMPL_HPP
diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp
index 56be43e8..f67a62bb 100644
--- a/src/server/PortAudioDriver.cpp
+++ b/src/server/PortAudioDriver.cpp
@@ -38,8 +38,8 @@
#include "ThreadManager.hpp"
#include "util.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
static bool
pa_error(const char* msg, PaError err)
@@ -293,5 +293,5 @@ PortAudioDriver::process_cb(const void* inputs,
return 0;
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp
index 127fe5f3..21a81180 100644
--- a/src/server/PortAudioDriver.hpp
+++ b/src/server/PortAudioDriver.hpp
@@ -34,8 +34,8 @@
namespace Raul { class Path; }
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class DuplexPort;
class Engine;
@@ -126,7 +126,7 @@ protected:
bool _is_activated;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_PORTAUDIODRIVER_HPP
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 355774dd..f03939d3 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -28,8 +28,8 @@
#include "PortType.hpp"
#include "ThreadManager.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
static const uint32_t monitor_rate = 25.0; // Hz
@@ -79,7 +79,7 @@ PortImpl::PortImpl(BufferFactory& bufs,
assert(block != nullptr);
assert(_poly > 0);
- const Ingen::URIs& uris = bufs.uris();
+ const ingen::URIs& uris = bufs.uris();
set_type(type, buffer_type);
@@ -128,8 +128,8 @@ PortImpl::setup_buffers(RunContext& ctx, BufferFactory& bufs, uint32_t poly)
void
PortImpl::set_type(PortType port_type, LV2_URID buffer_type)
{
- const Ingen::URIs& uris = _bufs.uris();
- Ingen::World* world = _bufs.engine().world();
+ const ingen::URIs& uris = _bufs.uris();
+ ingen::World* world = _bufs.engine().world();
// Update type properties so clients are aware of current type
remove_property(uris.rdf_type, uris.lv2_AudioPort);
@@ -565,5 +565,5 @@ PortImpl::post_process(RunContext& context)
monitor(context);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp
index 70d90d0a..9afcca53 100644
--- a/src/server/PortImpl.hpp
+++ b/src/server/PortImpl.hpp
@@ -30,8 +30,8 @@
namespace Raul { class Maid; }
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class BufferFactory;
@@ -306,7 +306,7 @@ protected:
bool _is_output;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_PORTIMPL_HPP
diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp
index 710c5aa0..d5fd0238 100644
--- a/src/server/PortType.hpp
+++ b/src/server/PortType.hpp
@@ -22,7 +22,7 @@
#include "lv2/atom/atom.h"
#include "lv2/core/lv2.h"
-namespace Ingen {
+namespace ingen {
/** The type of a port.
*
@@ -86,6 +86,6 @@ private:
ID _id;
};
-} // namespace Ingen
+} // namespace ingen
#endif // INGEN_INTERFACE_PORTTYPE_HPP
diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp
index b275c36a..e644734b 100644
--- a/src/server/PostProcessor.cpp
+++ b/src/server/PostProcessor.cpp
@@ -21,8 +21,8 @@
#include "PostProcessor.hpp"
#include "RunContext.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Sentinel : public Event {
public:
@@ -110,5 +110,5 @@ PostProcessor::process()
_engine.emit_notifications(end_time);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/PostProcessor.hpp b/src/server/PostProcessor.hpp
index 5a3ffa62..affb343f 100644
--- a/src/server/PostProcessor.hpp
+++ b/src/server/PostProcessor.hpp
@@ -23,8 +23,8 @@
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
class Event;
@@ -68,7 +68,7 @@ private:
std::atomic<FrameTime> _max_time;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_POSTPROCESSOR_HPP
diff --git a/src/server/PreProcessContext.hpp b/src/server/PreProcessContext.hpp
index 1b57c013..1cfa1931 100644
--- a/src/server/PreProcessContext.hpp
+++ b/src/server/PreProcessContext.hpp
@@ -23,8 +23,8 @@
namespace Raul { class Maid; }
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Event pre-processing context.
*
@@ -78,7 +78,7 @@ private:
bool _in_bundle = false;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_PREPROCESSCONTEXT_HPP
diff --git a/src/server/PreProcessor.cpp b/src/server/PreProcessor.cpp
index f674284e..a9d9cf2d 100644
--- a/src/server/PreProcessor.cpp
+++ b/src/server/PreProcessor.cpp
@@ -30,8 +30,8 @@
#include "ThreadManager.hpp"
#include "UndoStack.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
PreProcessor::PreProcessor(Engine& engine)
: _engine(engine)
@@ -244,5 +244,5 @@ PreProcessor::run()
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp
index eb72328e..9ee20255 100644
--- a/src/server/PreProcessor.hpp
+++ b/src/server/PreProcessor.hpp
@@ -23,8 +23,8 @@
#include "raul/Semaphore.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
class Event;
@@ -81,7 +81,7 @@ private:
std::thread _thread;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_PREPROCESSOR_HPP
diff --git a/src/server/RunContext.cpp b/src/server/RunContext.cpp
index 3ab9d15c..ee272d46 100644
--- a/src/server/RunContext.cpp
+++ b/src/server/RunContext.cpp
@@ -25,8 +25,8 @@
#include "RunContext.hpp"
#include "Task.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
struct Notification
{
@@ -191,5 +191,5 @@ RunContext::run()
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp
index fe3ce850..78580fd7 100644
--- a/src/server/RunContext.hpp
+++ b/src/server/RunContext.hpp
@@ -25,8 +25,8 @@
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
class PortImpl;
@@ -155,7 +155,7 @@ protected:
bool _realtime; ///< True iff context is hard realtime
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_RUNCONTEXT_HPP
diff --git a/src/server/SocketListener.cpp b/src/server/SocketListener.cpp
index a6faa863..9a0ce346 100644
--- a/src/server/SocketListener.cpp
+++ b/src/server/SocketListener.cpp
@@ -36,8 +36,8 @@
#include "SocketListener.hpp"
#include "SocketServer.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
static constexpr const char* const unix_scheme = "unix://";
@@ -82,7 +82,7 @@ SocketListener::~SocketListener() {
static void
ingen_listen(Engine* engine, Raul::Socket* unix_sock, Raul::Socket* net_sock)
{
- Ingen::World* world = engine->world();
+ ingen::World* world = engine->world();
const std::string link_path(world->conf().option("socket").ptr<char>());
const std::string unix_path(link_path + "." + std::to_string(getpid()));
@@ -186,5 +186,5 @@ ingen_listen(Engine* engine, Raul::Socket* unix_sock, Raul::Socket* net_sock)
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/SocketListener.hpp b/src/server/SocketListener.hpp
index e74629ad..b3b5931e 100644
--- a/src/server/SocketListener.hpp
+++ b/src/server/SocketListener.hpp
@@ -19,8 +19,8 @@
#include "raul/Socket.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
@@ -37,5 +37,5 @@ private:
std::unique_ptr<std::thread> thread;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/SocketServer.hpp b/src/server/SocketServer.hpp
index dbeb76ea..bd285e6e 100644
--- a/src/server/SocketServer.hpp
+++ b/src/server/SocketServer.hpp
@@ -25,15 +25,15 @@
#include "EventWriter.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** The server side of an Ingen socket connection. */
class SocketServer
{
public:
SocketServer(World& world,
- Server::Engine& engine,
+ server::Engine& engine,
SPtr<Raul::Socket> sock)
: _engine(engine)
, _sink(world.conf().option("dump").get<int32_t>()
@@ -68,13 +68,13 @@ protected:
}
private:
- Server::Engine& _engine;
+ server::Engine& _engine;
SPtr<Interface> _sink;
SPtr<SocketReader> _reader;
SPtr<SocketWriter> _writer;
};
-} // namespace Ingen
+} // namespace ingen
} // namespace Socket
#endif // INGEN_SERVER_SOCKET_SERVER_HPP
diff --git a/src/server/Task.cpp b/src/server/Task.cpp
index d2cb2683..63f3ef34 100644
--- a/src/server/Task.cpp
+++ b/src/server/Task.cpp
@@ -17,8 +17,8 @@
#include "BlockImpl.hpp"
#include "Task.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
void
Task::run(RunContext& context)
@@ -154,5 +154,5 @@ Task::dump(std::function<void (const std::string&)> sink, unsigned indent, bool
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/Task.hpp b/src/server/Task.hpp
index 2cdad71b..97a6101c 100644
--- a/src/server/Task.hpp
+++ b/src/server/Task.hpp
@@ -24,8 +24,8 @@
#include <memory>
#include <ostream>
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class RunContext;
@@ -114,7 +114,7 @@ private:
std::atomic<bool> _done; ///< Completion phase
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_TASK_HPP
diff --git a/src/server/ThreadManager.hpp b/src/server/ThreadManager.hpp
index 3bcedf30..bf14a423 100644
--- a/src/server/ThreadManager.hpp
+++ b/src/server/ThreadManager.hpp
@@ -23,8 +23,8 @@
#include "util.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
enum ThreadFlag {
THREAD_IS_REAL_TIME = 1,
@@ -62,7 +62,7 @@ public:
static INGEN_THREAD_LOCAL unsigned flags;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_THREADMANAGER_HPP
diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp
index 289770c0..77b4706f 100644
--- a/src/server/UndoStack.cpp
+++ b/src/server/UndoStack.cpp
@@ -29,8 +29,8 @@
#define USTR(s) ((const uint8_t*)(s))
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
int
UndoStack::start_entry()
@@ -249,5 +249,5 @@ UndoStack::save(FILE* stream, const char* name)
serd_writer_free(writer);
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp
index 4ca8a5b8..8ebd1482 100644
--- a/src/server/UndoStack.hpp
+++ b/src/server/UndoStack.hpp
@@ -26,12 +26,12 @@
#include "serd/serd.h"
#include "sratom/sratom.h"
-namespace Ingen {
+namespace ingen {
class URIMap;
class URIs;
-namespace Server {
+namespace server {
class INGEN_API UndoStack : public AtomSink {
public:
@@ -101,7 +101,7 @@ private:
int _depth;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_UNDOSTACK_HPP
diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp
index de1fc629..59ef306f 100644
--- a/src/server/Worker.cpp
+++ b/src/server/Worker.cpp
@@ -23,8 +23,8 @@
#include "LV2Block.hpp"
#include "Worker.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/// A message in the Worker::_requests ring
struct MessageHeader {
@@ -159,5 +159,5 @@ Worker::run()
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/Worker.hpp b/src/server/Worker.hpp
index 11cc2cd1..063570ca 100644
--- a/src/server/Worker.hpp
+++ b/src/server/Worker.hpp
@@ -24,11 +24,11 @@
#include "raul/RingBuffer.hpp"
#include "raul/Semaphore.hpp"
-namespace Ingen {
+namespace ingen {
class Log;
-namespace Server {
+namespace server {
class LV2Block;
@@ -70,7 +70,7 @@ private:
void run();
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_WORKER_HPP
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index 8937b327..99a90a49 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -30,14 +30,14 @@
#include "internals/BlockDelay.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Connect::Connect(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Connect& msg)
+ const ingen::Connect& msg)
: Event(engine, client, msg.seq, timestamp)
, _msg(msg)
, _graph(nullptr)
@@ -113,7 +113,7 @@ Connect::pre_process(PreProcessContext& ctx)
// The tail block is now a dependency (provider) of the head block
head_block->providers().insert(tail_block);
- if (!dynamic_cast<Internals::BlockDelayNode*>(tail_block)) {
+ if (!dynamic_cast<internals::BlockDelayNode*>(tail_block)) {
/* Arcs leaving a delay node are ignored for the purposes of
compilation, since the output is from the previous cycle and
does not affect execution order. Otherwise, the head block is
@@ -183,6 +183,6 @@ Connect::undo(Interface& target)
target.disconnect(_msg.tail, _msg.head);
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp
index 8a42b984..b4894875 100644
--- a/src/server/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -28,14 +28,14 @@ namespace Raul {
template <typename T> class Array;
}
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class ArcImpl;
class GraphImpl;
class InputPort;
-namespace Events {
+namespace events {
/** Make an Arc between two Ports.
*
@@ -47,7 +47,7 @@ public:
Connect(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Connect& msg);
+ const ingen::Connect& msg);
bool pre_process(PreProcessContext& ctx);
void execute(RunContext& context);
@@ -55,7 +55,7 @@ public:
void undo(Interface& target);
private:
- const Ingen::Connect _msg;
+ const ingen::Connect _msg;
GraphImpl* _graph;
InputPort* _head;
MPtr<CompiledGraph> _compiled_graph;
@@ -67,8 +67,8 @@ private:
Properties _head_add;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_CONNECT_HPP
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index fc9d40f7..5d2d511c 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -27,14 +27,14 @@
#include "PreProcessContext.hpp"
#include "events/Copy.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Copy::Copy(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Copy& msg)
+ const ingen::Copy& msg)
: Event(engine, client, msg.seq, timestamp)
, _msg(msg)
, _old_block(nullptr)
@@ -211,6 +211,6 @@ Copy::undo(Interface& target)
}
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp
index 5216b56e..bd52baf2 100644
--- a/src/server/events/Copy.hpp
+++ b/src/server/events/Copy.hpp
@@ -25,13 +25,13 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class GraphImpl;
-namespace Events {
+namespace events {
/** Copy a graph object to a new path.
* \ingroup engine
@@ -42,7 +42,7 @@ public:
Copy(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Copy& msg);
+ const ingen::Copy& msg);
bool pre_process(PreProcessContext& ctx);
void execute(RunContext& context);
@@ -54,15 +54,15 @@ private:
bool engine_to_filesystem(PreProcessContext& ctx);
bool filesystem_to_engine(PreProcessContext& ctx);
- const Ingen::Copy _msg;
+ const ingen::Copy _msg;
SPtr<BlockImpl> _old_block;
GraphImpl* _parent;
BlockImpl* _block;
MPtr<CompiledGraph> _compiled_graph;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_COPY_HPP
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index d678bea3..fabdbd85 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -31,9 +31,9 @@
#include "PreProcessContext.hpp"
#include "LV2Block.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
CreateBlock::CreateBlock(Engine& engine,
SPtr<Interface> client,
@@ -53,7 +53,7 @@ CreateBlock::pre_process(PreProcessContext& ctx)
{
typedef Properties::const_iterator iterator;
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
const SPtr<Store> store = _engine.store();
// Check sanity of target path
@@ -175,6 +175,6 @@ CreateBlock::undo(Interface& target)
target.del(_block->uri());
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp
index 0a29e68c..35707f0d 100644
--- a/src/server/events/CreateBlock.hpp
+++ b/src/server/events/CreateBlock.hpp
@@ -23,13 +23,13 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class GraphImpl;
-namespace Events {
+namespace events {
/** An event to load a Block and insert it into a Graph.
*
@@ -59,8 +59,8 @@ private:
MPtr<CompiledGraph> _compiled_graph;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_CREATEBLOCK_HPP
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 390fdd9a..27781cbc 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -27,9 +27,9 @@
#include "events/CreateGraph.hpp"
#include "events/CreatePort.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
CreateGraph::CreateGraph(Engine& engine,
SPtr<Interface> client,
@@ -54,7 +54,7 @@ CreateGraph::~CreateGraph()
void
CreateGraph::build_child_events()
{
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
// Properties common to both ports
Properties control_properties;
@@ -76,7 +76,7 @@ CreateGraph::build_child_events()
Resource::Graph::EXTERNAL);
_child_events.push_back(
- new Events::CreatePort(
+ new events::CreatePort(
_engine, _request_client, -1, _time,
_path.child(Raul::Symbol("control")),
in_properties));
@@ -92,7 +92,7 @@ CreateGraph::build_child_events()
Resource::Graph::EXTERNAL);
_child_events.push_back(
- new Events::CreatePort(_engine, _request_client, -1, _time,
+ new events::CreatePort(_engine, _request_client, -1, _time,
_path.child(Raul::Symbol("notify")),
out_properties));
}
@@ -111,7 +111,7 @@ CreateGraph::pre_process(PreProcessContext& ctx)
}
}
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
typedef Properties::const_iterator iterator;
@@ -231,6 +231,6 @@ CreateGraph::undo(Interface& target)
target.del(_graph->uri());
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index 564d553b..3658d359 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -25,12 +25,12 @@
#include "Event.hpp"
#include "events/Get.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class GraphImpl;
-namespace Events {
+namespace events {
/** Creates a new Graph.
*
@@ -67,8 +67,8 @@ private:
std::list<Event*> _child_events;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_CREATEGRAPH_HPP
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index e17b8b01..a79c85ef 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -32,9 +32,9 @@
#include "GraphImpl.hpp"
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
CreatePort::CreatePort(Engine& engine,
SPtr<Interface> client,
@@ -51,7 +51,7 @@ CreatePort::CreatePort(Engine& engine,
, _engine_port(nullptr)
, _properties(properties)
{
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
typedef Properties::const_iterator Iterator;
typedef std::pair<Iterator, Iterator> Range;
@@ -214,6 +214,6 @@ CreatePort::undo(Interface& target)
target.del(_graph_port->uri());
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index a98ea393..13402087 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -28,15 +28,15 @@
#include "Event.hpp"
#include "PortType.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class DuplexPort;
class EnginePort;
class GraphImpl;
class PortImpl;
-namespace Events {
+namespace events {
/** An event to add a Port to a Graph.
*
@@ -75,8 +75,8 @@ private:
boost::optional<Flow> _flow;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_CREATEPORT_HPP
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index e8f9582c..ff9f32b4 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -31,14 +31,14 @@
#include "PortImpl.hpp"
#include "PreProcessContext.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Delete::Delete(Engine& engine,
SPtr<Interface> client,
FrameTime timestamp,
- const Ingen::Del& msg)
+ const ingen::Del& msg)
: Event(engine, client, msg.seq, timestamp)
, _msg(msg)
, _engine_port(nullptr)
@@ -60,7 +60,7 @@ Delete::~Delete()
bool
Delete::pre_process(PreProcessContext& ctx)
{
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
if (_path.is_root() || _path == "/control" || _path == "/notify") {
return Event::pre_process_done(Status::NOT_DELETABLE, _path);
}
@@ -187,8 +187,8 @@ Delete::post_process()
void
Delete::undo(Interface& target)
{
- const Ingen::URIs& uris = _engine.world()->uris();
- Ingen::Forge& forge = _engine.buffer_factory()->forge();
+ const ingen::URIs& uris = _engine.world()->uris();
+ ingen::Forge& forge = _engine.buffer_factory()->forge();
auto i = _removed_objects.find(_path);
if (i != _removed_objects.end()) {
@@ -211,6 +211,6 @@ Delete::undo(Interface& target)
}
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index 8b2a0a91..5d00c5ea 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -31,15 +31,15 @@ namespace Raul {
template<typename T> class Array;
}
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class DuplexPort;
class EnginePort;
class PortImpl;
-namespace Events {
+namespace events {
class DisconnectAll;
@@ -52,7 +52,7 @@ public:
Delete(Engine& engine,
SPtr<Interface> client,
FrameTime timestamp,
- const Ingen::Del& msg);
+ const ingen::Del& msg);
~Delete();
@@ -65,7 +65,7 @@ private:
using IndexChange = std::pair<uint32_t, uint32_t>;
using IndexChanges = std::map<Raul::Path, IndexChange>;
- const Ingen::Del _msg;
+ const ingen::Del _msg;
Raul::Path _path;
SPtr<BlockImpl> _block; ///< Non-NULL iff a block
SPtr<DuplexPort> _port; ///< Non-NULL iff a port
@@ -79,8 +79,8 @@ private:
std::vector<ControlBindings::Binding*> _removed_bindings;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_DELETE_HPP
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index b23ae884..7404aea6 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -36,14 +36,14 @@
#include "SetPortValue.hpp"
#include "events/Get.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Delta::Delta(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Put& msg)
+ const ingen::Put& msg)
: Event(engine, client, msg.seq, timestamp)
, _create_event(nullptr)
, _subject(msg.uri)
@@ -62,7 +62,7 @@ Delta::Delta(Engine& engine,
Delta::Delta(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Delta& msg)
+ const ingen::Delta& msg)
: Event(engine, client, msg.seq, timestamp)
, _create_event(nullptr)
, _subject(msg.uri)
@@ -82,7 +82,7 @@ Delta::Delta(Engine& engine,
Delta::Delta(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::SetProperty& msg)
+ const ingen::SetProperty& msg)
: Event(engine, client, msg.seq, timestamp)
, _create_event(nullptr)
, _subject(msg.subject)
@@ -117,7 +117,7 @@ Delta::init()
}
// Set atomic execution if polyphony is to be changed
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
if (_properties.count(uris.ingen_polyphonic) ||
_properties.count(uris.ingen_polyphony)) {
_block = true;
@@ -171,7 +171,7 @@ get_file_node(LilvWorld* lworld, const URIs& uris, const Atom& value)
bool
Delta::pre_process(PreProcessContext& ctx)
{
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
const bool is_graph_object = uri_is_path(_subject);
const bool is_client = (_subject == "ingen:/clients/this");
@@ -218,8 +218,8 @@ Delta::pre_process(PreProcessContext& ctx)
std::lock_guard<Store::Mutex> lock(_engine.store()->mutex());
_object = is_graph_object
- ? static_cast<Ingen::Resource*>(_engine.store()->get(uri_to_path(_subject)))
- : static_cast<Ingen::Resource*>(_engine.block_factory()->plugin(_subject));
+ ? static_cast<ingen::Resource*>(_engine.store()->get(uri_to_path(_subject)))
+ : static_cast<ingen::Resource*>(_engine.block_factory()->plugin(_subject));
if (!_object && !is_client && !is_engine &&
(!is_graph_object || _type != Type::PUT)) {
@@ -229,7 +229,7 @@ Delta::pre_process(PreProcessContext& ctx)
if (is_graph_object && !_object) {
Raul::Path path(uri_to_path(_subject));
bool is_graph = false, is_block = false, is_port = false, is_output = false;
- Ingen::Resource::type(uris, _properties, is_graph, is_block, is_port, is_output);
+ ingen::Resource::type(uris, _properties, is_graph, is_block, is_port, is_output);
if (is_graph) {
_create_event = new CreateGraph(
@@ -481,7 +481,7 @@ Delta::execute(RunContext& context)
return;
}
- const Ingen::URIs& uris = _engine.world()->uris();
+ const ingen::URIs& uris = _engine.world()->uris();
if (_create_event) {
_create_event->set_time(_time);
@@ -665,6 +665,6 @@ Delta::get_execution() const
return _block ? Execution::ATOMIC : Execution::NORMAL;
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index af337b57..b3bb0537 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -28,17 +28,17 @@
#include "Event.hpp"
#include "PluginImpl.hpp"
-namespace Ingen {
+namespace ingen {
class Resource;
-namespace Server {
+namespace server {
class Engine;
class GraphImpl;
class RunContext;
-namespace Events {
+namespace events {
class SetPortValue;
@@ -51,17 +51,17 @@ public:
Delta(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Put& msg);
+ const ingen::Put& msg);
Delta(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Delta& msg);
+ const ingen::Delta& msg);
Delta(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::SetProperty& msg);
+ const ingen::SetProperty& msg);
~Delta();
@@ -108,7 +108,7 @@ private:
Properties _properties;
Properties _remove;
ClientUpdate _update;
- Ingen::Resource* _object;
+ ingen::Resource* _object;
GraphImpl* _graph;
MPtr<CompiledGraph> _compiled_graph;
ControlBindings::Binding* _binding;
@@ -126,8 +126,8 @@ private:
bool _block;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_DELTA_HPP
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 4553c8a2..e803ce3d 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -33,14 +33,14 @@
#include "ThreadManager.hpp"
#include "events/Disconnect.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Disconnect::Disconnect(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Disconnect& msg)
+ const ingen::Disconnect& msg)
: Event(engine, client, msg.seq, timestamp)
, _msg(msg)
, _graph(nullptr)
@@ -219,6 +219,6 @@ Disconnect::undo(Interface& target)
target.connect(_msg.tail, _msg.head);
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index 44290d7c..7649d9e4 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -29,13 +29,13 @@ namespace Raul {
template <typename T> class Array;
}
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class InputPort;
class PortImpl;
-namespace Events {
+namespace events {
/** Remove an Arc between two Ports.
*
@@ -47,7 +47,7 @@ public:
Disconnect(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Disconnect& msg);
+ const ingen::Disconnect& msg);
~Disconnect();
@@ -74,14 +74,14 @@ public:
};
private:
- const Ingen::Disconnect _msg;
+ const ingen::Disconnect _msg;
GraphImpl* _graph;
Impl* _impl;
MPtr<CompiledGraph> _compiled_graph;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_DISCONNECT_HPP
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 11311d12..e21fad4d 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -33,14 +33,14 @@
#include "events/DisconnectAll.hpp"
#include "util.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
DisconnectAll::DisconnectAll(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::DisconnectAll& msg)
+ const ingen::DisconnectAll& msg)
: Event(engine, client, msg.seq, timestamp)
, _msg(msg)
, _parent(nullptr)
@@ -171,6 +171,6 @@ DisconnectAll::undo(Interface& target)
}
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index 947e538f..aaebf872 100644
--- a/src/server/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -25,14 +25,14 @@
#include "Disconnect.hpp"
#include "Event.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class GraphImpl;
class PortImpl;
-namespace Events {
+namespace events {
class Disconnect;
@@ -46,7 +46,7 @@ public:
DisconnectAll(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::DisconnectAll& msg);
+ const ingen::DisconnectAll& msg);
DisconnectAll(Engine& engine,
GraphImpl* parent,
@@ -62,7 +62,7 @@ public:
private:
typedef std::list<Disconnect::Impl*> Impls;
- const Ingen::DisconnectAll _msg;
+ const ingen::DisconnectAll _msg;
GraphImpl* _parent;
BlockImpl* _block;
PortImpl* _port;
@@ -71,8 +71,8 @@ private:
bool _deleting;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_DISCONNECTALL_HPP
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index e53e8c41..ad412beb 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -29,14 +29,14 @@
#include "PluginImpl.hpp"
#include "PortImpl.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Get::Get(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Get& msg)
+ const ingen::Get& msg)
: Event(engine, client, msg.seq, timestamp)
, _msg(msg)
, _object(nullptr)
@@ -106,6 +106,6 @@ Get::post_process()
}
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp
index 7392550f..0cfbfe43 100644
--- a/src/server/events/Get.hpp
+++ b/src/server/events/Get.hpp
@@ -24,15 +24,15 @@
#include "Event.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class BlockImpl;
class GraphImpl;
class PluginImpl;
class PortImpl;
-namespace Events {
+namespace events {
/** A request from a client to send an object.
*
@@ -44,22 +44,22 @@ public:
Get(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Get& msg);
+ const ingen::Get& msg);
bool pre_process(PreProcessContext& ctx);
void execute(RunContext& context) {}
void post_process();
private:
- const Ingen::Get _msg;
+ const ingen::Get _msg;
const Node* _object;
PluginImpl* _plugin;
BlockFactory::Plugins _plugins;
ClientUpdate _response;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_GET_HPP
diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp
index 3c0dfaaf..be943533 100644
--- a/src/server/events/Mark.cpp
+++ b/src/server/events/Mark.cpp
@@ -19,14 +19,14 @@
#include "UndoStack.hpp"
#include "events/Mark.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Mark::Mark(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::BundleBegin& msg)
+ const ingen::BundleBegin& msg)
: Event(engine, client, msg.seq, timestamp)
, _type(Type::BUNDLE_BEGIN)
, _depth(0)
@@ -35,7 +35,7 @@ Mark::Mark(Engine& engine,
Mark::Mark(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::BundleEnd& msg)
+ const ingen::BundleEnd& msg)
: Event(engine, client, msg.seq, timestamp)
, _type(Type::BUNDLE_END)
, _depth(0)
@@ -107,6 +107,6 @@ Mark::get_execution() const
return Execution::NORMAL;
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp
index eaeb9332..1d8bffdc 100644
--- a/src/server/events/Mark.hpp
+++ b/src/server/events/Mark.hpp
@@ -19,12 +19,12 @@
#include "Event.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class Engine;
-namespace Events {
+namespace events {
/** Delineate the start or end of a bundle of events.
*
@@ -39,12 +39,12 @@ public:
Mark(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::BundleBegin& msg);
+ const ingen::BundleBegin& msg);
Mark(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::BundleEnd& msg);
+ const ingen::BundleEnd& msg);
bool pre_process(PreProcessContext& ctx);
void execute(RunContext& context);
@@ -62,8 +62,8 @@ private:
int _depth;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_MARK_HPP
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp
index b0935675..1890dc5f 100644
--- a/src/server/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -25,14 +25,14 @@
#include "GraphImpl.hpp"
#include "events/Move.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Move::Move(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Move& msg)
+ const ingen::Move& msg)
: Event(engine, client, msg.seq, timestamp)
, _msg(msg)
{
@@ -86,6 +86,6 @@ Move::undo(Interface& target)
target.move(_msg.new_path, _msg.old_path);
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp
index 459d2709..455a84d4 100644
--- a/src/server/events/Move.hpp
+++ b/src/server/events/Move.hpp
@@ -22,13 +22,13 @@
#include "Event.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class GraphImpl;
class PortImpl;
-namespace Events {
+namespace events {
/** Move a graph object to a new path.
* \ingroup engine
@@ -39,7 +39,7 @@ public:
Move(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Move& msg);
+ const ingen::Move& msg);
bool pre_process(PreProcessContext& ctx);
void execute(RunContext& context);
@@ -47,11 +47,11 @@ public:
void undo(Interface& target);
private:
- const Ingen::Move _msg;
+ const ingen::Move _msg;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_MOVE_HPP
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 62f2def6..fa36d739 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -28,9 +28,9 @@
#include "RunContext.hpp"
#include "SetPortValue.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
/** Internal */
SetPortValue::SetPortValue(Engine& engine,
@@ -52,7 +52,7 @@ SetPortValue::SetPortValue(Engine& engine,
bool
SetPortValue::pre_process(PreProcessContext& ctx)
{
- Ingen::URIs& uris = _engine.world()->uris();
+ ingen::URIs& uris = _engine.world()->uris();
if (_port->is_output()) {
return Event::pre_process_done(Status::DIRECTION_MISMATCH, _port->path());
}
@@ -90,7 +90,7 @@ SetPortValue::apply(RunContext& context)
return;
}
- Ingen::URIs& uris = _engine.world()->uris();
+ ingen::URIs& uris = _engine.world()->uris();
Buffer* buf = _port->buffer(0).get();
if (_buffer) {
@@ -134,6 +134,6 @@ SetPortValue::post_process()
}
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp
index 4df60019..01bad6a8 100644
--- a/src/server/events/SetPortValue.hpp
+++ b/src/server/events/SetPortValue.hpp
@@ -24,12 +24,12 @@
#include "Event.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class PortImpl;
-namespace Events {
+namespace events {
/** An event to change the value of a port.
*
@@ -64,8 +64,8 @@ private:
bool _synthetic;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_SETPORTVALUE_HPP
diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp
index e06a5951..0c307e85 100644
--- a/src/server/events/Undo.cpp
+++ b/src/server/events/Undo.cpp
@@ -20,14 +20,14 @@
#include "EventWriter.hpp"
#include "Undo.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
Undo::Undo(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Undo& msg)
+ const ingen::Undo& msg)
: Event(engine, client, msg.seq, timestamp)
, _is_redo(false)
{}
@@ -35,7 +35,7 @@ Undo::Undo(Engine& engine,
Undo::Undo(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Redo& msg)
+ const ingen::Redo& msg)
: Event(engine, client, msg.seq, timestamp)
, _is_redo(true)
{}
@@ -80,6 +80,6 @@ Undo::post_process()
respond();
}
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
diff --git a/src/server/events/Undo.hpp b/src/server/events/Undo.hpp
index af4b0d65..4e09c7f3 100644
--- a/src/server/events/Undo.hpp
+++ b/src/server/events/Undo.hpp
@@ -21,9 +21,9 @@
#include "UndoStack.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
-namespace Events {
+namespace ingen {
+namespace server {
+namespace events {
/** A request to undo the last change to the engine.
*
@@ -35,12 +35,12 @@ public:
Undo(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Undo& msg);
+ const ingen::Undo& msg);
Undo(Engine& engine,
SPtr<Interface> client,
SampleCount timestamp,
- const Ingen::Redo& msg);
+ const ingen::Redo& msg);
bool pre_process(PreProcessContext& ctx);
void execute(RunContext& context);
@@ -51,8 +51,8 @@ private:
bool _is_redo;
};
-} // namespace Events
-} // namespace Server
-} // namespace Ingen
+} // namespace events
+} // namespace server
+} // namespace ingen
#endif // INGEN_EVENTS_UNDO_HPP
diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp
index 3409f1bf..15391437 100644
--- a/src/server/ingen_engine.cpp
+++ b/src/server/ingen_engine.cpp
@@ -20,12 +20,12 @@
#include "EventWriter.hpp"
#include "util.hpp"
-using namespace Ingen;
+using namespace ingen;
-struct IngenEngineModule : public Ingen::Module {
- virtual void load(Ingen::World* world) {
- Server::set_denormal_flags(world->log());
- SPtr<Server::Engine> engine(new Server::Engine(world));
+struct IngenEngineModule : public ingen::Module {
+ virtual void load(ingen::World* world) {
+ server::set_denormal_flags(world->log());
+ SPtr<server::Engine> engine(new server::Engine(world));
world->set_engine(engine);
if (!world->interface()) {
world->set_interface(engine->interface());
@@ -35,7 +35,7 @@ struct IngenEngineModule : public Ingen::Module {
extern "C" {
-Ingen::Module*
+ingen::Module*
ingen_module_load()
{
return new IngenEngineModule();
diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp
index a897f130..c0fd80aa 100644
--- a/src/server/ingen_jack.cpp
+++ b/src/server/ingen_jack.cpp
@@ -26,30 +26,30 @@
#include "JackDriver.hpp"
#include "Engine.hpp"
-using namespace Ingen;
+using namespace ingen;
-struct IngenJackModule : public Ingen::Module {
- void load(Ingen::World* world) {
- if (((Server::Engine*)world->engine().get())->driver()) {
+struct IngenJackModule : public ingen::Module {
+ void load(ingen::World* world) {
+ if (((server::Engine*)world->engine().get())->driver()) {
world->log().warn("Engine already has a driver\n");
return;
}
- Server::JackDriver* driver = new Server::JackDriver(
- *(Server::Engine*)world->engine().get());
+ server::JackDriver* driver = new server::JackDriver(
+ *(server::Engine*)world->engine().get());
const Atom& s = world->conf().option("jack-server");
const std::string server_name = s.is_valid() ? s.ptr<char>() : "";
driver->attach(server_name,
world->conf().option("jack-name").ptr<char>(),
nullptr);
- ((Server::Engine*)world->engine().get())->set_driver(
- SPtr<Server::Driver>(driver));
+ ((server::Engine*)world->engine().get())->set_driver(
+ SPtr<server::Driver>(driver));
}
};
extern "C" {
-Ingen::Module*
+ingen::Module*
ingen_module_load()
{
return new IngenJackModule();
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 99b2826a..36bafc4d 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -56,7 +56,7 @@
#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#"
-namespace Ingen {
+namespace ingen {
/** Record of a graph in this bundle. */
struct LV2Graph : public Parser::ResourceRecord {
@@ -75,7 +75,7 @@ public:
Graphs graphs;
};
-namespace Server {
+namespace server {
class LV2Driver;
@@ -87,8 +87,8 @@ ui_ring_size(SampleCount block_length)
return std::max((size_t)8192, (size_t)block_length * 16);
}
-class LV2Driver : public Ingen::Server::Driver
- , public Ingen::AtomSink
+class LV2Driver : public ingen::server::Driver
+ , public ingen::AtomSink
{
public:
LV2Driver(Engine& engine,
@@ -396,13 +396,13 @@ private:
bool _instantiated;
};
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
extern "C" {
-using namespace Ingen;
-using namespace Ingen::Server;
+using namespace ingen;
+using namespace ingen::server;
static void
ingen_lv2_main(SPtr<Engine> engine, const SPtr<LV2Driver>& driver)
@@ -430,7 +430,7 @@ struct IngenPlugin {
, argv(nullptr)
{}
- Ingen::World* world;
+ ingen::World* world;
SPtr<Engine> engine;
std::thread* main;
LV2_URID_Map* map;
@@ -492,7 +492,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor,
}
set_bundle_path(bundle_path);
- const std::string manifest_path = Ingen::bundle_file_path("manifest.ttl");
+ const std::string manifest_path = ingen::bundle_file_path("manifest.ttl");
SerdNode manifest_node = serd_node_new_file_uri(
(const uint8_t*)manifest_path.c_str(), nullptr, nullptr, true);
@@ -514,7 +514,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor,
IngenPlugin* plugin = new IngenPlugin();
plugin->map = map;
- plugin->world = new Ingen::World(map, unmap, log);
+ plugin->world = new ingen::World(map, unmap, log);
plugin->world->load_configuration(plugin->argc, plugin->argv);
LV2_URID bufsz_max = map->map(map->handle, LV2_BUF_SIZE__maxBlockLength);
@@ -547,7 +547,7 @@ ingen_instantiate(const LV2_Descriptor* descriptor,
"queue-size",
plugin->world->forge().make(std::max(block_length, seq_size) * 4));
- SPtr<Server::Engine> engine(new Server::Engine(plugin->world));
+ SPtr<server::Engine> engine(new server::Engine(plugin->world));
plugin->engine = engine;
plugin->world->set_engine(engine);
@@ -555,14 +555,14 @@ ingen_instantiate(const LV2_Descriptor* descriptor,
plugin->world->set_interface(interface);
- Server::ThreadManager::set_flag(Server::THREAD_PRE_PROCESS);
- Server::ThreadManager::single_threaded = true;
+ server::ThreadManager::set_flag(server::THREAD_PRE_PROCESS);
+ server::ThreadManager::single_threaded = true;
LV2Driver* driver = new LV2Driver(*engine.get(), block_length, seq_size, rate);
- engine->set_driver(SPtr<Ingen::Server::Driver>(driver));
+ engine->set_driver(SPtr<ingen::server::Driver>(driver));
engine->activate();
- Server::ThreadManager::single_threaded = true;
+ server::ThreadManager::single_threaded = true;
std::lock_guard<std::mutex> lock(plugin->world->rdf_mutex());
@@ -597,10 +597,10 @@ ingen_instantiate(const LV2_Descriptor* descriptor,
static void
ingen_connect_port(LV2_Handle instance, uint32_t port, void* data)
{
- using namespace Ingen::Server;
+ using namespace ingen::server;
IngenPlugin* me = (IngenPlugin*)instance;
- Server::Engine* engine = (Server::Engine*)me->world->engine().get();
+ server::Engine* engine = (server::Engine*)me->world->engine().get();
const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver());
if (port < driver->ports().size()) {
driver->ports().at(port)->set_buffer(data);
@@ -613,7 +613,7 @@ static void
ingen_activate(LV2_Handle instance)
{
IngenPlugin* me = (IngenPlugin*)instance;
- SPtr<Server::Engine> engine = static_ptr_cast<Server::Engine>(me->world->engine());
+ SPtr<server::Engine> engine = static_ptr_cast<server::Engine>(me->world->engine());
const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver());
engine->activate();
me->main = new std::thread(ingen_lv2_main, engine, driver);
@@ -623,11 +623,11 @@ static void
ingen_run(LV2_Handle instance, uint32_t sample_count)
{
IngenPlugin* me = (IngenPlugin*)instance;
- SPtr<Server::Engine> engine = static_ptr_cast<Server::Engine>(me->world->engine());
+ SPtr<server::Engine> engine = static_ptr_cast<server::Engine>(me->world->engine());
const SPtr<LV2Driver>& driver = static_ptr_cast<LV2Driver>(engine->driver());
- Server::ThreadManager::set_flag(Ingen::Server::THREAD_PROCESS);
- Server::ThreadManager::set_flag(Ingen::Server::THREAD_IS_REAL_TIME);
+ server::ThreadManager::set_flag(ingen::server::THREAD_PROCESS);
+ server::ThreadManager::set_flag(ingen::server::THREAD_IS_REAL_TIME);
driver->run(sample_count);
}
@@ -648,8 +648,8 @@ static void
ingen_cleanup(LV2_Handle instance)
{
IngenPlugin* me = (IngenPlugin*)instance;
- me->world->set_engine(SPtr<Ingen::Server::Engine>());
- me->world->set_interface(SPtr<Ingen::Interface>());
+ me->world->set_engine(SPtr<ingen::server::Engine>());
+ me->world->set_interface(SPtr<ingen::Interface>());
if (me->main) {
me->main->join();
delete me->main;
@@ -804,8 +804,8 @@ LV2Graph::LV2Graph(Parser::ResourceRecord record)
Lib::Lib(const char* bundle_path)
{
- Ingen::set_bundle_path(bundle_path);
- const std::string manifest_path = Ingen::bundle_file_path("manifest.ttl");
+ ingen::set_bundle_path(bundle_path);
+ const std::string manifest_path = ingen::bundle_file_path("manifest.ttl");
SerdNode manifest_node = serd_node_new_file_uri(
(const uint8_t*)manifest_path.c_str(), nullptr, nullptr, true);
diff --git a/src/server/ingen_portaudio.cpp b/src/server/ingen_portaudio.cpp
index e4065342..d1e04a6c 100644
--- a/src/server/ingen_portaudio.cpp
+++ b/src/server/ingen_portaudio.cpp
@@ -26,26 +26,26 @@
#include "PortAudioDriver.hpp"
#include "Engine.hpp"
-using namespace Ingen;
+using namespace ingen;
-struct IngenPortAudioModule : public Ingen::Module {
- void load(Ingen::World* world) {
- if (((Server::Engine*)world->engine().get())->driver()) {
+struct IngenPortAudioModule : public ingen::Module {
+ void load(ingen::World* world) {
+ if (((server::Engine*)world->engine().get())->driver()) {
world->log().warn("Engine already has a driver\n");
return;
}
- Server::PortAudioDriver* driver = new Server::PortAudioDriver(
- *(Server::Engine*)world->engine().get());
+ server::PortAudioDriver* driver = new server::PortAudioDriver(
+ *(server::Engine*)world->engine().get());
driver->attach();
- ((Server::Engine*)world->engine().get())->set_driver(
- SPtr<Server::Driver>(driver));
+ ((server::Engine*)world->engine().get())->set_driver(
+ SPtr<server::Driver>(driver));
}
};
extern "C" {
-Ingen::Module*
+ingen::Module*
ingen_module_load()
{
return new IngenPortAudioModule();
diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index 6b27ed83..5c7ad147 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -29,9 +29,9 @@
#include "RunContext.hpp"
#include "internals/BlockDelay.hpp"
-namespace Ingen {
-namespace Server {
-namespace Internals {
+namespace ingen {
+namespace server {
+namespace internals {
InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) {
return new InternalPlugin(
@@ -46,7 +46,7 @@ BlockDelayNode::BlockDelayNode(InternalPlugin* plugin,
SampleRate srate)
: InternalBlock(plugin, symbol, polyphonic, parent, srate)
{
- const Ingen::URIs& uris = bufs.uris();
+ const ingen::URIs& uris = bufs.uris();
_ports = bufs.maid().make_managed<Ports>(2);
_in_port = new InputPort(bufs, this, Raul::Symbol("in"), 0, 1,
@@ -84,6 +84,6 @@ BlockDelayNode::run(RunContext& context)
_buffer->copy(context, _in_port->buffer(0).get());
}
-} // namespace Internals
-} // namespace Server
-} // namespace Ingen
+} // namespace internals
+} // namespace server
+} // namespace ingen
diff --git a/src/server/internals/BlockDelay.hpp b/src/server/internals/BlockDelay.hpp
index e1ef5311..a4a27383 100644
--- a/src/server/internals/BlockDelay.hpp
+++ b/src/server/internals/BlockDelay.hpp
@@ -21,15 +21,15 @@
#include "InternalBlock.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class InputPort;
class OutputPort;
class InternalPlugin;
class BufferFactory;
-namespace Internals {
+namespace internals {
class BlockDelayNode : public InternalBlock
{
@@ -55,8 +55,8 @@ private:
BufferRef _buffer;
};
-} // namespace Server
-} // namespace Ingen
-} // namespace Internals
+} // namespace server
+} // namespace ingen
+} // namespace internals
#endif // INGEN_INTERNALS_BLOCKDELAY_HPP
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 95474ab8..4b5735d7 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -30,9 +30,9 @@
#include "RunContext.hpp"
#include "util.hpp"
-namespace Ingen {
-namespace Server {
-namespace Internals {
+namespace ingen {
+namespace server {
+namespace internals {
InternalPlugin* ControllerNode::internal_plugin(URIs& uris) {
return new InternalPlugin(
@@ -48,7 +48,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin,
: InternalBlock(plugin, symbol, false, parent, srate)
, _learning(false)
{
- const Ingen::URIs& uris = bufs.uris();
+ const ingen::URIs& uris = bufs.uris();
_ports = bufs.maid().make_managed<Ports>(7);
const Atom zero = bufs.forge().make(0.0f);
@@ -169,6 +169,6 @@ ControllerNode::control(RunContext& context, uint8_t control_num, uint8_t val, F
return true;
}
-} // namespace Internals
-} // namespace Server
-} // namespace Ingen
+} // namespace internals
+} // namespace server
+} // namespace ingen
diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp
index 720f78c0..9d1bbf7d 100644
--- a/src/server/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -19,14 +19,14 @@
#include "InternalBlock.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class InputPort;
class OutputPort;
class InternalPlugin;
-namespace Internals {
+namespace internals {
/** MIDI control input block.
*
@@ -64,8 +64,8 @@ private:
bool _learning;
};
-} // namespace Server
-} // namespace Ingen
-} // namespace Internals
+} // namespace server
+} // namespace ingen
+} // namespace internals
#endif // INGEN_INTERNALS_CONTROLLER_HPP
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index f8e2503d..9d39f345 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -34,9 +34,9 @@
// #define NOTE_DEBUG 1
-namespace Ingen {
-namespace Server {
-namespace Internals {
+namespace ingen {
+namespace server {
+namespace internals {
InternalPlugin* NoteNode::internal_plugin(URIs& uris) {
return new InternalPlugin(
@@ -53,7 +53,7 @@ NoteNode::NoteNode(InternalPlugin* plugin,
, _voices(bufs.maid().make_managed<Voices>(_polyphony))
, _sustain(false)
{
- const Ingen::URIs& uris = bufs.uris();
+ const ingen::URIs& uris = bufs.uris();
_ports = bufs.maid().make_managed<Ports>(8);
const Atom zero = bufs.forge().make(0.0f);
@@ -415,6 +415,6 @@ NoteNode::channel_pressure(RunContext& context, FrameTime time, float amount)
_pressure_port->set_control_value(context, time, amount);
}
-} // namespace Internals
-} // namespace Server
-} // namespace Ingen
+} // namespace internals
+} // namespace server
+} // namespace ingen
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index 1e60c130..5c1b24c4 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -20,14 +20,14 @@
#include "InternalBlock.hpp"
#include "types.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class InputPort;
class OutputPort;
class InternalPlugin;
-namespace Internals {
+namespace internals {
/** MIDI note input block.
*
@@ -102,8 +102,8 @@ private:
OutputPort* _pressure_port;
};
-} // namespace Server
-} // namespace Ingen
-} // namespace Internals
+} // namespace server
+} // namespace ingen
+} // namespace internals
#endif // INGEN_INTERNALS_NOTE_HPP
diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp
index 5152a930..c35aa02b 100644
--- a/src/server/internals/Time.cpp
+++ b/src/server/internals/Time.cpp
@@ -27,9 +27,9 @@
#include "internals/Time.hpp"
#include "util.hpp"
-namespace Ingen {
-namespace Server {
-namespace Internals {
+namespace ingen {
+namespace server {
+namespace internals {
InternalPlugin* TimeNode::internal_plugin(URIs& uris) {
return new InternalPlugin(
@@ -44,7 +44,7 @@ TimeNode::TimeNode(InternalPlugin* plugin,
SampleRate srate)
: InternalBlock(plugin, symbol, false, parent, srate)
{
- const Ingen::URIs& uris = bufs.uris();
+ const ingen::URIs& uris = bufs.uris();
_ports = bufs.maid().make_managed<Ports>(1);
_notify_port = new OutputPort(
@@ -73,6 +73,6 @@ TimeNode::run(RunContext& context)
context, *_notify_port->buffer(0));
}
-} // namespace Internals
-} // namespace Server
-} // namespace Ingen
+} // namespace internals
+} // namespace server
+} // namespace ingen
diff --git a/src/server/internals/Time.hpp b/src/server/internals/Time.hpp
index 1a063f8d..b4b570f4 100644
--- a/src/server/internals/Time.hpp
+++ b/src/server/internals/Time.hpp
@@ -19,14 +19,14 @@
#include "InternalBlock.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class InputPort;
class OutputPort;
class InternalPlugin;
-namespace Internals {
+namespace internals {
/** Time information block.
*
@@ -52,8 +52,8 @@ private:
OutputPort* _notify_port;
};
-} // namespace Server
-} // namespace Ingen
-} // namespace Internals
+} // namespace server
+} // namespace ingen
+} // namespace internals
#endif // INGEN_INTERNALS_TIME_HPP
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 66fd058b..793e508d 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -30,9 +30,9 @@
#include "internals/Trigger.hpp"
#include "util.hpp"
-namespace Ingen {
-namespace Server {
-namespace Internals {
+namespace ingen {
+namespace server {
+namespace internals {
InternalPlugin* TriggerNode::internal_plugin(URIs& uris) {
return new InternalPlugin(
@@ -48,7 +48,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin,
: InternalBlock(plugin, symbol, false, parent, srate)
, _learning(false)
{
- const Ingen::URIs& uris = bufs.uris();
+ const ingen::URIs& uris = bufs.uris();
_ports = bufs.maid().make_managed<Ports>(6);
const Atom zero = bufs.forge().make(0.0f);
@@ -182,6 +182,6 @@ TriggerNode::note_off(RunContext& context, uint8_t note_num, FrameTime time)
return false;
}
-} // namespace Internals
-} // namespace Server
-} // namespace Ingen
+} // namespace internals
+} // namespace server
+} // namespace ingen
diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index 4d67395a..ae661751 100644
--- a/src/server/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -19,14 +19,14 @@
#include "InternalBlock.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
class InputPort;
class OutputPort;
class InternalPlugin;
-namespace Internals {
+namespace internals {
/** MIDI trigger input block.
*
@@ -68,8 +68,8 @@ private:
OutputPort* _vel_port;
};
-} // namespace Server
-} // namespace Ingen
-} // namespace Internals
+} // namespace server
+} // namespace ingen
+} // namespace internals
#endif // INGEN_INTERNALS_TRIGGER_HPP
diff --git a/src/server/mix.cpp b/src/server/mix.cpp
index 60525596..065e3efc 100644
--- a/src/server/mix.cpp
+++ b/src/server/mix.cpp
@@ -20,8 +20,8 @@
#include "RunContext.hpp"
#include "mix.hpp"
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
static inline bool
is_end(const Buffer* buf, const LV2_Atom_Event* ev)
@@ -108,5 +108,5 @@ mix(const RunContext& context,
}
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
diff --git a/src/server/mix.hpp b/src/server/mix.hpp
index 3d8880db..7df76595 100644
--- a/src/server/mix.hpp
+++ b/src/server/mix.hpp
@@ -19,11 +19,11 @@
#include <cstdint>
-namespace Ingen {
+namespace ingen {
class URIs;
-namespace Server {
+namespace server {
class Buffer;
class RunContext;
@@ -34,7 +34,7 @@ mix(const RunContext& context,
const Buffer*const* srcs,
uint32_t num_srcs);
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_MIX_HPP
diff --git a/src/server/util.hpp b/src/server/util.hpp
index 7d30cc8f..07a7f350 100644
--- a/src/server/util.hpp
+++ b/src/server/util.hpp
@@ -43,13 +43,13 @@
# define INGEN_THREAD_LOCAL
#endif
-namespace Ingen {
-namespace Server {
+namespace ingen {
+namespace server {
/** Set flags to disable denormal processing.
*/
inline void
-set_denormal_flags(Ingen::Log& log)
+set_denormal_flags(ingen::Log& log)
{
#ifdef __SSE__
_mm_setcsr(_mm_getcsr() | 0x8040);
@@ -57,7 +57,7 @@ set_denormal_flags(Ingen::Log& log)
#endif
}
-} // namespace Server
-} // namespace Ingen
+} // namespace server
+} // namespace ingen
#endif // INGEN_ENGINE_UTIL_HPP