Use dcp::compose rather than our own.

[dcpomatic.git] / src / lib / playlist.cc

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index e8714e9d6d4ffedac4ab9dd6fc6ae83ee1efe66b..bf2f3d7347c403159b7a6fe39e64956ced59f98a 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "util.h"
 #include "digester.h"
-#include "compose.hpp"
+#include <dcp/compose.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/bind/placeholders.hpp>
@@ -219,12 +219,12 @@ Playlist::set_from_xml (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
                        string note = _("Your project contains video content that was not aligned to a frame boundary.");
                        note += "  ";
                        if (old_pos < content->position()) {
-                               note += String::compose(
+                               note += dcp::compose(
                                        _("The file %1 has been moved %2 milliseconds later."),
                                        content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000
                                        );
                        } else {
-                               note += String::compose(
+                               note += dcp::compose(
                                        _("The file %1 has been moved %2 milliseconds earlier."),
                                        content->path_summary(), DCPTime(content->position() - old_pos).seconds() * 1000
                                        );
@@ -239,12 +239,12 @@ Playlist::set_from_xml (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
                        string note = _("Your project contains video content whose trim was not aligned to a frame boundary.");
                        note += "  ";
                        if (old_trim < content->trim_start()) {
-                               note += String::compose(
+                               note += dcp::compose(
                                        _("The file %1 has been trimmed by %2 milliseconds more."),
                                        content->path_summary(), ContentTime(content->trim_start() - old_trim).seconds() * 1000
                                        );
                        } else {
-                               note += String::compose(
+                               note += dcp::compose(
                                        _("The file %1 has been trimmed by %2 milliseconds less."),
                                        content->path_summary(), ContentTime(old_trim - content->trim_start()).seconds() * 1000
                                        );