projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dcp::compose rather than our own.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 3502c3346c48072824f04f22936dba0fcc04ba83..463a3c7bd2f48543bb1a45fe7dd418c057c78c97 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-25,7
+25,6
@@
#include "analytics.h"
#include "analytics.h"
-#include "compose.hpp"
#include "config.h"
#include "dcp_encoder.h"
#include "dcpomatic_log.h"
#include "config.h"
#include "dcp_encoder.h"
#include "dcpomatic_log.h"
@@
-35,6
+34,7
@@
#include "log.h"
#include "transcode_job.h"
#include "upload_job.h"
#include "log.h"
#include "transcode_job.h"
#include "upload_job.h"
+#include <dcp/compose.h>
#include <iomanip>
#include <iostream>
#include <iomanip>
#include <iostream>
@@
-68,7
+68,7
@@
TranscodeJob::~TranscodeJob ()
string
TranscodeJob::name () const
{
string
TranscodeJob::name () const
{
- return
String
::compose (_("Transcoding %1"), _film->name());
+ return
dcp
::compose (_("Transcoding %1"), _film->name());
}
}