summaryrefslogtreecommitdiffstats
path: root/src/server/Broadcaster.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-12 23:38:03 +0000
committerDavid Robillard <d@drobilla.net>2013-01-12 23:38:03 +0000
commitdf1447c665e6c3631961297a9d3e9aff4e94c47f (patch)
treec0ff117c362e6d571f430f886ab62f372b59af08 /src/server/Broadcaster.hpp
parentbb335dca695273622b7a4ebbefbe9e089edb9ab4 (diff)
downloadingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.gz
ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.bz2
ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.zip
Remove Raul::SharedPtr and switch to std::shared_ptr.
Use project local short type aliases for shared_ptr and friends. Move Raul::Disposable and Raul::Manageable into Raul::Maid. Use sets to store machina nodes and edges to avoid O(n) searches. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/Broadcaster.hpp')
-rw-r--r--src/server/Broadcaster.hpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 33b438e5..3162742b 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -23,9 +23,8 @@
#include <glibmm/thread.h>
-#include "raul/SharedPtr.hpp"
-
#include "ingen/Interface.hpp"
+#include "ingen/types.hpp"
#include "BlockFactory.hpp"
@@ -45,7 +44,7 @@ public:
Broadcaster() : _bundle_depth(0) {}
~Broadcaster();
- void register_client(const Raul::URI& uri, SharedPtr<Interface> client);
+ void register_client(const Raul::URI& uri, SPtr<Interface> client);
bool unregister_client(const Raul::URI& uri);
/** A handle that represents a transfer of possibly several changes.
@@ -68,7 +67,7 @@ public:
Broadcaster& broadcaster;
};
- SharedPtr<Interface> client(const Raul::URI& uri);
+ SPtr<Interface> client(const Raul::URI& uri);
void send_plugins(const BlockFactory::Plugins& plugin_list);
void send_plugins_to(Interface*, const BlockFactory::Plugins& plugin_list);
@@ -134,7 +133,7 @@ public:
private:
friend class Transfer;
- typedef std::map< Raul::URI, SharedPtr<Interface> > Clients;
+ typedef std::map< Raul::URI, SPtr<Interface> > Clients;
Glib::Mutex _clients_mutex;
Clients _clients;