X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=6178c88ac71f2d2eccdb9b4082fe7ff1a17daeb2;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=ac4fcdd99507ad874b88c00d06408ac58dd6baf5;hpb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;p=dcpomatic.git diff --git a/test/reels_test.cc b/test/reels_test.cc index ac4fcdd99..6178c88ac 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2015-2016 Carl Hetherington - 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. - 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 - 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 . */ @@ -89,21 +90,21 @@ BOOST_AUTO_TEST_CASE (reels_test2) shared_ptr c (new ImageContent (film, "test/data/flat_red.png")); film->examine_and_add_content (c); wait_for_jobs (); - c->video->set_video_length (24); + c->video->set_length (24); } { shared_ptr c (new ImageContent (film, "test/data/flat_green.png")); film->examine_and_add_content (c); wait_for_jobs (); - c->video->set_video_length (24); + c->video->set_length (24); } { shared_ptr c (new ImageContent (film, "test/data/flat_blue.png")); film->examine_and_add_content (c); wait_for_jobs (); - c->video->set_video_length (24); + c->video->set_length (24); } film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); @@ -193,7 +194,7 @@ BOOST_AUTO_TEST_CASE (reels_test4) content[i].reset (new ImageContent (film, "test/data/flat_green.png")); film->examine_and_add_content (content[i]); wait_for_jobs (); - content[i]->video->set_video_length (24); + content[i]->video->set_length (24); } shared_ptr subs (new TextSubtitleContent (film, "test/data/subrip3.srt"));