diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/interface/ClientInterface.hpp (renamed from src/common/interface/ClientInterface.h) | 75 | ||||
| -rw-r--r-- | src/common/interface/ClientKey.hpp (renamed from src/common/interface/ClientKey.h) | 0 | ||||
| -rw-r--r-- | src/common/interface/EngineInterface.hpp (renamed from src/common/interface/EngineInterface.h) | 4 | ||||
| -rw-r--r-- | src/common/interface/Makefile.am | 8 | ||||
| -rw-r--r-- | src/common/interface/Responder.hpp (renamed from src/common/interface/Responder.h) | 9 |
5 files changed, 47 insertions, 49 deletions
diff --git a/src/common/interface/ClientInterface.h b/src/common/interface/ClientInterface.hpp index 68dcaac3..06114101 100644 --- a/src/common/interface/ClientInterface.h +++ b/src/common/interface/ClientInterface.hpp @@ -18,10 +18,9 @@ #ifndef CLIENTINTERFACE_H #define CLIENTINTERFACE_H -#include <inttypes.h> -#include <raul/Atom.h> #include <string> -using std::string; +#include <inttypes.h> +#include <raul/Atom.hpp> namespace Ingen { namespace Shared { @@ -37,7 +36,7 @@ public: virtual ~ClientInterface() {} - virtual void response(int32_t id, bool success, string msg) = 0; + virtual void response(int32_t id, bool success, std::string msg) = 0; virtual void enable() = 0; @@ -61,57 +60,57 @@ public: virtual void transfer_begin() = 0; virtual void transfer_end() = 0; - virtual void error(string msg) = 0; + virtual void error(std::string msg) = 0; virtual void num_plugins(uint32_t num_plugins) = 0; - virtual void new_plugin(string uri, - string type_uri, - string name) = 0; + virtual void new_plugin(std::string uri, + std::string type_uri, + std::string name) = 0; - virtual void new_patch(string path, uint32_t poly) = 0; + virtual void new_patch(std::string path, uint32_t poly) = 0; - virtual void new_node(string plugin_uri, - string node_path, - bool is_polyphonic, - uint32_t num_ports) = 0; + virtual void new_node(std::string plugin_uri, + std::string node_path, + bool is_polyphonic, + uint32_t num_ports) = 0; - virtual void new_port(string path, - string data_type, - bool is_output) = 0; + virtual void new_port(std::string path, + std::string data_type, + bool is_output) = 0; - virtual void patch_enabled(string path) = 0; + virtual void patch_enabled(std::string path) = 0; - virtual void patch_disabled(string path) = 0; + virtual void patch_disabled(std::string path) = 0; - virtual void patch_cleared(string path) = 0; + virtual void patch_cleared(std::string path) = 0; - virtual void object_renamed(string old_path, - string new_path) = 0; + virtual void object_renamed(std::string old_path, + std::string new_path) = 0; - virtual void object_destroyed(string path) = 0; + virtual void object_destroyed(std::string path) = 0; - virtual void connection(string src_port_path, - string dst_port_path) = 0; + virtual void connection(std::string src_port_path, + std::string dst_port_path) = 0; - virtual void disconnection(string src_port_path, - string dst_port_path) = 0; + virtual void disconnection(std::string src_port_path, + std::string dst_port_path) = 0; - virtual void metadata_update(string subject_path, - string predicate, - Raul::Atom value) = 0; + virtual void metadata_update(std::string subject_path, + std::string predicate, + Raul::Atom value) = 0; - virtual void control_change(string port_path, - float value) = 0; + virtual void control_change(std::string port_path, + float value) = 0; - virtual void program_add(string node_path, - uint32_t bank, - uint32_t program, - string program_name) = 0; + virtual void program_add(std::string node_path, + uint32_t bank, + uint32_t program, + std::string program_name) = 0; - virtual void program_remove(string node_path, - uint32_t bank, - uint32_t program) = 0; + virtual void program_remove(std::string node_path, + uint32_t bank, + uint32_t program) = 0; protected: ClientInterface() {} diff --git a/src/common/interface/ClientKey.h b/src/common/interface/ClientKey.hpp index b007a647..b007a647 100644 --- a/src/common/interface/ClientKey.h +++ b/src/common/interface/ClientKey.hpp diff --git a/src/common/interface/EngineInterface.h b/src/common/interface/EngineInterface.hpp index 1701a78e..af662f82 100644 --- a/src/common/interface/EngineInterface.h +++ b/src/common/interface/EngineInterface.hpp @@ -20,8 +20,8 @@ #include <inttypes.h> #include <string> -#include <raul/SharedPtr.h> -#include "interface/ClientInterface.h" +#include <raul/SharedPtr.hpp> +#include "interface/ClientInterface.hpp" using std::string; namespace Ingen { diff --git a/src/common/interface/Makefile.am b/src/common/interface/Makefile.am index 347e8186..7a8f641d 100644 --- a/src/common/interface/Makefile.am +++ b/src/common/interface/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = \ README \ - ClientInterface.h \ - ClientKey.h \ - Responder.h \ - EngineInterface.h + ClientInterface.hpp \ + ClientKey.hpp \ + Responder.hpp \ + EngineInterface.hpp diff --git a/src/common/interface/Responder.h b/src/common/interface/Responder.hpp index 6e809e1a..fc8cdcf7 100644 --- a/src/common/interface/Responder.h +++ b/src/common/interface/Responder.hpp @@ -20,10 +20,9 @@ #include <inttypes.h> #include <string> -#include <raul/SharedPtr.h> -#include "interface/ClientKey.h" -#include "interface/ClientInterface.h" -using std::string; +#include <raul/SharedPtr.hpp> +#include "interface/ClientKey.hpp" +#include "interface/ClientInterface.hpp" namespace Ingen { namespace Shared { @@ -64,7 +63,7 @@ public: virtual void set_id(int32_t id) {} virtual void respond_ok() {} - virtual void respond_error(const string& msg) {} + virtual void respond_error(const std::string& msg) {} }; |