projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add language property to SubtitleContent and use it in output DCP subtitle files.
[dcpomatic.git]
/
test
/
player_test.cc
diff --git
a/test/player_test.cc
b/test/player_test.cc
index d480602422b0ee1a810cfc74a1e38c0ad575eb1b..d7a55b57a065d89d34b4de743ddd7a0319e4dfac 100644
(file)
--- a/
test/player_test.cc
+++ b/
test/player_test.cc
@@
-44,12
+44,12
@@
BOOST_AUTO_TEST_CASE (player_overlaps_test)
shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
- film->examine_and_add_content (A);
- film->examine_and_add_content (B);
- film->examine_and_add_content (C);
+ film->examine_and_add_content (A
, true
);
+ film->examine_and_add_content (B
, true
);
+ film->examine_and_add_content (C
, true
);
wait_for_jobs ();
wait_for_jobs ();
- BOOST_CHECK_EQUAL (A->full_length(), DCPTime (28
0
000));
+ BOOST_CHECK_EQUAL (A->full_length(), DCPTime (28
8
000));
A->set_position (DCPTime::from_seconds (0));
B->set_position (DCPTime::from_seconds (10));
A->set_position (DCPTime::from_seconds (0));
B->set_position (DCPTime::from_seconds (10));
@@
-87,7
+87,7
@@
BOOST_AUTO_TEST_CASE (player_silence_padding_test)
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (6);
film->set_container (Ratio::from_id ("185"));
film->set_audio_channels (6);
- film->examine_and_add_content (c);
+ film->examine_and_add_content (c
, true
);
wait_for_jobs ();
shared_ptr<Player> player = film->make_player ();
wait_for_jobs ();
shared_ptr<Player> player = film->make_player ();