summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-03-26 21:59:42 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-03-26 21:59:42 +0000
commitf33c92e0c9e9fe30fcc009c27b5a51b08e5d8cef (patch)
tree9494764d5cc7fa588f333d30d709f5d89661ca13 /libs/ardour
parentc6073322c8a6b2690021d1620a2fa9a220565ed2 (diff)
provide more accurate diagnostics from AudioEngine::port_registration_failure() and use them
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4908 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/audioengine.cc4
-rw-r--r--libs/ardour/session.cc6
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 001a4d4568..cc74b92a69 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -493,9 +493,9 @@ AudioEngine::port_registration_failure (const std::string& portname)
string reason;
if (p) {
- reason = _("a port with this name already exists: check for duplicated track/bus names");
+ reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname);
} else {
- reason = _("unknown error");
+ reason = _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks.");
}
throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 426a5b3f2d..ffa8eeb572 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1873,7 +1873,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
catch (AudioEngine::PortRegistrationFailure& pfe) {
- error << _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks.") << endmsg;
+ error << pfe.what() << endmsg;
if (track) {
/* we need to get rid of this, since the track failed to be created */
@@ -2018,7 +2018,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
}
catch (AudioEngine::PortRegistrationFailure& pfe) {
- error << _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks.") << endmsg;
+ error << pfe.what() << endmsg;
goto failure;
}
@@ -2113,7 +2113,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
}
catch (AudioEngine::PortRegistrationFailure& pfe) {
- error << _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks.") << endmsg;
+ error << pfe.what() << endmsg;
goto out;
}