From 4c509656223d3ed1f0fab504cb483090d38972f9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 6 Oct 2005 19:10:57 +0000 Subject: fix compose mess, and a number of 64 bit printf specs git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_butler.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/ardour/session_butler.cc') 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. */ -- cgit v1.2.3