projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version
[dcpomatic.git]
/
test
/
black_fill_test.cc
diff --git
a/test/black_fill_test.cc
b/test/black_fill_test.cc
index 7741277a595e753cacd76ffdff1b5a2f67b3cf0f..6da0b037a1164a35923c0c14ee849e0cd6f7232c 100644
(file)
--- a/
test/black_fill_test.cc
+++ b/
test/black_fill_test.cc
@@
-33,22
+33,22
@@
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (black_fill_test)
{
shared_ptr<Film> film = new_test_film ("black_fill_test");
BOOST_AUTO_TEST_CASE (black_fill_test)
{
shared_ptr<Film> film = new_test_film ("black_fill_test");
- film->set_dcp_content_type (DCPContentType::from_
dci
_name ("FTR"));
+ film->set_dcp_content_type (DCPContentType::from_
isdcf
_name ("FTR"));
film->set_name ("black_fill_test");
film->set_container (Ratio::from_id ("185"));
film->set_name ("black_fill_test");
film->set_container (Ratio::from_id ("185"));
- film->set_sequence
_video
(false);
+ film->set_sequence (false);
shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
- contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
- contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
film->examine_and_add_content (contentA);
film->examine_and_add_content (contentB);
wait_for_jobs ();
film->examine_and_add_content (contentA);
film->examine_and_add_content (contentB);
wait_for_jobs ();
- contentA->set_video_length (ContentTime::from_frames (3, 24));
+ contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ contentA->set_video_length (3);
contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
- contentB->set_video_length (ContentTime::from_frames (1, 24));
+ contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
+ contentB->set_video_length (1);
contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
film->make_dcp ();
contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));
film->make_dcp ();
@@
-68,4
+68,3
@@
BOOST_AUTO_TEST_CASE (black_fill_test)
check_dcp (ref.string(), check.string());
}
check_dcp (ref.string(), check.string());
}
-