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/shared | |
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/shared')
-rw-r--r-- | src/shared/Builder.cpp | 5 | ||||
-rw-r--r-- | src/shared/Builder.hpp | 2 | ||||
-rw-r--r-- | src/shared/ClashAvoider.cpp | 11 | ||||
-rw-r--r-- | src/shared/ClashAvoider.hpp | 2 | ||||
-rw-r--r-- | src/shared/HTTPSender.cpp | 6 | ||||
-rw-r--r-- | src/shared/HTTPSender.hpp | 1 | ||||
-rw-r--r-- | src/shared/LV2Atom.cpp | 3 | ||||
-rw-r--r-- | src/shared/LV2Features.cpp | 5 | ||||
-rw-r--r-- | src/shared/LV2URIMap.cpp | 9 | ||||
-rw-r--r-- | src/shared/LV2URIMap.hpp | 8 | ||||
-rw-r--r-- | src/shared/Module.hpp | 1 | ||||
-rw-r--r-- | src/shared/OSCSender.cpp | 7 | ||||
-rw-r--r-- | src/shared/OSCSender.hpp | 1 | ||||
-rw-r--r-- | src/shared/ResourceImpl.cpp | 12 | ||||
-rw-r--r-- | src/shared/ResourceImpl.hpp | 1 | ||||
-rw-r--r-- | src/shared/Store.cpp | 6 | ||||
-rw-r--r-- | src/shared/Store.hpp | 2 | ||||
-rw-r--r-- | src/shared/World.cpp | 12 | ||||
-rw-r--r-- | src/shared/World.hpp | 4 |
19 files changed, 5 insertions, 93 deletions
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp index 369be71b..5ea97732 100644 --- a/src/shared/Builder.cpp +++ b/src/shared/Builder.cpp @@ -31,14 +31,12 @@ using namespace Raul; namespace Ingen { namespace Shared { - Builder::Builder(SharedPtr<Shared::LV2URIMap> uris, CommonInterface& interface) : _uris(uris) , _interface(interface) { } - void Builder::build(SharedPtr<const GraphObject> object) { @@ -78,7 +76,6 @@ Builder::build(SharedPtr<const GraphObject> object) } } - void Builder::connect(SharedPtr<const GraphObject> object) { @@ -92,7 +89,6 @@ Builder::connect(SharedPtr<const GraphObject> object) } } - void Builder::build_object(SharedPtr<const GraphObject> object) { @@ -100,6 +96,5 @@ Builder::build_object(SharedPtr<const GraphObject> object) _interface.put(object->uri(), object->properties()); } - } // namespace Shared } // namespace Ingen diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp index f4e5e8c7..e64d1a2f 100644 --- a/src/shared/Builder.hpp +++ b/src/shared/Builder.hpp @@ -29,7 +29,6 @@ class CommonInterface; class GraphObject; class LV2URIMap; - /** Wrapper for CommonInterface to create existing objects/models. * * \ingroup interface @@ -50,7 +49,6 @@ private: CommonInterface& _interface; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp index 9009fe96..8ac78422 100644 --- a/src/shared/ClashAvoider.cpp +++ b/src/shared/ClashAvoider.cpp @@ -27,7 +27,6 @@ using namespace Raul; namespace Ingen { namespace Shared { - const URI ClashAvoider::map_uri(const Raul::URI& in) { @@ -37,7 +36,6 @@ ClashAvoider::map_uri(const Raul::URI& in) return in; } - const Path ClashAvoider::map_path(const Raul::Path& in) { @@ -130,7 +128,6 @@ ClashAvoider::map_path(const Raul::Path& in) } } - bool ClashAvoider::exists(const Raul::Path& path) const { @@ -144,7 +141,6 @@ ClashAvoider::exists(const Raul::Path& path) const return false; } - void ClashAvoider::put(const Raul::URI& path, const Shared::Resource::Properties& properties, @@ -153,7 +149,6 @@ ClashAvoider::put(const Raul::URI& path, _target.put(map_uri(path), properties, ctx); } - void ClashAvoider::delta(const Raul::URI& path, const Shared::Resource::Properties& remove, @@ -162,7 +157,6 @@ ClashAvoider::delta(const Raul::URI& path, _target.delta(map_uri(path), remove, add); } - void ClashAvoider::move(const Raul::Path& old_path, const Raul::Path& new_path) @@ -170,7 +164,6 @@ ClashAvoider::move(const Raul::Path& old_path, _target.move(map_path(old_path), map_path(new_path)); } - void ClashAvoider::connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) @@ -178,7 +171,6 @@ ClashAvoider::connect(const Raul::Path& src_port_path, _target.connect(map_path(src_port_path), map_path(dst_port_path)); } - void ClashAvoider::disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) @@ -186,7 +178,6 @@ ClashAvoider::disconnect(const Raul::Path& src_port_path, _target.disconnect(map_path(src_port_path), map_path(dst_port_path)); } - void ClashAvoider::set_property(const Raul::URI& subject, const Raul::URI& predicate, @@ -195,13 +186,11 @@ ClashAvoider::set_property(const Raul::URI& subject, _target.set_property(map_uri(subject), predicate, value); } - void ClashAvoider::del(const Raul::Path& path) { _target.del(map_path(path)); } - } // namespace Shared } // namespace Ingen diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp index dd5987ca..7ffcf9b9 100644 --- a/src/shared/ClashAvoider.hpp +++ b/src/shared/ClashAvoider.hpp @@ -30,7 +30,6 @@ namespace Shared { class Store; - /** A wrapper for a CommonInterface that creates objects but possibly maps * symbol names to avoid clashes with the existing objects in a store. */ @@ -88,7 +87,6 @@ private: SymbolMap _symbol_map; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/HTTPSender.cpp b/src/shared/HTTPSender.cpp index 4a3db5d3..66406bdd 100644 --- a/src/shared/HTTPSender.cpp +++ b/src/shared/HTTPSender.cpp @@ -34,7 +34,6 @@ using namespace Raul; namespace Ingen { namespace Shared { - HTTPSender::HTTPSender() : _listen_port(-1) , _listen_sock(-1) @@ -81,7 +80,6 @@ HTTPSender::HTTPSender() start(); } - HTTPSender::~HTTPSender() { stop(); @@ -121,7 +119,6 @@ HTTPSender::_run() _listen_sock = -1; } - void HTTPSender::bundle_begin() { @@ -130,7 +127,6 @@ HTTPSender::bundle_begin() _transfer = ""; } - void HTTPSender::bundle_end() { @@ -141,7 +137,6 @@ HTTPSender::bundle_end() _mutex.unlock(); } - void HTTPSender::send_chunk(const std::string& buf) { @@ -156,6 +151,5 @@ HTTPSender::send_chunk(const std::string& buf) } } - } // namespace Shared } // namespace Ingen diff --git a/src/shared/HTTPSender.hpp b/src/shared/HTTPSender.hpp index 486f84dd..90d03f7d 100644 --- a/src/shared/HTTPSender.hpp +++ b/src/shared/HTTPSender.hpp @@ -58,7 +58,6 @@ protected: std::string _transfer; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp index aa004f6f..994fe51d 100644 --- a/src/shared/LV2Atom.cpp +++ b/src/shared/LV2Atom.cpp @@ -30,7 +30,6 @@ namespace Ingen { namespace Shared { namespace LV2Atom { - bool to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom) { @@ -50,7 +49,6 @@ to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom) return false; } - /** Convert an atom to an LV2 object, if possible. * object->size should be the capacity of the object (not including header) */ @@ -89,7 +87,6 @@ from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* objec return true; } - } // namespace LV2Atom } // namespace Shared diff --git a/src/shared/LV2Features.cpp b/src/shared/LV2Features.cpp index 4b8fa1c5..0842c702 100644 --- a/src/shared/LV2Features.cpp +++ b/src/shared/LV2Features.cpp @@ -25,12 +25,10 @@ using namespace std; namespace Ingen { namespace Shared { - LV2Features::LV2Features() { } - SharedPtr<LV2Features::Feature> LV2Features::feature(const std::string& uri) { @@ -41,14 +39,12 @@ LV2Features::feature(const std::string& uri) return SharedPtr<Feature>(); } - void LV2Features::add_feature(const std::string& uri, SharedPtr<Feature> feature) { _features.insert(make_pair(uri, feature)); } - SharedPtr<LV2Features::FeatureArray> LV2Features::lv2_features(Shared::World* world, Node* node) const { @@ -61,6 +57,5 @@ LV2Features::lv2_features(Shared::World* world, Node* node) const return SharedPtr<FeatureArray>(new FeatureArray(vec)); } - } // namespace Shared } // namespace Ingen diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp index b7ad7b07..2489bef0 100644 --- a/src/shared/LV2URIMap.cpp +++ b/src/shared/LV2URIMap.cpp @@ -37,7 +37,6 @@ using namespace Raul; namespace Ingen { namespace Shared { - LV2URIMap::Quark::Quark(const char* c_str) : Raul::URI(c_str) , id(g_quark_from_string(c_str)) @@ -130,10 +129,8 @@ LV2URIMap::LV2URIMap() _unmap_feature = SharedPtr<UnmapFeature>(new UnmapFeature(*this)); } - struct null_deleter { void operator()(void const *) const {} }; - uint32_t LV2URIMap::uri_to_id(const char* map, const char* uri) @@ -159,7 +156,6 @@ LV2URIMap::uri_to_id(const char* map, } } - const char* LV2URIMap::id_to_uri(const char* map, const uint32_t id) @@ -176,7 +172,6 @@ LV2URIMap::id_to_uri(const char* map, } } - std::pair<bool, uint32_t> LV2URIMap::event_to_global(uint16_t event_id) const { @@ -187,7 +182,6 @@ LV2URIMap::event_to_global(uint16_t event_id) const return std::make_pair(true, i->second); } - std::pair<bool, uint16_t> LV2URIMap::global_to_event(uint32_t global_id) const { @@ -198,7 +192,6 @@ LV2URIMap::global_to_event(uint32_t global_id) const return std::make_pair(true, i->second); } - uint32_t LV2URIMap::uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data, const char* map, @@ -208,7 +201,6 @@ LV2URIMap::uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data, return me->uri_to_id(map, uri); } - const char* LV2URIMap::uri_unmap_id_to_uri(LV2_URI_Map_Callback_Data callback_data, const char* map, @@ -218,6 +210,5 @@ LV2URIMap::uri_unmap_id_to_uri(LV2_URI_Map_Callback_Data callback_data, return me->id_to_uri(map, id); } - } // namespace Shared } // namespace Ingen diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp index 20957a6a..21782b42 100644 --- a/src/shared/LV2URIMap.hpp +++ b/src/shared/LV2URIMap.hpp @@ -34,7 +34,6 @@ namespace Ingen { namespace Shared { - /** Implementation of the LV2 URI Map and URI Unmap extensions */ class LV2URIMap : public boost::noncopyable, public LV2Features::Feature { @@ -47,7 +46,7 @@ public: struct UnmapFeature : public LV2Features::Feature { UnmapFeature(const LV2URIMap& map) : _feature(map.uri_unmap_feature) {} - + SharedPtr<LV2_Feature> feature(Shared::World*, Node*) { return SharedPtr<LV2_Feature>(&_feature, NullDeleter<LV2_Feature>); } @@ -56,7 +55,7 @@ public: }; SharedPtr<UnmapFeature> unmap_feature() { return _unmap_feature; } - + virtual uint32_t uri_to_id(const char* map, const char* uri); virtual const char* id_to_uri(const char* map, uint32_t id); @@ -85,7 +84,7 @@ private: EventToGlobal _event_to_global; GlobalToEvent _global_to_event; - + public: struct Quark : public Raul::URI { Quark(const char* str); @@ -151,7 +150,6 @@ public: const Quark wildcard; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/Module.hpp b/src/shared/Module.hpp index af5732af..ce78591a 100644 --- a/src/shared/Module.hpp +++ b/src/shared/Module.hpp @@ -42,7 +42,6 @@ struct Module { SharedPtr<Glib::Module> library; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/OSCSender.cpp b/src/shared/OSCSender.cpp index bbe4c03e..1f2a0412 100644 --- a/src/shared/OSCSender.cpp +++ b/src/shared/OSCSender.cpp @@ -28,7 +28,6 @@ using namespace Raul; namespace Ingen { namespace Shared { - OSCSender::OSCSender() : _send_state(Immediate) , _transfer(NULL) @@ -37,7 +36,6 @@ OSCSender::OSCSender() { } - void OSCSender::bundle_begin() { @@ -48,14 +46,12 @@ OSCSender::bundle_begin() _send_state = SendingBundle; } - void OSCSender::bundle_end() { transfer_end(); } - void OSCSender::transfer_begin() { @@ -66,7 +62,6 @@ OSCSender::transfer_begin() _send_state = SendingTransfer; } - void OSCSender::transfer_end() { @@ -77,7 +72,6 @@ OSCSender::transfer_end() _send_state = Immediate; } - int OSCSender::send(const char *path, const char *types, ...) { @@ -104,7 +98,6 @@ OSCSender::send(const char *path, const char *types, ...) return ret; } - void OSCSender::send_message(const char* path, lo_message msg) { diff --git a/src/shared/OSCSender.hpp b/src/shared/OSCSender.hpp index 157f4c6a..44c944bf 100644 --- a/src/shared/OSCSender.hpp +++ b/src/shared/OSCSender.hpp @@ -51,7 +51,6 @@ protected: bool _enabled; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/ResourceImpl.cpp b/src/shared/ResourceImpl.cpp index 8b8a56ec..8bfa39d3 100644 --- a/src/shared/ResourceImpl.cpp +++ b/src/shared/ResourceImpl.cpp @@ -26,7 +26,6 @@ using namespace Raul; namespace Ingen { namespace Shared { - void ResourceImpl::add_property(const Raul::URI& uri, const Raul::Atom& value) { @@ -40,7 +39,6 @@ ResourceImpl::add_property(const Raul::URI& uri, const Raul::Atom& value) _properties.insert(make_pair(uri, value)); } - Raul::Atom& ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value) { @@ -48,7 +46,6 @@ ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value) return _properties.insert(make_pair(uri, value))->second; } - void ResourceImpl::remove_property(const Raul::URI& uri, const Raul::Atom& value) { @@ -65,7 +62,6 @@ ResourceImpl::remove_property(const Raul::URI& uri, const Raul::Atom& value) } } - bool ResourceImpl::has_property(const Raul::URI& uri, const Raul::Atom& value) const { @@ -78,14 +74,12 @@ ResourceImpl::has_property(const Raul::URI& uri, const Raul::Atom& value) const return false; } - Raul::Atom& ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value) const { return const_cast<ResourceImpl*>(this)->set_property(uri, value); } - const Raul::Atom& ResourceImpl::get_property(const Raul::URI& uri) const { @@ -94,7 +88,6 @@ ResourceImpl::get_property(const Raul::URI& uri) const return (i != _properties.end()) ? i->second : nil; } - bool ResourceImpl::type( const LV2URIMap& uris, @@ -156,7 +149,6 @@ ResourceImpl::type( } } - void ResourceImpl::set_properties(const Properties& p) { @@ -167,7 +159,6 @@ ResourceImpl::set_properties(const Properties& p) add_property(i->first, i->second); } - void ResourceImpl::add_properties(const Properties& p) { @@ -176,7 +167,6 @@ ResourceImpl::add_properties(const Properties& p) add_property(i->first, i->second); } - void ResourceImpl::remove_properties(const Properties& p) { @@ -196,7 +186,6 @@ ResourceImpl::remove_properties(const Properties& p) } } - void ResourceImpl::dump(std::ostream& os) const { @@ -208,7 +197,6 @@ ResourceImpl::dump(std::ostream& os) const os << "]" << endl; } - Resource::Properties ResourceImpl::properties(Resource::Graph ctx) const { diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp index 75b58d21..b9ad655f 100644 --- a/src/shared/ResourceImpl.hpp +++ b/src/shared/ResourceImpl.hpp @@ -77,7 +77,6 @@ private: mutable Properties _properties; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/Store.cpp b/src/shared/Store.cpp index fc366376..8fd4c578 100644 --- a/src/shared/Store.cpp +++ b/src/shared/Store.cpp @@ -29,7 +29,6 @@ using namespace Raul; namespace Ingen { namespace Shared { - void Store::add(GraphObject* o) { @@ -48,7 +47,6 @@ Store::add(GraphObject* o) } } - Store::const_iterator Store::children_begin(SharedPtr<Shared::GraphObject> o) const { @@ -58,7 +56,6 @@ Store::children_begin(SharedPtr<Shared::GraphObject> o) const return parent; } - Store::const_iterator Store::children_end(SharedPtr<Shared::GraphObject> o) const { @@ -67,7 +64,6 @@ Store::children_end(SharedPtr<Shared::GraphObject> o) const return find_descendants_end(parent); } - SharedPtr<Shared::GraphObject> Store::find_child(SharedPtr<Shared::GraphObject> parent, const string& child_name) const { @@ -81,7 +77,6 @@ Store::find_child(SharedPtr<Shared::GraphObject> parent, const string& child_nam return SharedPtr<Shared::GraphObject>(); } - unsigned Store::child_name_offset(const Raul::Path& parent, const Raul::Symbol& symbol, @@ -105,6 +100,5 @@ Store::child_name_offset(const Raul::Path& parent, return offset; } - } // namespace Shared } // namespace Ingen diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp index 5a019a5c..8a9f6394 100644 --- a/src/shared/Store.hpp +++ b/src/shared/Store.hpp @@ -26,7 +26,6 @@ namespace Ingen { namespace Shared { - class Store : public Raul::PathTable< SharedPtr<Shared::GraphObject> > { public: virtual ~Store() {} @@ -51,7 +50,6 @@ private: Glib::RWLock _lock; }; - } // namespace Shared } // namespace Ingen diff --git a/src/shared/World.cpp b/src/shared/World.cpp index 6667cb9f..a0ba895b 100644 --- a/src/shared/World.cpp +++ b/src/shared/World.cpp @@ -75,7 +75,7 @@ load_module(const string& name) // Try default directory if not found module = new Glib::Module(Shared::module_path(name), Glib::MODULE_BIND_LAZY); - + // FIXME: SEGV on exit without this module->make_resident(); @@ -94,7 +94,6 @@ load_module(const string& name) } } - class WorldImpl : public boost::noncopyable { public: WorldImpl(Raul::Configuration* conf, int& a_argc, char**& a_argv) @@ -181,13 +180,11 @@ public: std::string jack_uuid; }; - World::World(Raul::Configuration* conf, int& argc, char**& argv) : _impl(new WorldImpl(conf, argc, argv)) { } - World::~World() { unload_all(); @@ -217,7 +214,6 @@ SLV2World World::slv2_world() { return _impl->slv2_world; } Sord::World* World::rdf_world() { return _impl->rdf_world; } SharedPtr<LV2URIMap> World::uris() { return _impl->uris; } - /** Load an Ingen module. * @return true on success, false on failure */ @@ -238,7 +234,6 @@ World::load(const char* name) } } - /** Unload all loaded Ingen modules. */ void @@ -247,7 +242,6 @@ World::unload_all() _impl->modules.clear(); } - /** Get an interface for a remote engine at @a url */ SharedPtr<Ingen::Shared::EngineInterface> @@ -263,7 +257,6 @@ World::interface(const std::string& url) return i->second(this, url); } - /** Run a script of type @a mime_type at filename @a filename */ bool World::run(const std::string& mime_type, const std::string& filename) @@ -283,20 +276,17 @@ World::add_interface_factory(const std::string& scheme, InterfaceFactory factory _impl->interface_factories.insert(make_pair(scheme, factory)); } - void World::set_jack_uuid(const std::string& uuid) { _impl->jack_uuid = uuid; } - std::string World::jack_uuid() { return _impl->jack_uuid; } - } // namespace Shared } // namespace Ingen diff --git a/src/shared/World.hpp b/src/shared/World.hpp index 29209f9f..0608841d 100644 --- a/src/shared/World.hpp +++ b/src/shared/World.hpp @@ -47,7 +47,6 @@ class LV2URIMap; class Store; class WorldImpl; - /** The "world" all Ingen modules may share. * * All loaded components of Ingen, as well as things requiring shared access @@ -70,7 +69,7 @@ public: virtual void add_interface_factory(const std::string& scheme, InterfaceFactory factory); - + virtual SharedPtr<Ingen::Shared::EngineInterface> interface( const std::string& engine_url); @@ -109,7 +108,6 @@ private: WorldImpl* _impl; }; - } // namespace Shared } // namespace Ingen |