projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove specification of italic/bold fonts (#1451); synthesis will be used instead.
[dcpomatic.git]
/
test
/
content_test.cc
diff --git
a/test/content_test.cc
b/test/content_test.cc
index 330bbdc9462a3094d45253816859ab0698651ed6..55e34ac5f0fb170596494dccb184d865f772078d 100644
(file)
--- a/
test/content_test.cc
+++ b/
test/content_test.cc
@@
-41,7
+41,7
@@
BOOST_AUTO_TEST_CASE (content_test1)
film->set_name ("content_test1");
film->set_container (Ratio::from_id ("185"));
film->set_name ("content_test1");
film->set_container (Ratio::from_id ("185"));
- shared_ptr<Content> content = content_factory(
film,
private_data / "demo_sound_bug.mkv").front ();
+ shared_ptr<Content> content = content_factory(private_data / "demo_sound_bug.mkv").front ();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->make_dcp ();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->make_dcp ();
@@
-69,7
+69,7
@@
BOOST_AUTO_TEST_CASE (content_test2)
{
shared_ptr<Film> film = new_test_film2 ("content_test2");
{
shared_ptr<Film> film = new_test_film2 ("content_test2");
- shared_ptr<Content> content = content_factory(
film,
"test/data/red_23976.mp4").front();
+ shared_ptr<Content> content = content_factory("test/data/red_23976.mp4").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
content->set_trim_start(ContentTime::from_seconds(0.5));
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
content->set_trim_start(ContentTime::from_seconds(0.5));
@@
-83,7
+83,7
@@
BOOST_AUTO_TEST_CASE (content_test3)
shared_ptr<Film> film = new_test_film2 ("content_test3");
film->set_sequence (false);
shared_ptr<Film> film = new_test_film2 ("content_test3");
film->set_sequence (false);
- shared_ptr<Content> content = content_factory(
film,
"test/data/red_24.mp4").front();
+ shared_ptr<Content> content = content_factory("test/data/red_24.mp4").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
@@
-104,15
+104,15
@@
BOOST_AUTO_TEST_CASE (content_test3)
/* Position */
/* 12 frames */
/* Position */
/* 12 frames */
- content->set_position (
DCPTime::from_seconds
(12.0 / 24.0));
+ content->set_position (
film, DCPTime::from_seconds
(12.0 / 24.0));
BOOST_CHECK (content->position() == DCPTime::from_seconds (12.0 / 24.0));
/* 11.2 frames */
BOOST_CHECK (content->position() == DCPTime::from_seconds (12.0 / 24.0));
/* 11.2 frames */
- content->set_position (
DCPTime::from_seconds
(11.2 / 24.0));
+ content->set_position (
film, DCPTime::from_seconds
(11.2 / 24.0));
BOOST_CHECK (content->position() == DCPTime::from_seconds (11.0 / 24.0));
/* 13.9 frames */
BOOST_CHECK (content->position() == DCPTime::from_seconds (11.0 / 24.0));
/* 13.9 frames */
- content->set_position (
DCPTime::from_seconds
(13.9 / 24.0));
+ content->set_position (
film, DCPTime::from_seconds
(13.9 / 24.0));
BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0));
content->set_video_frame_rate (25);
BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0));
content->set_video_frame_rate (25);
@@
-120,9
+120,4
@@
BOOST_AUTO_TEST_CASE (content_test3)
/* Check that trim is fixed when the content's video frame rate is `forced' */
BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (15.0 / 25.0));
/* Check that trim is fixed when the content's video frame rate is `forced' */
BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (15.0 / 25.0));
-
- /* Likewise position */
-
- std::cout << to_string(content->position()) << " " << to_string(DCPTime::from_seconds(15.0 / 25.0)) << "\n";
- BOOST_CHECK (content->position() == DCPTime::from_seconds (15.0 / 25.0));
}
}