projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
test
/
play_test.cc
diff --git
a/test/play_test.cc
b/test/play_test.cc
index 92c49a13442dd14400e41c66f299db40f93a1b4b..9b9e2c87bed21faf161d98682ec76c505c903915 100644
(file)
--- a/
test/play_test.cc
+++ b/
test/play_test.cc
@@
-88,13
+88,13
@@
BOOST_AUTO_TEST_CASE (play_test)
film->set_container (Ratio::from_id ("185"));
film->set_name ("play_test");
film->set_container (Ratio::from_id ("185"));
film->set_name ("play_test");
- shared_ptr<FFmpegContent> A
(new FFmpegContent (film, "test/data/red_24.mp4")
);
+ shared_ptr<FFmpegContent> A
= make_shared<FFmpegContent> (film, "test/data/red_24.mp4"
);
film->examine_and_add_content (A);
wait_for_jobs ();
BOOST_CHECK_EQUAL (A->video_length_after_3d_combine(), 16);
film->examine_and_add_content (A);
wait_for_jobs ();
BOOST_CHECK_EQUAL (A->video_length_after_3d_combine(), 16);
- shared_ptr<FFmpegContent> B
(new FFmpegContent (film, "test/data/red_30.mp4")
);
+ shared_ptr<FFmpegContent> B
= make_shared<FFmpegContent> (film, "test/data/red_30.mp4"
);
film->examine_and_add_content (B);
wait_for_jobs ();
film->examine_and_add_content (B);
wait_for_jobs ();
@@
-107,7
+107,7
@@
BOOST_AUTO_TEST_CASE (play_test)
/* A is 16 frames long at 25 fps */
BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
/* A is 16 frames long at 25 fps */
BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
- shared_ptr<Player> player
(new Player (film)
);
+ shared_ptr<Player> player
= make_shared<Player> (film
);
PlayerWrapper wrap (player);
/* Seek and audio don't get on at the moment */
player->disable_audio ();
PlayerWrapper wrap (player);
/* Seek and audio don't get on at the moment */
player->disable_audio ();