projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporter.
[dcpomatic.git]
/
test
/
black_fill_test.cc
diff --git
a/test/black_fill_test.cc
b/test/black_fill_test.cc
index 6da0b037a1164a35923c0c14ee849e0cd6f7232c..79b97ad77a557af765a4082839c21e4271136784 100644
(file)
--- a/
test/black_fill_test.cc
+++ b/
test/black_fill_test.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,6
+23,7
@@
#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"
+#include "lib/video_content.h"
#include "test.h"
/** @file test/black_fill_test.cc
#include "test.h"
/** @file test/black_fill_test.cc
@@
-44,11
+46,11
@@
BOOST_AUTO_TEST_CASE (black_fill_test)
film->examine_and_add_content (contentB);
wait_for_jobs ();
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
_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_scale (VideoContentScale (Ratio::from_id ("185")));
- contentB->
set_video
_length (1);
+ contentB->
video->
set_scale (VideoContentScale (Ratio::from_id ("185")));
+ contentB->
video->set
_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 ();