projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_content.cc
diff --git
a/src/lib/dcp_subtitle_content.cc
b/src/lib/dcp_subtitle_content.cc
index b361b941907551b160913bbe4121d872c8187661..e7057efc4b59528585e77965d88233d52275cf7b 100644
(file)
--- a/
src/lib/dcp_subtitle_content.cc
+++ b/
src/lib/dcp_subtitle_content.cc
@@
-28,7
+28,6
@@
#include <dcp/interop_load_font_node.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
#include <dcp/interop_load_font_node.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include "i18n.h"
#include "i18n.h"
@@
-36,7
+35,6
@@
using std::string;
using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-using boost::make_shared;
DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
: Content (film, path)
DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
: Content (film, path)
@@
-78,7
+76,7
@@
DCPSubtitleContent::examine (shared_ptr<Job> job)
_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
- subtitle->add_font (
boost::make_shared<Font> (i->id
));
+ subtitle->add_font (
shared_ptr<Font> (new Font (i->id)
));
}
}
}
}