Select pasted objects.

Clean up parser debug output.


git-svn-id: http://svn.drobilla.net/lad/ingen@1425 a436a847-0d15-0410-975c-d299462d15a1

6 files changed, 13 insertions, 13 deletions

diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp
index 53314676..5f12cd6e 100644
--- a/src/libs/client/OSCClientReceiver.cpp
+++ b/src/libs/client/OSCClientReceiver.cpp
@@ -34,7 +34,7 @@ OSCClientReceiver::OSCClientReceiver(int listen_port)
 	: _listen_port(listen_port)
 	, _st(NULL)
 {
-	start(true); // true = dump, false = shutup
+	start(false); // true = dump, false = shutup
 }
 
 
diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp
index 1078a86a..b9e2a70d 100644
--- a/src/libs/engine/OSCEngineReceiver.cpp
+++ b/src/libs/engine/OSCEngineReceiver.cpp
@@ -70,7 +70,7 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
 	}
 
 	// For debugging, print all incoming OSC messages
-	lo_server_add_method(_server, NULL, NULL, generic_cb, NULL);
+	//lo_server_add_method(_server, NULL, NULL, generic_cb, NULL);
 
 	// Set response address for this message.
 	// It's important this is first and returns nonzero.
diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index b07d3a02..1abaf2c2 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -332,8 +332,6 @@ QueuedEngineInterface::set_property(const string& path,
 	} else {
 		push_queued(new SetMetadataEvent(_engine, _responder, now(), true, path, predicate, value));
 	}
-
-	cerr << "WARNING: Unknown property (or bad type) \"" << predicate << "\"" << endl;
 }
 
 // Requests //
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index e2511a4b..040cf3c7 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -579,12 +579,16 @@ PatchCanvas::paste()
 		return;
 	}
 
+	clear_selection();
+
 	Builder builder(*App::instance().engine());
 	ClientStore clipboard;
 	clipboard.new_patch("/", _patch->poly());
 	clipboard.set_plugins(App::instance().store()->plugins());
 	parser->parse_string(App::instance().world(), &clipboard, str, "/");
 	for (Store::iterator i = clipboard.begin(); i != clipboard.end(); ++i) {
+		if (i->first == "/")
+			continue;
 		/*GraphObject::Properties::iterator s = i->second->properties().find("ingen:symbol");
 		const string sym = string(s->second.get_string()) + "_copy";
 		s->second = sym;*/
@@ -594,6 +598,11 @@ PatchCanvas::paste()
 		GraphObject::Variables::iterator y = i->second->variables().find("ingenuity:canvas-y");
 		if (y != i->second->variables().end())
 			y->second = y->second.get_float() + 20.0f;
+		GraphObject::Properties::iterator s = i->second->properties().find("ingen:selected");
+		if (s != i->second->properties().end())
+			s->second = true;
+		else
+			i->second->properties().insert(make_pair("ingen:selected", true));
 		builder.build(i->second);
 	}
 }
diff --git a/src/libs/serialisation/Parser.cpp b/src/libs/serialisation/Parser.cpp
index 36086ea1..a9228f50 100644
--- a/src/libs/serialisation/Parser.cpp
+++ b/src/libs/serialisation/Parser.cpp
@@ -135,7 +135,6 @@ Parser::parse(
 	for (Redland::Query::Results::iterator i = results.begin(); i != results.end(); ++i) {
 		const Redland::Node subject = (object_uri ? subject_uri : (*i)["subject"]);
 		const Redland::Node rdf_class = (*i)["class"];
-		cout << subject.to_c_string() << " :: " << rdf_class.to_c_string() << endl;
 		if (rdf_class == patch_class || rdf_class == node_class || rdf_class == port_class) {
 			Path path = parse_path(world, model, base_uri, subject.to_c_string(), parent, symbol);
 			if (rdf_class == patch_class) {
@@ -146,7 +145,7 @@ Parser::parse(
 				ret = parse_node(world, target, model,
 						base_uri, Glib::ustring("<") + subject.to_c_string() + ">", path, data);
 			} else if (rdf_class == port_class) {
-				cout << "PORT" << endl;
+				cout << "*** TODO: PARSE PORT" << endl;
 			}
 			if (ret == false) {
 				cerr << "Failed to parse object " << object_uri << endl;
@@ -434,12 +433,6 @@ Parser::parse_node(
 		return false;
 	}
 	
-	for (Redland::Query::Results::iterator i = results.begin(); i != results.end(); ++i) {
-		const Redland::Node& s_node = (*i)["s"];
-		const Redland::Node& plug_node = (*i)["plug"];
-		cout << s_node.to_c_string() << " :: " << plug_node.to_c_string() << endl;
-	}
-
 	const Redland::Node& plugin_node = (*results.begin())["plug"];
 	if (plugin_node.type() != Redland::Node::RESOURCE) {
 		cerr << "[Parser] ERROR: node's ingen:plugin property is not a resource" << endl;
diff --git a/src/libs/shared/Builder.cpp b/src/libs/shared/Builder.cpp
index 331178f1..83e0f3d2 100644
--- a/src/libs/shared/Builder.cpp
+++ b/src/libs/shared/Builder.cpp
@@ -41,7 +41,7 @@ Builder::build(SharedPtr<const GraphObject> object)
 	SharedPtr<const Patch> patch = PtrCast<const Patch>(object);
 	if (patch) {
 		if (patch->path() != "/")
-		_interface.new_patch(patch->path() + "_copy", patch->internal_polyphony());
+			_interface.new_patch(patch->path() + "_copy", patch->internal_polyphony());
 		build_object(object);
 		for (Patch::Connections::const_iterator i = patch->connections().begin();
 				i != patch->connections().end(); ++i)