summaryrefslogtreecommitdiffstats
path: root/src/progs/demolition
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-10-04 21:45:20 +0000
committerDavid Robillard <d@drobilla.net>2006-10-04 21:45:20 +0000
commit30cb85c307b4c1273791721a782337742ade222c (patch)
tree020932d6f50ebbcd813c58f6f23e85a293587665 /src/progs/demolition
parent32261ba465be203f973a0e126672b8d7188ba327 (diff)
downloadingen-30cb85c307b4c1273791721a782337742ade222c.tar.gz
ingen-30cb85c307b4c1273791721a782337742ade222c.tar.bz2
ingen-30cb85c307b4c1273791721a782337742ade222c.zip
Moved generic utility stuff to new library "raul".
git-svn-id: http://svn.drobilla.net/lad/ingen@156 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/demolition')
-rw-r--r--src/progs/demolition/demolition.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/progs/demolition/demolition.cpp b/src/progs/demolition/demolition.cpp
index 3693b5f3..abecd1c5 100644
--- a/src/progs/demolition/demolition.cpp
+++ b/src/progs/demolition/demolition.cpp
@@ -22,7 +22,7 @@
#include "Store.h"
#include "PatchLibrarian.h"
#include "PluginModel.h"
-#include "util/CountedPtr.h"
+#include "raul/SharedPtr.h"
#include <iostream>
#include <unistd.h>
#include <stdlib.h>
@@ -49,8 +49,8 @@ void rename_object();
// Yay globals!
-CountedPtr<OSCModelEngineInterface> engine;
-CountedPtr<Store> store;
+SharedPtr<OSCModelEngineInterface> engine;
+SharedPtr<Store> store;
// OSC listening non-threaded signal emitter
@@ -88,10 +88,10 @@ main(int argc, char** argv)
else
client_port = 0; // will choose a free port automatically
- engine = CountedPtr<ModelEngineInterface>(new OSCModelEngineInterface(engine_url));
- CountedPtr<SigClientInterface> emitter(new OSCSigEmitter(16182));
+ engine = SharedPtr<ModelEngineInterface>(new OSCModelEngineInterface(engine_url));
+ SharedPtr<SigClientInterface> emitter(new OSCSigEmitter(16182));
- store = CountedPtr<Store>(new Store(engine, emitter));
+ store = SharedPtr<Store>(new Store(engine, emitter));
engine->activate();
@@ -170,7 +170,7 @@ random_name()
Path
random_object()
{
- typedef map<Path, CountedPtr<ObjectModel> > ObjectMap;
+ typedef map<Path, SharedPtr<ObjectModel> > ObjectMap;
const ObjectMap& objects = store->objects();
@@ -190,7 +190,7 @@ random_object()
string
random_plugin()
{
- typedef map<string, CountedPtr<PluginModel> > PluginMap;
+ typedef map<string, SharedPtr<PluginModel> > PluginMap;
const PluginMap& plugins = store->plugins();