summaryrefslogtreecommitdiff
path: root/libs/ardour/session_butler.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-10-06 19:10:57 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-10-06 19:10:57 +0000
commit4c509656223d3ed1f0fab504cb483090d38972f9 (patch)
tree540f207b81f957fa78101d67da3094ff1e1f9456 /libs/ardour/session_butler.cc
parent5a52d8fee4c9abac7ffb1f1e6464785d979acd68 (diff)
fix compose mess, and a number of 64 bit printf specs
git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_butler.cc')
-rw-r--r--libs/ardour/session_butler.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 56000b695e..df867c8267 100644
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -78,17 +78,17 @@ Session::start_butler_thread ()
butler_should_run = false;
if (pipe (butler_request_pipe)) {
- error << compose(_("Cannot create transport request signal pipe (%1)"), strerror (errno)) << endmsg;
+ error << string_compose(_("Cannot create transport request signal pipe (%1)"), strerror (errno)) << endmsg;
return -1;
}
if (fcntl (butler_request_pipe[0], F_SETFL, O_NONBLOCK)) {
- error << compose(_("UI: cannot set O_NONBLOCK on butler request pipe (%1)"), strerror (errno)) << endmsg;
+ error << string_compose(_("UI: cannot set O_NONBLOCK on butler request pipe (%1)"), strerror (errno)) << endmsg;
return -1;
}
if (fcntl (butler_request_pipe[1], F_SETFL, O_NONBLOCK)) {
- error << compose(_("UI: cannot set O_NONBLOCK on butler request pipe (%1)"), strerror (errno)) << endmsg;
+ error << string_compose(_("UI: cannot set O_NONBLOCK on butler request pipe (%1)"), strerror (errno)) << endmsg;
return -1;
}
@@ -186,7 +186,7 @@ Session::butler_thread_work ()
continue;
}
- error << compose (_("poll on butler request pipe failed (%1)"),
+ error << string_compose (_("poll on butler request pipe failed (%1)"),
strerror (errno))
<< endmsg;
break;
@@ -269,7 +269,7 @@ Session::butler_thread_work ()
default:
compute_io = false;
- error << compose(_("Butler read ahead failure on dstream %1"), (*i)->name()) << endmsg;
+ error << string_compose(_("Butler read ahead failure on dstream %1"), (*i)->name()) << endmsg;
break;
}
@@ -313,7 +313,7 @@ Session::butler_thread_work ()
default:
err++;
compute_io = false;
- error << compose(_("Butler write-behind failure on dstream %1"), (*i)->name()) << endmsg;
+ error << string_compose(_("Butler write-behind failure on dstream %1"), (*i)->name()) << endmsg;
/* don't break - try to flush all streams in case they
are split across disks.
*/