diff options
Diffstat (limited to 'src/lib/butler.cc')
| -rw-r--r-- | src/lib/butler.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 5a8e646aa..3edad6978 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -25,9 +25,9 @@ #include "log.h" #include "dcpomatic_log.h" #include "cross.h" -#include "compose.hpp" #include "exceptions.h" #include "video_content.h" +#include <dcp/compose.h> using std::cout; @@ -138,10 +138,10 @@ Butler::should_run () const optional<DCPTime> pos = _audio.peek(); if (pos) { throw ProgrammingError - (__FILE__, __LINE__, String::compose ("Butler video buffers reached %1 frames (audio is %2 at %3)", _video.size(), _audio.size(), pos->get())); + (__FILE__, __LINE__, dcp::compose ("Butler video buffers reached %1 frames (audio is %2 at %3)", _video.size(), _audio.size(), pos->get())); } else { throw ProgrammingError - (__FILE__, __LINE__, String::compose ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size())); + (__FILE__, __LINE__, dcp::compose ("Butler video buffers reached %1 frames (audio is %2)", _video.size(), _audio.size())); } } @@ -150,10 +150,10 @@ Butler::should_run () const optional<DCPTime> pos = _audio.peek(); if (pos) { throw ProgrammingError - (__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames at %2 (video is %3)", _audio.size(), pos->get(), _video.size())); + (__FILE__, __LINE__, dcp::compose ("Butler audio buffers reached %1 frames at %2 (video is %3)", _audio.size(), pos->get(), _video.size())); } else { throw ProgrammingError - (__FILE__, __LINE__, String::compose ("Butler audio buffers reached %1 frames (video is %3)", _audio.size(), _video.size())); + (__FILE__, __LINE__, dcp::compose ("Butler audio buffers reached %1 frames (video is %3)", _audio.size(), _video.size())); } } @@ -470,7 +470,7 @@ Butler::Error::summary () const case Error::AGAIN: return "Butler not ready"; case Error::DIED: - return String::compose("Butler died (%1)", message); + return dcp::compose("Butler died (%1)", message); case Error::FINISHED: return "Butler finished"; } |