From b853b3dde1f7028dd275f78433a6ad9b5b9f61c7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 8 Sep 2006 23:15:42 +0000 Subject: More cleanups git-svn-id: http://svn.drobilla.net/lad/ingen@122 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/client/Store.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'src/libs/client/Store.cpp') diff --git a/src/libs/client/Store.cpp b/src/libs/client/Store.cpp index 219ea13f..7fd011b7 100644 --- a/src/libs/client/Store.cpp +++ b/src/libs/client/Store.cpp @@ -27,24 +27,21 @@ namespace Ingen { namespace Client { -/// Singleton instance -Store* Store::_instance = 0; - -Store::Store(SigClientInterface& emitter) +Store::Store(CountedPtr emitter) { //emitter.new_plugin_sig.connect(sigc::mem_fun(this, &Store::add_plugin)); - emitter.object_destroyed_sig.connect(sigc::mem_fun(this, &Store::destruction_event)); - emitter.new_plugin_sig.connect(sigc::mem_fun(this, &Store::new_plugin_event)); - emitter.new_patch_sig.connect(sigc::mem_fun(this, &Store::new_patch_event)); - emitter.new_node_sig.connect(sigc::mem_fun(this, &Store::new_node_event)); - emitter.new_port_sig.connect(sigc::mem_fun(this, &Store::new_port_event)); - emitter.patch_enabled_sig.connect(sigc::mem_fun(this, &Store::patch_enabled_event)); - emitter.patch_disabled_sig.connect(sigc::mem_fun(this, &Store::patch_disabled_event)); - emitter.connection_sig.connect(sigc::mem_fun(this, &Store::connection_event)); - emitter.disconnection_sig.connect(sigc::mem_fun(this, &Store::disconnection_event)); - emitter.metadata_update_sig.connect(sigc::mem_fun(this, &Store::metadata_update_event)); - emitter.control_change_sig.connect(sigc::mem_fun(this, &Store::control_change_event)); + emitter->object_destroyed_sig.connect(sigc::mem_fun(this, &Store::destruction_event)); + emitter->new_plugin_sig.connect(sigc::mem_fun(this, &Store::new_plugin_event)); + emitter->new_patch_sig.connect(sigc::mem_fun(this, &Store::new_patch_event)); + emitter->new_node_sig.connect(sigc::mem_fun(this, &Store::new_node_event)); + emitter->new_port_sig.connect(sigc::mem_fun(this, &Store::new_port_event)); + emitter->patch_enabled_sig.connect(sigc::mem_fun(this, &Store::patch_enabled_event)); + emitter->patch_disabled_sig.connect(sigc::mem_fun(this, &Store::patch_disabled_event)); + emitter->connection_sig.connect(sigc::mem_fun(this, &Store::connection_event)); + emitter->disconnection_sig.connect(sigc::mem_fun(this, &Store::disconnection_event)); + emitter->metadata_update_sig.connect(sigc::mem_fun(this, &Store::metadata_update_event)); + emitter->control_change_sig.connect(sigc::mem_fun(this, &Store::control_change_event)); } -- cgit v1.2.1