projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix erroneous full_length() in SndfileContent; it's at least a bit more correct now.
[dcpomatic.git]
/
test
/
black_fill_test.cc
diff --git
a/test/black_fill_test.cc
b/test/black_fill_test.cc
index 48cf1f53c3d62a8b3c55e6914ecc24ce74e929ca..9e8aa381bbd0cb0832006fe2a7d6108b71699bac 100644
(file)
--- a/
test/black_fill_test.cc
+++ b/
test/black_fill_test.cc
@@
-18,7
+18,7
@@
*/
#include <boost/test/unit_test.hpp>
*/
#include <boost/test/unit_test.hpp>
-#include "lib/image
magick
_content.h"
+#include "lib/image_content.h"
#include "lib/dcp_content_type.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/film.h"
#include "lib/ratio.h"
@@
-37,9
+37,9
@@
BOOST_AUTO_TEST_CASE (black_fill_test)
film->set_name ("black_fill_test");
film->set_container (Ratio::from_id ("185"));
film->set_sequence_video (false);
film->set_name ("black_fill_test");
film->set_container (Ratio::from_id ("185"));
film->set_sequence_video (false);
- shared_ptr<Image
MagickContent> contentA (new ImageMagick
Content (film, "test/data/simple_testcard_640x480.png"));
+ shared_ptr<Image
Content> contentA (new Image
Content (film, "test/data/simple_testcard_640x480.png"));
contentA->set_ratio (Ratio::from_id ("185"));
contentA->set_ratio (Ratio::from_id ("185"));
- shared_ptr<Image
MagickContent> contentB (new ImageMagick
Content (film, "test/data/simple_testcard_640x480.png"));
+ shared_ptr<Image
Content> contentB (new Image
Content (film, "test/data/simple_testcard_640x480.png"));
contentB->set_ratio (Ratio::from_id ("185"));
film->examine_and_add_content (contentA);
contentB->set_ratio (Ratio::from_id ("185"));
film->examine_and_add_content (contentA);
@@
-47,9
+47,9
@@
BOOST_AUTO_TEST_CASE (black_fill_test)
wait_for_jobs ();
contentA->set_video_length (3);
wait_for_jobs ();
contentA->set_video_length (3);
- contentA->set_
start
(film->video_frames_to_time (2));
+ contentA->set_
position
(film->video_frames_to_time (2));
contentB->set_video_length (1);
contentB->set_video_length (1);
- contentB->set_
start
(film->video_frames_to_time (7));
+ contentB->set_
position
(film->video_frames_to_time (7));
film->make_dcp ();
film->make_dcp ();