From ea3586e44a1621f97298e667a79f4c4f75f902ba Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 22 Jan 2007 05:00:29 +0000 Subject: Created Raul namespace. git-svn-id: http://svn.drobilla.net/lad/ingen@265 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/Loader.cpp | 2 ++ src/libs/client/Loader.h | 2 ++ src/libs/client/OSCClientReceiver.cpp | 2 ++ src/libs/client/OSCEngineSender.cpp | 8 ++++---- src/libs/client/OSCEngineSender.h | 8 ++++---- src/libs/client/ObjectModel.h | 3 +++ src/libs/client/PluginModel.h | 2 +- src/libs/client/Serializer.cpp | 1 + src/libs/client/Serializer.h | 4 ++-- src/libs/client/SigClientInterface.h | 4 ++-- src/libs/client/Store.h | 2 ++ src/libs/client/ThreadedSigClientInterface.h | 8 ++++---- 12 files changed, 29 insertions(+), 17 deletions(-) (limited to 'src/libs/client') diff --git a/src/libs/client/Loader.cpp b/src/libs/client/Loader.cpp index aebe4c80..8424ba80 100644 --- a/src/libs/client/Loader.cpp +++ b/src/libs/client/Loader.cpp @@ -20,6 +20,8 @@ #include "Loader.h" #include "ModelEngineInterface.h" +using namespace Raul; + namespace Ingen { namespace Client { diff --git a/src/libs/client/Loader.h b/src/libs/client/Loader.h index d252520d..bc29f563 100644 --- a/src/libs/client/Loader.h +++ b/src/libs/client/Loader.h @@ -23,6 +23,8 @@ #include "raul/Namespaces.h" #include "ObjectModel.h" +using Raul::Namespaces; + namespace Ingen { namespace Client { diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp index 45b8d794..5b4d66d9 100644 --- a/src/libs/client/OSCClientReceiver.cpp +++ b/src/libs/client/OSCClientReceiver.cpp @@ -20,7 +20,9 @@ #include #include #include + using std::cerr; using std::cout; using std::endl; +using namespace Raul; namespace Ingen { namespace Client { diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp index 6ba3dfb5..fce24116 100644 --- a/src/libs/client/OSCEngineSender.cpp +++ b/src/libs/client/OSCEngineSender.cpp @@ -371,9 +371,9 @@ OSCEngineSender::midi_learn(const string& node_path) void -OSCEngineSender::set_metadata(const string& obj_path, - const string& predicate, - const Atom& value) +OSCEngineSender::set_metadata(const string& obj_path, + const string& predicate, + const Raul::Atom& value) { assert(_engine_addr); @@ -381,7 +381,7 @@ OSCEngineSender::set_metadata(const string& obj_path, lo_message_add_int32(m, next_id()); lo_message_add_string(m, obj_path.c_str()); lo_message_add_string(m, predicate.c_str()); - AtomLiblo::lo_message_add_atom(m, value); + Raul::AtomLiblo::lo_message_add_atom(m, value); lo_send_message(_engine_addr, "/om/metadata/set", m); } diff --git a/src/libs/client/OSCEngineSender.h b/src/libs/client/OSCEngineSender.h index e46542b6..9f0a6137 100644 --- a/src/libs/client/OSCEngineSender.h +++ b/src/libs/client/OSCEngineSender.h @@ -26,10 +26,10 @@ using Ingen::Shared::EngineInterface; using Ingen::Shared::ClientInterface; using Ingen::Shared::ClientKey; - namespace Ingen { namespace Client { + /* OSC (via liblo) interface to the engine. * * Clients can use this opaquely as an EngineInterface* to control the engine @@ -123,9 +123,9 @@ public: void midi_learn(const string& node_path); - void set_metadata(const string& obj_path, - const string& predicate, - const Atom& value); + void set_metadata(const string& obj_path, + const string& predicate, + const Raul::Atom& value); // Requests // diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h index 12db367b..a9479e9c 100644 --- a/src/libs/client/ObjectModel.h +++ b/src/libs/client/ObjectModel.h @@ -28,8 +28,11 @@ #include "raul/Atom.h" #include "raul/Path.h" #include "raul/SharedPtr.h" + using std::string; using std::map; using std::find; using std::cout; using std::cerr; using std::endl; +using Raul::Atom; +using Raul::Path; namespace Ingen { namespace Client { diff --git a/src/libs/client/PluginModel.h b/src/libs/client/PluginModel.h index 7af4f169..8bc96558 100644 --- a/src/libs/client/PluginModel.h +++ b/src/libs/client/PluginModel.h @@ -84,7 +84,7 @@ public: } } - string default_node_name() { return Path::nameify(m_name); } + string default_node_name() { return Raul::Path::nameify(m_name); } private: Type m_type; diff --git a/src/libs/client/Serializer.cpp b/src/libs/client/Serializer.cpp index ef19d94d..65dd7b78 100644 --- a/src/libs/client/Serializer.cpp +++ b/src/libs/client/Serializer.cpp @@ -42,6 +42,7 @@ using std::string; using std::vector; using std::pair; using std::cerr; using std::cout; using std::endl; using boost::optional; +using namespace Raul; namespace Ingen { namespace Client { diff --git a/src/libs/client/Serializer.h b/src/libs/client/Serializer.h index 5476002c..b94a10ff 100644 --- a/src/libs/client/Serializer.h +++ b/src/libs/client/Serializer.h @@ -87,9 +87,9 @@ private: void serialize_node(SharedPtr n, unsigned depth); void serialize_port(SharedPtr p, unsigned depth); - RdfId path_to_node_id(const Path& path); + Raul::RdfId path_to_node_id(const Path& path); - RDFWriter _writer; + Raul::RDFWriter _writer; }; diff --git a/src/libs/client/SigClientInterface.h b/src/libs/client/SigClientInterface.h index d041157a..ce5cefe7 100644 --- a/src/libs/client/SigClientInterface.h +++ b/src/libs/client/SigClientInterface.h @@ -58,7 +58,7 @@ public: sigc::signal object_destroyed_sig; sigc::signal connection_sig; sigc::signal disconnection_sig; - sigc::signal metadata_update_sig; + sigc::signal metadata_update_sig; sigc::signal control_change_sig; sigc::signal program_add_sig; sigc::signal program_remove_sig; @@ -118,7 +118,7 @@ protected: void disconnection(string src_port_path, string dst_port_path) { disconnection_sig.emit(src_port_path, dst_port_path); } - void metadata_update(string path, string key, Atom value) + void metadata_update(string path, string key, Raul::Atom value) { metadata_update_sig.emit(path, key, value); } void control_change(string port_path, float value) diff --git a/src/libs/client/Store.h b/src/libs/client/Store.h index 68103482..2ca347b4 100644 --- a/src/libs/client/Store.h +++ b/src/libs/client/Store.h @@ -28,6 +28,8 @@ #include "interface/EngineInterface.h" using std::string; using std::map; using std::list; using Ingen::Shared::EngineInterface; +using Raul::Path; +using Raul::Atom; namespace Ingen { namespace Client { diff --git a/src/libs/client/ThreadedSigClientInterface.h b/src/libs/client/ThreadedSigClientInterface.h index 0a2b8652..53454250 100644 --- a/src/libs/client/ThreadedSigClientInterface.h +++ b/src/libs/client/ThreadedSigClientInterface.h @@ -118,7 +118,7 @@ public: void disconnection(string src_port_path, string dst_port_path) { push_sig(sigc::bind(disconnection_slot, src_port_path, dst_port_path)); } - void metadata_update(string path, string key, Atom value) + void metadata_update(string path, string key, Raul::Atom value) { push_sig(sigc::bind(metadata_update_slot, path, key, value)); } void control_change(string port_path, float value) @@ -138,8 +138,8 @@ private: bool _enabled; - SRSWQueue _sigs; - uint32_t _num_plugins; + Raul::SRSWQueue _sigs; + uint32_t _num_plugins; sigc::slot bundle_begin_slot; sigc::slot bundle_end_slot; @@ -157,7 +157,7 @@ private: sigc::slot object_destroyed_slot; sigc::slot object_renamed_slot; sigc::slot disconnection_slot; - sigc::slot metadata_update_slot; + sigc::slot metadata_update_slot; sigc::slot control_change_slot; sigc::slot program_add_slot; sigc::slot program_remove_slot; -- cgit v1.2.1