#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/make_shared.hpp>
#include <list>
using std::string;
using std::list;
using boost::shared_ptr;
-using boost::make_shared;
/** Make a very short DCP with a single subtitle from .srt with no specified fonts */
BOOST_AUTO_TEST_CASE (srt_subtitle_test)
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 = make_shared<TextSubtitleContent> (film, "test/data/subrip2.srt");
+ film->set_audio_channels (6);
+ shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
film->examine_and_add_content (content);
wait_for_jobs ();
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 = make_shared<TextSubtitleContent> (film, "test/data/subrip2.srt");
+ film->set_audio_channels (6);
+ shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip2.srt"));
film->examine_and_add_content (content);
wait_for_jobs ();
check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
}
-/** Make another DCP with a longer .srt file */
-BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
+static void
+check_subtitle_file (shared_ptr<Film> film, boost::filesystem::path ref)
{
- shared_ptr<Film> film = new_test_film ("srt_subtitle_test3");
-
- film->set_container (Ratio::from_id ("185"));
- film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
- film->set_name ("frobozz");
- film->set_interop (true);
- shared_ptr<TextSubtitleContent> content = make_shared<TextSubtitleContent> (film, private_data / "Ankoemmling.srt");
- film->examine_and_add_content (content);
- wait_for_jobs ();
-
- content->subtitle->set_use (true);
- content->subtitle->set_burn (false);
-
- film->make_dcp ();
- wait_for_jobs ();
-
/* Find the subtitle file and check it */
for (
boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory() / film->dcp_name (false));
if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
list<string> ignore;
ignore.push_back ("SubtitleID");
- check_xml (*j, private_data / "Ankoemmling.xml", ignore);
+ check_xml (*j, ref, ignore);
}
}
}
}
}
+/** Make another DCP with a longer .srt file */
+BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
+{
+ shared_ptr<Film> film = new_test_film ("srt_subtitle_test3");
+
+ film->set_container (Ratio::from_id ("185"));
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+ film->set_name ("frobozz");
+ film->set_interop (true);
+ film->set_audio_channels (6);
+ shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, private_data / "Ankoemmling.srt"));
+ film->examine_and_add_content (content);
+ wait_for_jobs ();
+
+ content->subtitle->set_use (true);
+ content->subtitle->set_burn (false);
+
+ film->make_dcp ();
+ wait_for_jobs ();
+
+ check_subtitle_file (film, private_data / "Ankoemmling.xml");
+}
+
#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 = make_shared<TextSubtitleContent> (film, "test/data/subrip.srt");
+ shared_ptr<TextSubtitleContent> content (new TextSubtitleContent (film, "test/data/subrip.srt"));
content->examine (shared_ptr<Job> (), true);
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));
- shared_ptr<SubRipDecoder> decoder = make_shared<SubRipDecoder> (content);
+ shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content));
list<ContentTextSubtitle> cts = decoder->get_text_subtitles (
ContentTimePeriod (
ContentTime::from_seconds (109), ContentTime::from_seconds (110)