projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default to making SMPTE DCPs on new installs.
[dcpomatic.git]
/
test
/
subtitle_language_test.cc
diff --git
a/test/subtitle_language_test.cc
b/test/subtitle_language_test.cc
index f43a3721ca0da340a7c67ee190e0ef809dffe43d..af5dee001f7c173b369c302e9d0096e8bafc327a 100644
(file)
--- a/
test/subtitle_language_test.cc
+++ b/
test/subtitle_language_test.cc
@@
-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,15
+42,19
@@
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);
film->set_interop (true);
- make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
+ make_and_verify_dcp (
+ film,
+ {
+ dcp::VerificationNote::Code::INVALID_STANDARD,
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
+ dcp::VerificationNote::Code::INVALID_SUBTITLE_DURATION
+ });
check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
}
check_dcp (String::compose("test/data/%1", name), String::compose("build/test/%1/%2", name, film->dcp_name()));
}
@@
-56,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 (