diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 22:10:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 6f344b876689a1234a5eb75041882f06f5d9fe5c (patch) | |
| tree | 3a51f17cab8b8f31b21661b643aaed6a53326031 /test/black_fill_test.cc | |
| parent | 36774ee2b48f0bfde43b743592e5816ff58bb7d2 (diff) | |
Reasonably straightforward stuff; main things are adding
a _parent to VideoContent (mainly, but not only, for signalling)
and moving the video shared_ptr into Content, which makes much
more sense to replace dynamic_cast tests for whether something
has video or whatever. Nearly builds.
Diffstat (limited to 'test/black_fill_test.cc')
| -rw-r--r-- | test/black_fill_test.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc index 6da0b037a..173c256e2 100644 --- a/test/black_fill_test.cc +++ b/test/black_fill_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include "lib/dcp_content_type.h" #include "lib/film.h" #include "lib/ratio.h" +#include "lib/video_content.h" #include "test.h" /** @file test/black_fill_test.cc @@ -44,11 +45,11 @@ BOOST_AUTO_TEST_CASE (black_fill_test) film->examine_and_add_content (contentB); wait_for_jobs (); - contentA->set_scale (VideoContentScale (Ratio::from_id ("185"))); - contentA->set_video_length (3); + contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentA->video->set_video_length (3); contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ())); - contentB->set_scale (VideoContentScale (Ratio::from_id ("185"))); - contentB->set_video_length (1); + contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentB->video->set_video_length (1); contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ())); film->make_dcp (); |