From 46e5de590817756b21a7a5d99bd4963df343f455 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 20 Feb 2010 21:52:36 +0000 Subject: Heavy overhaul of buffer management and polyphony. * Working polyphony when nodes are instantiated at desired polyphony level (dynamic still doesn't work) * Use shared silent buffer for disconnected audio inputs (save memory) * Eliminate redundant patch compiling on delete and disconnect-all events that have child events * Fix a ton of crash bugs and other issues I've since forgotten git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2468 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/ClientStore.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/client/ClientStore.cpp') diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index b12cdd7b..8a6e008b 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -249,10 +249,10 @@ void ClientStore::put(const URI& uri, const Resource::Properties& properties) { typedef Resource::Properties::const_iterator iterator; - LOG(debug) << "PUT " << uri << " {" << endl; + /*LOG(info) << "PUT " << uri << " {" << endl; for (iterator i = properties.begin(); i != properties.end(); ++i) - LOG(debug) << " " << i->first << " = " << i->second << " :: " << i->second.type() << endl; - LOG(debug) << "}" << endl; + LOG(info) << " " << i->first << " = " << i->second << " :: " << i->second.type() << endl; + LOG(info) << "}" << endl;*/ bool is_path = Path::is_valid(uri.str()); bool is_meta = ResourceImpl::is_meta_uri(uri); @@ -292,11 +292,7 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties) ResourceImpl::type(properties, is_patch, is_node, is_port, is_output, data_type); if (is_patch) { - uint32_t poly = 1; - iterator p = properties.find(uris.ingen_polyphony); - if (p != properties.end() && p->second.is_valid() && p->second.type() == Atom::INT) - poly = p->second.get_int32(); - SharedPtr model(new PatchModel(path, poly)); + SharedPtr model(new PatchModel(path)); model->set_properties(properties); add_object(model); } else if (is_node) { @@ -340,6 +336,13 @@ ClientStore::put(const URI& uri, const Resource::Properties& properties) void ClientStore::delta(const URI& uri, const Resource::Properties& remove, const Resource::Properties& add) { + typedef Resource::Properties::const_iterator iterator; + /*LOG(info) << "DELTA " << uri << " {" << endl; + for (iterator i = remove.begin(); i != remove.end(); ++i) + LOG(info) << " - " << i->first << " = " << i->second << " :: " << i->second.type() << endl; + for (iterator i = add.begin(); i != add.end(); ++i) + LOG(info) << " + " << i->first << " = " << i->second << " :: " << i->second.type() << endl; + LOG(info) << "}" << endl;*/ bool is_meta = ResourceImpl::is_meta_uri(uri); string path_str = is_meta ? (string("/") + uri.chop_start("#")) : uri.str(); if (!Path::is_valid(path_str)) { -- cgit v1.2.1