projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in previous.
[dcpomatic.git]
/
test
/
srt_subtitle_test.cc
diff --git
a/test/srt_subtitle_test.cc
b/test/srt_subtitle_test.cc
index 772efd642585968bc75122c346f20c3ac981cc1d..123d04d95778ed388b3c929be674500e56885973 100644
(file)
--- a/
test/srt_subtitle_test.cc
+++ b/
test/srt_subtitle_test.cc
@@
-1,24
+1,25
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 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/>.
*/
*/
-/** @file test/s
ubtitle_writ
e_test.cc
- * @brief Test writing DCPs with
XML subtitles
.
+/** @file test/s
rt_subtitl
e_test.cc
+ * @brief Test writing DCPs with
subtitles from .srt
.
*/
#include "lib/film.h"
*/
#include "lib/film.h"
@@
-26,6
+27,7
@@
#include "lib/dcp_content_type.h"
#include "lib/font.h"
#include "lib/ratio.h"
#include "lib/dcp_content_type.h"
#include "lib/font.h"
#include "lib/ratio.h"
+#include "lib/subtitle_content.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
@@
-46,8
+48,8
@@
BOOST_AUTO_TEST_CASE (srt_subtitle_test)
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
- content->s
et_use_subtitles
(true);
- content->s
et_burn_subtitles
(false);
+ content->s
ubtitle->set_use
(true);
+ content->s
ubtitle->set_burn
(false);
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
@@
-66,10
+68,10
@@
BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
- content->s
et_use_subtitles
(true);
- content->s
et_burn_subtitles
(false);
+ content->s
ubtitle->set_use
(true);
+ content->s
ubtitle->set_burn
(false);
/* Use test/data/subrip2.srt as if it were a font file */
/* Use test/data/subrip2.srt as if it were a font file */
- content->fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
+ content->
subtitle->
fonts().front()->set_file (FontFiles::NORMAL, "test/data/subrip2.srt");
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
@@
-91,8
+93,8
@@
BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
- content->s
et_use_subtitles
(true);
- content->s
et_burn_subtitles
(false);
+ content->s
ubtitle->set_use
(true);
+ content->s
ubtitle->set_burn
(false);
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
@@
-120,7
+122,6
@@
BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
}
#if 0
}
#if 0
-
/* XXX: this is disabled; there is some difference in font rendering
between the test machine and others.
*/
/* XXX: this is disabled; there is some difference in font rendering
between the test machine and others.
*/