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]
/
test
/
ssa_subtitle_test.cc
diff --git
a/test/ssa_subtitle_test.cc
b/test/ssa_subtitle_test.cc
index 0bfa39e747487416babc67c8f221335ff5d47468..f6c65b1af67d34008744d868cc30b38bb4dfde40 100644
(file)
--- a/
test/ssa_subtitle_test.cc
+++ b/
test/ssa_subtitle_test.cc
@@
-27,13
+27,11
@@
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/make_shared.hpp>
#include <list>
using std::string;
using std::list;
using boost::shared_ptr;
#include <list>
using std::string;
using std::list;
using boost::shared_ptr;
-using boost::make_shared;
/** Make a DCP with subs from a .ssa file */
BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
/** Make a DCP with subs from a .ssa file */
BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
@@
-44,7
+42,7
@@
BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_interop (true);
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_interop (true);
- shared_ptr<TextSubtitleContent> content
= make_shared<TextSubtitleContent> (film, private_data / "DKH_UT_EN20160601def.ssa"
);
+ shared_ptr<TextSubtitleContent> content
(new TextSubtitleContent (film, private_data / "DKH_UT_EN20160601def.ssa")
);
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();