*/
#include "lib/film.h"
-#include "lib/text_subtitle_content.h"
+#include "lib/plain_text_content.h"
#include "lib/dcp_content_type.h"
#include "lib/font.h"
#include "lib/ratio.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_audio_channels (6);
- shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+ film->set_interop (false);
+ shared_ptr<PlainText> content (new PlainText (film, "test/data/subrip2.srt"));
film->examine_and_add_content (content);
wait_for_jobs ();
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_audio_channels (6);
- shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+ film->set_interop (false);
+ shared_ptr<PlainText> content (new PlainText (film, "test/data/subrip2.srt"));
film->examine_and_add_content (content);
wait_for_jobs ();
check_subtitle_file (shared_ptr<Film> film, boost::filesystem::path ref)
{
/* Find the subtitle file and check it */
- for (
- boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false));
- i != boost::filesystem::directory_iterator ();
- ++i) {
-
- if (boost::filesystem::is_directory (i->path ())) {
- for (
- boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ());
- j != boost::filesystem::directory_iterator ();
- ++j) {
-
- if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
- list<string> ignore;
- ignore.push_back ("SubtitleID");
- check_xml (*j, ref, ignore);
- }
- }
- }
- }
+ list<string> ignore;
+ ignore.push_back ("SubtitleID");
+ check_xml (subtitle_file(film), ref, ignore);
}
/** Make another DCP with a longer .srt file */
film->set_name ("frobozz");
film->set_interop (true);
film->set_audio_channels (6);
- shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, private_data / "Ankoemmling.srt"));
+ shared_ptr<PlainText> content (new PlainText (film, private_data / "Ankoemmling_short.srt"));
film->examine_and_add_content (content);
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
- check_subtitle_file (film, private_data / "Ankoemmling.xml");
+ check_subtitle_file (film, private_data / "Ankoemmling_short.xml");
}
/** Build a small DCP with no picture and a single subtitle overlaid onto it */
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
- shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+ film->set_interop (false);
+ shared_ptr<PlainText> content (new PlainText (film, "test/data/subrip2.srt"));
content->subtitle->set_use (true);
content->subtitle->set_burn (false);
film->examine_and_add_content (content);
film->set_name ("frobozz");
film->set_interop (true);
film->set_sequence (false);
- shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
+ shared_ptr<PlainText> content (new PlainText (film, "test/data/subrip2.srt"));
content->subtitle->set_use (true);
content->subtitle->set_burn (false);
film->examine_and_add_content (content);
check_dcp ("test/data/xml_subtitle_test2", film->dir (film->dcp_name ()));
}
+BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
+{
+ shared_ptr<Film> film = new_test_film2 ("srt_subtitle_test6");
+ film->set_interop (false);
+ shared_ptr<PlainText> content (new PlainText (film, "test/data/frames.srt"));
+ content->subtitle->set_use (true);
+ content->subtitle->set_burn (false);
+ film->examine_and_add_content (content);
+ BOOST_REQUIRE (!wait_for_jobs ());
+ film->make_dcp ();
+ BOOST_REQUIRE (!wait_for_jobs ());
+ film->write_metadata ();
+
+ check_dcp ("test/data/srt_subtitle_test6", film->dir(film->dcp_name()));
+}
+
#if 0
/* XXX: this is disabled; there is some difference in font rendering
between the test machine and others.
BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
{
shared_ptr<Film> film = new_test_film ("subrip_render_test");
- shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip.srt"));
+ shared_ptr<PlainText> content (new PlainText (film, "test/data/subrip.srt"));
content->examine (shared_ptr<Job> (), true);
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));