ardour/livetrax
13
0
Fork 0
Code

fix up missing ID in route state; no error message when making a port connection that already exists

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5168 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-06-11 13:56:12 +00:00
parent f8565ef570
commit 86ce59e76c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/audioengine.cc
View File

@ -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)

6
libs/ardour/route.cc
View File

@ -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 {