projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused file_dialog_wrapper.h
[dcpomatic.git]
/
test
/
subtitle_language_test.cc
diff --git
a/test/subtitle_language_test.cc
b/test/subtitle_language_test.cc
index f0f2ad16247c3982b15b14eb435edec43d499721..e198b78f93c9cd350cb8923dc4c8f9c8f1f8e888 100644
(file)
--- a/
test/subtitle_language_test.cc
+++ b/
test/subtitle_language_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,13
+18,16
@@
*/
*/
+
/** @file test/subtitle_language_test.cc
* @brief Test that subtitle language information is correctly written to DCPs.
*/
/** @file test/subtitle_language_test.cc
* @brief Test that subtitle language information is correctly written to DCPs.
*/
+#include "lib/content.h"
#include "lib/content_factory.h"
#include "lib/film.h"
#include "lib/content_factory.h"
#include "lib/film.h"
+#include "lib/text_content.h"
#include "test.h"
#include <dcp/language_tag.h>
#include <boost/test/unit_test.hpp>
#include "test.h"
#include <dcp/language_tag.h>
#include <boost/test/unit_test.hpp>
@@
-39,12
+42,10
@@
using std::shared_ptr;
BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
{
string const name = "subtitle_language_interop_test";
BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
{
string const name = "subtitle_language_interop_test";
- auto film = new_test_film2 (name, { content_factory("test/data/frames.srt").front() });
+ auto fr = content_factory("test/data/frames.srt").front();
+ auto film = new_test_film2 (name, { fr });
- vector<dcp::LanguageTag> langs = {
- dcp::LanguageTag("fr-FR"), dcp::LanguageTag("de-DE")
- };
- film->set_subtitle_languages(langs);
+ fr->only_text()->set_language (dcp::LanguageTag("fr-FR"));
film->set_interop (true);
make_and_verify_dcp (
film->set_interop (true);
make_and_verify_dcp (
@@
-62,12
+63,10
@@
BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
{
string const name = "subtitle_language_smpte_test";
BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
{
string const name = "subtitle_language_smpte_test";
- auto film = new_test_film2 (name, { content_factory("test/data/frames.srt").front() });
+ auto fr = content_factory("test/data/frames.srt").front();
+ auto film = new_test_film2 (name, { fr });
- vector<dcp::LanguageTag> langs = {
- dcp::LanguageTag("fr-FR"), dcp::LanguageTag("de-DE")
- };
- film->set_subtitle_languages (langs);
+ fr->only_text()->set_language (dcp::LanguageTag("fr-FR"));
film->set_interop (false);
make_and_verify_dcp (
film->set_interop (false);
make_and_verify_dcp (