From 86ce59e76c60079ff6609a3da4b61937aa8318dd Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Jun 2009 13:56:12 +0000
Subject: [PATCH] fix up missing ID in route state; no error message when
 making a port connection that already exists

git-svn-id: svn://localhost/ardour2/branches/3.0@5168 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/audioengine.cc | 4 +---
 libs/ardour/route.cc       | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index b563537cb3..4e2d97f718 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -716,9 +716,7 @@ AudioEngine::connect (const string& source, const string& destination)
 	}
 	
 	if (ret > 0) {
-		error << string_compose(_("AudioEngine: connection already exists: %1 (%2) to %3 (%4)"), 
-					source, s, destination, d) 
-		      << endmsg;
+		/* already exists - no error, no warning */
 	} else if (ret < 0) {
 		error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), 
 					source, s, destination, d) 
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index e7d68c4884..36b0a6bf68 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1388,6 +1388,8 @@ Route::state(bool full_state)
 	ProcessorList::iterator i;
 	char buf[32];
 
+	id().print (buf, sizeof (buf));
+	node->add_property("id", buf);
 	node->add_property ("name", _name);
 	node->add_property("default-type", _default_type.to_string());
 
@@ -1477,6 +1479,10 @@ Route::_set_state (const XMLNode& node, bool call_base)
 		Route::set_name (prop->value());
 	} 
 
+	if ((prop = node.property ("id")) != 0) {
+		_id = prop->value ();
+	}
+
 	if ((prop = node.property (X_("flags"))) != 0) {
 		_flags = Flag (string_2_enum (prop->value(), _flags));
 	} else {