diff options
author | David Robillard <d@drobilla.net> | 2011-04-16 19:02:36 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-04-16 19:02:36 +0000 |
commit | 9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2 (patch) | |
tree | 089c1366a567dfbf88c0473288236b276ef24bf6 /src/client | |
parent | 987710474b824cb92d83ff6fa7a090f50e10756f (diff) | |
download | ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.gz ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.bz2 ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.zip |
Squeeze blank lines and delete trailing whitespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3152 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/ConnectionModel.hpp | 2 | ||||
-rw-r--r-- | src/client/HTTPClientReceiver.cpp | 9 | ||||
-rw-r--r-- | src/client/HTTPClientReceiver.hpp | 1 | ||||
-rw-r--r-- | src/client/HTTPEngineSender.cpp | 25 | ||||
-rw-r--r-- | src/client/HTTPEngineSender.hpp | 2 | ||||
-rw-r--r-- | src/client/NodeModel.cpp | 18 | ||||
-rw-r--r-- | src/client/NodeModel.hpp | 2 | ||||
-rw-r--r-- | src/client/OSCClientReceiver.cpp | 19 | ||||
-rw-r--r-- | src/client/OSCClientReceiver.hpp | 2 | ||||
-rw-r--r-- | src/client/OSCEngineSender.cpp | 24 | ||||
-rw-r--r-- | src/client/OSCEngineSender.hpp | 3 | ||||
-rw-r--r-- | src/client/ObjectModel.cpp | 12 | ||||
-rw-r--r-- | src/client/ObjectModel.hpp | 4 | ||||
-rw-r--r-- | src/client/PatchModel.cpp | 10 | ||||
-rw-r--r-- | src/client/PatchModel.hpp | 2 | ||||
-rw-r--r-- | src/client/PluginModel.cpp | 11 | ||||
-rw-r--r-- | src/client/PluginModel.hpp | 2 | ||||
-rw-r--r-- | src/client/PluginUI.cpp | 3 | ||||
-rw-r--r-- | src/client/PluginUI.hpp | 4 | ||||
-rw-r--r-- | src/client/PortModel.cpp | 7 | ||||
-rw-r--r-- | src/client/PortModel.hpp | 2 | ||||
-rw-r--r-- | src/client/SigClientInterface.hpp | 2 | ||||
-rw-r--r-- | src/client/ThreadedSigClientInterface.cpp | 3 | ||||
-rw-r--r-- | src/client/ThreadedSigClientInterface.hpp | 2 |
24 files changed, 2 insertions, 169 deletions
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp index 5481b713..9c25975f 100644 --- a/src/client/ConnectionModel.hpp +++ b/src/client/ConnectionModel.hpp @@ -31,7 +31,6 @@ namespace Client { class ClientStore; - /** Class to represent a port->port connection in the engine. * * This can either have pointers to the connection ports' models, or just @@ -69,7 +68,6 @@ private: const SharedPtr<PortModel> _dst_port; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp index 3ba334b0..81119767 100644 --- a/src/client/HTTPClientReceiver.cpp +++ b/src/client/HTTPClientReceiver.cpp @@ -57,7 +57,6 @@ HTTPClientReceiver::HTTPClientReceiver( client_receiver = this; } - HTTPClientReceiver::~HTTPClientReceiver() { stop(); @@ -65,7 +64,6 @@ HTTPClientReceiver::~HTTPClientReceiver() client_receiver = NULL; } - HTTPClientReceiver::Listener::Listener(HTTPClientReceiver* receiver, const std::string& uri) : _uri(uri) , _receiver(receiver) @@ -104,7 +102,6 @@ HTTPClientReceiver::Listener::Listener(HTTPClientReceiver* receiver, const std:: } } - HTTPClientReceiver::Listener::~Listener() { close(_sock); @@ -122,7 +119,6 @@ HTTPClientReceiver::send(SoupMessage* msg) soup_session_queue_message(client_session, msg, message_callback, client_receiver); } - void HTTPClientReceiver::close_session() { @@ -133,7 +129,6 @@ HTTPClientReceiver::close_session() } } - void HTTPClientReceiver::update(const std::string& str) { @@ -168,7 +163,6 @@ HTTPClientReceiver::Listener::_run() LOG(info) << "HTTP listener finished" << endl; } - void HTTPClientReceiver::message_callback(SoupSession* session, SoupMessage* msg, void* ptr) { @@ -226,7 +220,6 @@ HTTPClientReceiver::message_callback(SoupSession* session, SoupMessage* msg, voi } } - void HTTPClientReceiver::start(bool dump) { @@ -238,7 +231,6 @@ HTTPClientReceiver::start(bool dump) soup_session_queue_message(client_session, msg, message_callback, this); } - void HTTPClientReceiver::stop() { @@ -246,7 +238,6 @@ HTTPClientReceiver::stop() close_session(); } - } // namespace Client } // namespace Ingen diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp index 415ac8a1..f699f74e 100644 --- a/src/client/HTTPClientReceiver.hpp +++ b/src/client/HTTPClientReceiver.hpp @@ -78,7 +78,6 @@ private: bool _quit_flag; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index c426777d..27682c5e 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -34,7 +34,6 @@ namespace Ingen { using namespace Shared; namespace Client { - HTTPEngineSender::HTTPEngineSender(World* world, const URI& engine_url) : _world(*world->rdf_world()) , _engine_url(engine_url) @@ -44,7 +43,6 @@ HTTPEngineSender::HTTPEngineSender(World* world, const URI& engine_url) _session = soup_session_sync_new(); } - HTTPEngineSender::~HTTPEngineSender() { soup_session_abort(_session); @@ -58,10 +56,8 @@ HTTPEngineSender::attach(int32_t ping_id, bool block) HTTPClientReceiver::send(msg); } - /* *** EngineInterface implementation below here *** */ - /** Register with the engine via HTTP. * * Note that this does not actually use 'key', since the engine creates @@ -75,13 +71,11 @@ HTTPEngineSender::register_client(ClientInterface* client) HTTPClientReceiver::send(msg);*/ } - void HTTPEngineSender::unregister_client(const URI& uri) { } - // Engine commands void HTTPEngineSender::load_plugins() @@ -90,30 +84,23 @@ HTTPEngineSender::load_plugins() HTTPClientReceiver::send(msg); } - void HTTPEngineSender::activate() { } - void HTTPEngineSender::deactivate() { } - void HTTPEngineSender::quit() { } - - // Object commands - - void HTTPEngineSender::put(const URI& uri, const Resource::Properties& properties, @@ -135,7 +122,6 @@ HTTPEngineSender::put(const URI& uri, soup_session_send_message(_session, msg); } - void HTTPEngineSender::delta(const Raul::URI& path, const Shared::Resource::Properties& remove, @@ -144,7 +130,6 @@ HTTPEngineSender::delta(const Raul::URI& path, warn << "FIXME: HTTP DELTA" << endl; } - void HTTPEngineSender::move(const Path& old_path, const Path& new_path) @@ -156,7 +141,6 @@ HTTPEngineSender::move(const Path& old_path, soup_session_send_message(_session, msg); } - void HTTPEngineSender::del(const Path& uri) { @@ -166,28 +150,24 @@ HTTPEngineSender::del(const Path& uri) soup_session_send_message(_session, msg); } - void HTTPEngineSender::connect(const Path& src_port_path, const Path& dst_port_path) { } - void HTTPEngineSender::disconnect(const Path& src_port_path, const Path& dst_port_path) { } - void HTTPEngineSender::disconnect_all(const Path& parent_patch_path, const Path& path) { } - void HTTPEngineSender::set_property(const URI& subject, const URI& predicate, @@ -198,8 +178,6 @@ HTTPEngineSender::set_property(const URI& subject, put(subject, prop); } - - // Requests // void @@ -209,7 +187,6 @@ HTTPEngineSender::ping() get(_engine_url); } - void HTTPEngineSender::get(const URI& uri) { @@ -218,14 +195,12 @@ HTTPEngineSender::get(const URI& uri) HTTPClientReceiver::send(msg); } - void HTTPEngineSender::request_property(const URI& object_path, const URI& key) { LOG(warn) << "TODO: request property" << endl; } - } // namespace Client } // namespace Ingen diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index 207d644f..5713d593 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -60,7 +60,6 @@ public: void attach(int32_t ping_id, bool block); - /* *** EngineInterface implementation below here *** */ void enable() { _enabled = true; } @@ -124,7 +123,6 @@ protected: bool _enabled; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index 2d3f8f72..d7bcc7f4 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -29,7 +29,6 @@ using namespace Raul; namespace Ingen { namespace Client { - NodeModel::NodeModel(Shared::LV2URIMap& uris, SharedPtr<PluginModel> plugin, const Path& path) : Node() , ObjectModel(uris, path) @@ -51,7 +50,6 @@ NodeModel::NodeModel(Shared::LV2URIMap& uris, const URI& plugin_uri, const Path& { } - NodeModel::NodeModel(const NodeModel& copy) : Node(copy) , ObjectModel(copy) @@ -64,13 +62,11 @@ NodeModel::NodeModel(const NodeModel& copy) memcpy(_max_values, copy._max_values, sizeof(float) * _num_values); } - NodeModel::~NodeModel() { clear(); } - void NodeModel::remove_port(SharedPtr<PortModel> port) { @@ -83,7 +79,6 @@ NodeModel::remove_port(SharedPtr<PortModel> port) signal_removed_port.emit(port); } - void NodeModel::remove_port(const Path& port_path) { @@ -95,7 +90,6 @@ NodeModel::remove_port(const Path& port_path) } } - void NodeModel::clear() { @@ -107,7 +101,6 @@ NodeModel::clear() _max_values = 0; } - void NodeModel::add_child(SharedPtr<ObjectModel> c) { @@ -120,7 +113,6 @@ NodeModel::add_child(SharedPtr<ObjectModel> c) add_port(pm); } - bool NodeModel::remove_child(SharedPtr<ObjectModel> c) { @@ -137,7 +129,6 @@ NodeModel::remove_child(SharedPtr<ObjectModel> c) return true; } - void NodeModel::add_port(SharedPtr<PortModel> pm) { @@ -154,7 +145,6 @@ NodeModel::add_port(SharedPtr<PortModel> pm) signal_new_port.emit(pm); } - SharedPtr<PortModel> NodeModel::get_port(const Raul::Symbol& symbol) const { @@ -164,7 +154,6 @@ NodeModel::get_port(const Raul::Symbol& symbol) const return SharedPtr<PortModel>(); } - Shared::Port* NodeModel::port(uint32_t index) const { @@ -172,7 +161,6 @@ NodeModel::port(uint32_t index) const return dynamic_cast<Shared::Port*>(_ports[index].get()); } - void NodeModel::default_port_value_range(SharedPtr<PortModel> port, float& min, float& max) const { @@ -200,7 +188,6 @@ NodeModel::default_port_value_range(SharedPtr<PortModel> port, float& min, float #endif } - void NodeModel::port_value_range(SharedPtr<PortModel> port, float& min, float& max) const { @@ -220,7 +207,6 @@ NodeModel::port_value_range(SharedPtr<PortModel> port, float& min, float& max) c max = min + 1.0; } - std::string NodeModel::port_label(SharedPtr<PortModel> port) const { @@ -228,7 +214,7 @@ NodeModel::port_label(SharedPtr<PortModel> port) const if (name.is_valid()) { return name.get_string(); } - + #ifdef HAVE_SLV2 if (_plugin && _plugin->type() == PluginModel::LV2) { SLV2World c_world = _plugin->slv2_world(); @@ -247,7 +233,6 @@ NodeModel::port_label(SharedPtr<PortModel> port) const return port->symbol().c_str(); } - void NodeModel::set(SharedPtr<ObjectModel> model) { @@ -260,6 +245,5 @@ NodeModel::set(SharedPtr<ObjectModel> model) ObjectModel::set(model); } - } // namespace Client } // namespace Ingen diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp index cc47a25d..4ca3847e 100644 --- a/src/client/NodeModel.hpp +++ b/src/client/NodeModel.hpp @@ -40,7 +40,6 @@ namespace Client { class PluginModel; class ClientStore; - /** Node model class, used by the client to store engine's state. * * \ingroup IngenClient @@ -101,7 +100,6 @@ private: mutable float* _max_values; ///< Port max values (cached for LV2) }; - } // namespace Client } // namespace Ingen diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 00d8cc32..37cfb532 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -50,13 +50,11 @@ OSCClientReceiver::OSCClientReceiver(int listen_port, SharedPtr<Shared::ClientIn #endif } - OSCClientReceiver::~OSCClientReceiver() { stop(); } - void OSCClientReceiver::start(bool dump_osc) { @@ -95,7 +93,6 @@ OSCClientReceiver::start(bool dump_osc) lo_server_thread_start(_st); } - void OSCClientReceiver::stop() { @@ -106,7 +103,6 @@ OSCClientReceiver::stop() } } - int OSCClientReceiver::generic_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* user_data) { @@ -121,15 +117,12 @@ OSCClientReceiver::generic_cb(const char* path, const char* types, lo_arg** argv return 1; // not handled } - void OSCClientReceiver::lo_error_cb(int num, const char* msg, const char* path) { LOG(error) << "Got error from server: " << msg << endl; } - - int OSCClientReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* user_data) { @@ -141,7 +134,6 @@ OSCClientReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv return 0; } - void OSCClientReceiver::setup_callbacks() { @@ -157,7 +149,6 @@ OSCClientReceiver::setup_callbacks() lo_server_thread_add_method(_st, "/activity", "s", activity_cb, this); } - /** Catches errors that aren't a direct result of a client request. */ int @@ -167,7 +158,6 @@ OSCClientReceiver::_error_cb(const char* path, const char* types, lo_arg** argv, return 0; } - int OSCClientReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -175,7 +165,6 @@ OSCClientReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, i return 0; } - int OSCClientReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -187,7 +176,6 @@ OSCClientReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, i return 0; } - int OSCClientReceiver::_move_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -195,7 +183,6 @@ OSCClientReceiver::_move_cb(const char* path, const char* types, lo_arg** argv, return 0; } - int OSCClientReceiver::_connection_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -207,7 +194,6 @@ OSCClientReceiver::_connection_cb(const char* path, const char* types, lo_arg** return 0; } - int OSCClientReceiver::_disconnection_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -219,7 +205,6 @@ OSCClientReceiver::_disconnection_cb(const char* path, const char* types, lo_arg return 0; } - /** Notification of a new or updated property. */ int @@ -238,7 +223,6 @@ OSCClientReceiver::_set_property_cb(const char* path, const char* types, lo_arg* return 0; } - int OSCClientReceiver::_activity_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -249,7 +233,6 @@ OSCClientReceiver::_activity_cb(const char* path, const char* types, lo_arg** ar return 0; } - int OSCClientReceiver::_response_ok_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -259,7 +242,6 @@ OSCClientReceiver::_response_ok_cb(const char* path, const char* types, lo_arg** return 0; } - int OSCClientReceiver::_response_error_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { @@ -269,6 +251,5 @@ OSCClientReceiver::_response_error_cb(const char* path, const char* types, lo_ar return 0; } - } // namespace Client } // namespace Ingen diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp index 9f9b8088..76c84d3d 100644 --- a/src/client/OSCClientReceiver.hpp +++ b/src/client/OSCClientReceiver.hpp @@ -38,7 +38,6 @@ int _##name##_cb (LO_HANDLER_ARGS);\ inline static int name##_cb(LO_HANDLER_ARGS, void* osc_listener)\ { return ((OSCClientReceiver*)osc_listener)->_##name##_cb(path, types, argv, argc, msg); } - /** Callbacks for "notification band" OSC messages. * * Receives all notification of engine state, but not replies on the "control @@ -94,7 +93,6 @@ private: LO_HANDLER(activity); }; - } // namespace Client } // namespace Ingen diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 70b40e7d..ee45f6b8 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -33,7 +33,6 @@ using namespace Raul; namespace Ingen { namespace Client { - /** Note the sending port is implicitly set by liblo, lo_send by default sends * from the most recently created server, so create the OSC listener before * this to have it all happen on the same port. Yeah, this is a big magic :/ @@ -45,13 +44,11 @@ OSCEngineSender::OSCEngineSender(const URI& engine_url) _address = lo_address_new_from_url(engine_url.c_str()); } - OSCEngineSender::~OSCEngineSender() { lo_address_free(_address); } - /** Attempt to connect to the engine (by pinging it). * * This doesn't register a client (or otherwise affect the client/engine state). @@ -81,7 +78,6 @@ OSCEngineSender::attach(int32_t ping_id, bool block) /* *** EngineInterface implementation below here *** */ - /** Register with the engine via OSC. * * Note that this does not actually use 'client', since the engine creates @@ -94,14 +90,12 @@ OSCEngineSender::register_client(Shared::ClientInterface* client) send("/register_client", "i", next_id(), LO_ARGS_END); } - void OSCEngineSender::unregister_client(const URI& uri) { send("/unregister_client", "i", next_id(), LO_ARGS_END); } - // Engine commands void OSCEngineSender::load_plugins() @@ -109,32 +103,26 @@ OSCEngineSender::load_plugins() send("/load_plugins", "i", next_id(), LO_ARGS_END); } - void OSCEngineSender::activate() { send("/activate", "i", next_id(), LO_ARGS_END); } - void OSCEngineSender::deactivate() { send("/deactivate", "i", next_id(), LO_ARGS_END); } - void OSCEngineSender::quit() { send("/quit", "i", next_id(), LO_ARGS_END); } - - // Object commands - void OSCEngineSender::put(const Raul::URI& path, const Shared::Resource::Properties& properties, @@ -151,7 +139,6 @@ OSCEngineSender::put(const Raul::URI& path, send_message("/put", m); } - void OSCEngineSender::delta(const Raul::URI& path, const Shared::Resource::Properties& remove, @@ -160,7 +147,6 @@ OSCEngineSender::delta(const Raul::URI& path, warn << "FIXME: OSC DELTA" << endl; } - void OSCEngineSender::move(const Path& old_path, const Path& new_path) @@ -172,7 +158,6 @@ OSCEngineSender::move(const Path& old_path, LO_ARGS_END); } - void OSCEngineSender::del(const Path& path) { @@ -182,7 +167,6 @@ OSCEngineSender::del(const Path& path) LO_ARGS_END); } - void OSCEngineSender::connect(const Path& src_port_path, const Path& dst_port_path) @@ -194,7 +178,6 @@ OSCEngineSender::connect(const Path& src_port_path, LO_ARGS_END); } - void OSCEngineSender::disconnect(const Path& src_port_path, const Path& dst_port_path) @@ -206,7 +189,6 @@ OSCEngineSender::disconnect(const Path& src_port_path, LO_ARGS_END); } - void OSCEngineSender::disconnect_all(const Path& parent_patch_path, const Path& path) @@ -218,7 +200,6 @@ OSCEngineSender::disconnect_all(const Path& parent_patch_path, LO_ARGS_END); } - void OSCEngineSender::set_property(const URI& subject, const URI& predicate, @@ -232,8 +213,6 @@ OSCEngineSender::set_property(const URI& subject, send_message("/set_property", m); } - - // Requests // void @@ -242,7 +221,6 @@ OSCEngineSender::ping() send("/ping", "i", next_id(), LO_ARGS_END); } - void OSCEngineSender::get(const URI& uri) { @@ -252,7 +230,6 @@ OSCEngineSender::get(const URI& uri) LO_ARGS_END); } - void OSCEngineSender::request_property(const URI& object_path, const URI& key) { @@ -263,7 +240,6 @@ OSCEngineSender::request_property(const URI& object_path, const URI& key) LO_ARGS_END); } - } // namespace Client } // namespace Ingen diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index fddfdbce..f39b975e 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -27,7 +27,6 @@ namespace Ingen { namespace Client { - /* OSC (via liblo) interface to the engine. * * Clients can use this opaquely as an EngineInterface* to control the engine @@ -54,7 +53,6 @@ public: void attach(int32_t ping_id, bool block); - /* *** EngineInterface implementation below here *** */ void enable() { _enabled = true; } @@ -114,7 +112,6 @@ protected: int32_t _id; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 16859216..69776c2c 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -26,7 +26,6 @@ using namespace Raul; namespace Ingen { namespace Client { - ObjectModel::ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path) : ResourceImpl(uris, path) , _meta(uris, Raul::URI("http://example.org/FIXME")) @@ -35,7 +34,6 @@ ObjectModel::ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path) { } - ObjectModel::ObjectModel(const ObjectModel& copy) : ResourceImpl(copy) , _meta(copy._meta) @@ -45,12 +43,10 @@ ObjectModel::ObjectModel(const ObjectModel& copy) { } - ObjectModel::~ObjectModel() { } - Raul::Atom& ObjectModel::set_property(const Raul::URI& key, const Raul::Atom& value) { @@ -58,14 +54,12 @@ ObjectModel::set_property(const Raul::URI& key, const Raul::Atom& value) return ResourceImpl::set_property(key, value); } - Raul::Atom& ObjectModel::set_meta_property(const Raul::URI& key, const Raul::Atom& value) { return set_property(key, Resource::Property(value, Resource::INTERNAL)); } - void ObjectModel::add_property(const Raul::URI& key, const Raul::Atom& value) { @@ -73,7 +67,6 @@ ObjectModel::add_property(const Raul::URI& key, const Raul::Atom& value) signal_property.emit(key, value); } - const Atom& ObjectModel::get_property(const Raul::URI& key) const { @@ -82,7 +75,6 @@ ObjectModel::get_property(const Raul::URI& key) const return (i != properties().end()) ? i->second : null_atom; } - bool ObjectModel::polyphonic() const { @@ -90,7 +82,6 @@ ObjectModel::polyphonic() const return (polyphonic.is_valid() && polyphonic.get_bool()); } - /** Merge the data of @a model with self, as much as possible. * * This will merge the two models, but with any conflict take the value in @@ -110,7 +101,6 @@ ObjectModel::set(SharedPtr<ObjectModel> o) } } - void ObjectModel::set_path(const Raul::Path& p) { @@ -119,7 +109,6 @@ ObjectModel::set_path(const Raul::Path& p) signal_moved.emit(); } - void ObjectModel::set_parent(SharedPtr<ObjectModel> p) { @@ -127,7 +116,6 @@ ObjectModel::set_parent(SharedPtr<ObjectModel> p) _parent = p; } - } // namespace Client } // namespace Ingen diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp index 0ee11ba1..18a136cb 100644 --- a/src/client/ObjectModel.hpp +++ b/src/client/ObjectModel.hpp @@ -38,7 +38,6 @@ namespace Client { class ClientStore; - /** Base class for all GraphObject models (NodeModel, PatchModel, PortModel). * * There are no non-const public methods intentionally, models are not allowed @@ -81,7 +80,7 @@ protected: ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path); ObjectModel(const ObjectModel& copy); - + virtual void set_path(const Raul::Path& p); virtual void set_parent(SharedPtr<ObjectModel> p); virtual void add_child(SharedPtr<ObjectModel> c) {} @@ -97,7 +96,6 @@ private: Raul::Symbol _symbol; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp index 2a722293..9a8fd994 100644 --- a/src/client/PatchModel.cpp +++ b/src/client/PatchModel.cpp @@ -29,7 +29,6 @@ using namespace Raul; namespace Ingen { namespace Client { - void PatchModel::add_child(SharedPtr<ObjectModel> c) { @@ -46,7 +45,6 @@ PatchModel::add_child(SharedPtr<ObjectModel> c) signal_new_node.emit(nm); } - bool PatchModel::remove_child(SharedPtr<ObjectModel> o) { @@ -83,7 +81,6 @@ PatchModel::remove_child(SharedPtr<ObjectModel> o) return true; } - void PatchModel::clear() { @@ -95,7 +92,6 @@ PatchModel::clear() assert(_ports.empty()); } - SharedPtr<ConnectionModel> PatchModel::get_connection(const Shared::Port* src_port, const Shared::Port* dst_port) { @@ -106,7 +102,6 @@ PatchModel::get_connection(const Shared::Port* src_port, const Shared::Port* dst return SharedPtr<ConnectionModel>(); } - /** Add a connection to this patch. * * A reference to @a cm is taken, released on deletion or removal. @@ -141,7 +136,6 @@ PatchModel::add_connection(SharedPtr<ConnectionModel> cm) } } - void PatchModel::remove_connection(const Shared::Port* src_port, const Shared::Port* dst_port) { @@ -156,7 +150,6 @@ PatchModel::remove_connection(const Shared::Port* src_port, const Shared::Port* } } - bool PatchModel::enabled() const { @@ -164,7 +157,6 @@ PatchModel::enabled() const return (enabled.is_valid() && enabled.get_bool()); } - uint32_t PatchModel::internal_poly() const { @@ -172,7 +164,6 @@ PatchModel::internal_poly() const return poly.is_valid() ? poly.get_int32() : 1; } - bool PatchModel::polyphonic() const { @@ -180,6 +171,5 @@ PatchModel::polyphonic() const return poly.is_valid() && poly.get_bool(); } - } // namespace Client } // namespace Ingen diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp index 91719df3..a62ae1bd 100644 --- a/src/client/PatchModel.hpp +++ b/src/client/PatchModel.hpp @@ -34,7 +34,6 @@ namespace Client { class ClientStore; - /** Client's model of a patch. * * \ingroup IngenClient @@ -95,7 +94,6 @@ private: bool _editable; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index aa8e2e1d..d1733b59 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -42,7 +42,6 @@ SLV2Plugins PluginModel::_slv2_plugins = NULL; Sord::World* PluginModel::_rdf_world = NULL; - PluginModel::PluginModel(Shared::LV2URIMap& uris, const URI& uri, const URI& type_uri, const Resource::Properties& properties) : ResourceImpl(uris, uri) @@ -62,7 +61,6 @@ PluginModel::PluginModel(Shared::LV2URIMap& uris, Atom(uri.substr(uri.find_last_of('#') + 1).c_str())); } - const Atom& PluginModel::get_property(const URI& key) const { @@ -131,7 +129,6 @@ PluginModel::get_property(const URI& key) const return nil; } - void PluginModel::set(SharedPtr<PluginModel> p) { @@ -151,7 +148,6 @@ PluginModel::set(SharedPtr<PluginModel> p) signal_changed.emit(); } - Symbol PluginModel::default_node_symbol() { @@ -162,7 +158,6 @@ PluginModel::default_node_symbol() return "_"; } - string PluginModel::human_name() { @@ -173,7 +168,6 @@ PluginModel::human_name() return default_node_symbol().c_str(); } - string PluginModel::port_human_name(uint32_t index) const { @@ -189,7 +183,6 @@ PluginModel::port_human_name(uint32_t index) const return ""; } - #ifdef HAVE_SLV2 bool PluginModel::has_ui() const @@ -198,7 +191,6 @@ PluginModel::has_ui() const return (slv2_values_size(uis) > 0); } - SharedPtr<PluginUI> PluginModel::ui(Ingen::Shared::World* world, SharedPtr<NodeModel> node) const { @@ -209,7 +201,6 @@ PluginModel::ui(Ingen::Shared::World* world, SharedPtr<NodeModel> node) const return ret; } - const string& PluginModel::icon_path() const { @@ -220,7 +211,6 @@ PluginModel::icon_path() const return _icon_path; } - /** RDF world mutex must be held by the caller */ string PluginModel::get_lv2_icon_path(SLV2Plugin plugin) @@ -296,6 +286,5 @@ PluginModel::port_documentation(uint32_t index) const return doc; } - } // namespace Client } // namespace Ingen diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp index 2776954c..459f9eb7 100644 --- a/src/client/PluginModel.hpp +++ b/src/client/PluginModel.hpp @@ -41,7 +41,6 @@ class PatchModel; class NodeModel; class PluginUI; - /** Model for a plugin available for loading. * * \ingroup IngenClient @@ -117,7 +116,6 @@ private: static Sord::World* _rdf_world; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp index d397f0d8..6d37ff35 100644 --- a/src/client/PluginUI.cpp +++ b/src/client/PluginUI.cpp @@ -101,7 +101,6 @@ lv2_ui_write(LV2UI_Controller controller, } } - PluginUI::PluginUI(Ingen::Shared::World* world, SharedPtr<NodeModel> node) : _world(world) @@ -110,13 +109,11 @@ PluginUI::PluginUI(Ingen::Shared::World* world, { } - PluginUI::~PluginUI() { slv2_ui_instance_free(_instance); } - SharedPtr<PluginUI> PluginUI::create(Ingen::Shared::World* world, SharedPtr<NodeModel> node, diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp index 9cc6a4db..fc90e629 100644 --- a/src/client/PluginUI.hpp +++ b/src/client/PluginUI.hpp @@ -29,7 +29,6 @@ namespace Client { class NodeModel; - /** Model for a plugin available for loading. * * \ingroup IngenClient @@ -49,7 +48,6 @@ public: uint32_t format, const void* buffer); - Ingen::Shared::World* world() const { return _world; } SharedPtr<NodeModel> node() const { return _node; } @@ -66,10 +64,8 @@ private: SharedPtr<Shared::LV2Features::FeatureArray> _features; }; - } // namespace Client } // namespace Ingen #endif // INGEN_CLIENT_PLUGINUI_HPP - diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp index 6f21351b..3afbf588 100644 --- a/src/client/PortModel.cpp +++ b/src/client/PortModel.cpp @@ -19,11 +19,9 @@ #include "PortModel.hpp" #include "NodeModel.hpp" - namespace Ingen { namespace Client { - Raul::Atom& PortModel::set_property(const Raul::URI& uri, const Raul::Atom& value) @@ -34,21 +32,18 @@ PortModel::set_property(const Raul::URI& uri, return ret; } - bool PortModel::supports(const Raul::URI& value_type) const { return has_property(_uris.atom_supports, value_type); } - bool PortModel::port_property(const std::string& uri) const { return has_property(_uris.lv2_portProperty, Raul::URI(uri)); } - void PortModel::set(SharedPtr<ObjectModel> model) { @@ -65,7 +60,6 @@ PortModel::set(SharedPtr<ObjectModel> model) ObjectModel::set(model); } - bool PortModel::has_context(const Raul::URI& uri) { @@ -76,6 +70,5 @@ PortModel::has_context(const Raul::URI& uri) return context == uri; } - } // namespace Client } // namespace Ingen diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index f41416f2..c05610e7 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -31,7 +31,6 @@ namespace Raul { class Path; } namespace Ingen { namespace Client { - /** Model of a port. * * \ingroup IngenClient @@ -114,7 +113,6 @@ private: size_t _connections; }; - } // namespace Client } // namespace Ingen diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index 8a53a2cb..a99d409c 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -26,7 +26,6 @@ namespace Ingen { namespace Client { - /** A LibSigC++ signal emitting interface for clients to use. * * This simply emits an sigc signal for every event (eg OSC message) coming from @@ -118,7 +117,6 @@ protected: { EMIT(activity, port_path); } }; - } // namespace Client } // namespace Ingen diff --git a/src/client/ThreadedSigClientInterface.cpp b/src/client/ThreadedSigClientInterface.cpp index 50b0b7e7..eb752d9f 100644 --- a/src/client/ThreadedSigClientInterface.cpp +++ b/src/client/ThreadedSigClientInterface.cpp @@ -27,7 +27,6 @@ using namespace Raul; namespace Ingen { namespace Client { - /** Push an event (from the engine, ie 'new patch') on to the queue. */ void @@ -46,7 +45,6 @@ ThreadedSigClientInterface::push_sig(Closure ev) } } - /** Process all queued events that came from the OSC thread. * * This function should be called from the Gtk thread to emit signals and cause @@ -73,6 +71,5 @@ ThreadedSigClientInterface::emit_signals() return true; } - } // namespace Client } // namespace Ingen diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index c852dfd0..08e7956e 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -34,7 +34,6 @@ namespace Ingen { namespace Shared { class EngineInterface; } namespace Client { - /** A LibSigC++ signal emitting interface for clients to use. * * This emits signals (possibly) in a different thread than the ClientInterface @@ -143,7 +142,6 @@ private: sigc::slot<void, Raul::Path> activity_slot; }; - } // namespace Client } // namespace Ingen |