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
/
content.cc
diff --git
a/src/lib/content.cc
b/src/lib/content.cc
index 49ab944be54c79c3d478469ad09762a9555768fe..d2d8208dec654e61c5b914669fbf33b503dfc8d3 100644
(file)
--- a/
src/lib/content.cc
+++ b/
src/lib/content.cc
@@
-34,7
+34,7
@@
#include "exceptions.h"
#include "film.h"
#include "job.h"
#include "exceptions.h"
#include "film.h"
#include "job.h"
-#include
"compose.hpp"
+#include
<dcp/compose.h>
#include <dcp/locale_convert.h>
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <dcp/locale_convert.h>
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
@@
-304,9
+304,9
@@
Content::clone () const
string
Content::technical_summary () const
{
string
Content::technical_summary () const
{
- auto s =
String
::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+ auto s =
dcp
::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
if (_video_frame_rate) {
if (_video_frame_rate) {
- s +=
String
::compose(" %1", *_video_frame_rate);
+ s +=
dcp
::compose(" %1", *_video_frame_rate);
}
return s;
}
}
return s;
}