diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
| commit | 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (patch) | |
| tree | 769dca1358e35017ce5a5b3ab2dfafe2b24d61ed /test/ffmpeg_dcp_test.cc | |
| parent | 4e83acad0c2a5c528709a175a80261b8147d3b49 (diff) | |
Use make_shared<>.
Diffstat (limited to 'test/ffmpeg_dcp_test.cc')
| -rw-r--r-- | test/ffmpeg_dcp_test.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index 18decee95..c69516b9f 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -24,23 +24,25 @@ * Also a quick test of Film::have_dcp (). */ -#include <boost/test/unit_test.hpp> -#include <boost/filesystem.hpp> -#include <boost/algorithm/string.hpp> #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/ratio.h" #include "lib/dcp_content_type.h" #include "lib/video_content.h" #include "test.h" +#include <boost/test/unit_test.hpp> +#include <boost/filesystem.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/make_shared.hpp> using boost::shared_ptr; +using boost::make_shared; BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) { shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test"); film->set_name ("test_film2"); - shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4")); + shared_ptr<FFmpegContent> c = make_shared<FFmpegContent> (film, "test/data/test.mp4"); film->examine_and_add_content (c); wait_for_jobs (); @@ -59,7 +61,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test) { boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test"); - shared_ptr<Film> film (new Film (p.string ())); + shared_ptr<Film> film = boost::make_shared<Film> (p.string ()); film->read_metadata (); BOOST_CHECK (!film->cpls().empty()); |
