projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
test
/
dcp_subtitle_test.cc
diff --git
a/test/dcp_subtitle_test.cc
b/test/dcp_subtitle_test.cc
index d7d55e9c06bae5a3ac471fd362e81ce6a49677cd..85dea391fb2e48a6e8e929daebcb776e49f9cf9f 100644
(file)
--- a/
test/dcp_subtitle_test.cc
+++ b/
test/dcp_subtitle_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 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/>.
*/
*/
@@
-21,19
+22,24
@@
* @brief Test DCP subtitle content in various ways.
*/
* @brief Test DCP subtitle content in various ways.
*/
-#include <boost/test/unit_test.hpp>
#include "lib/film.h"
#include "lib/dcp_subtitle_content.h"
#include "lib/dcp_content.h"
#include "lib/ratio.h"
#include "lib/dcp_decoder.h"
#include "lib/dcp_content_type.h"
#include "lib/film.h"
#include "lib/dcp_subtitle_content.h"
#include "lib/dcp_content.h"
#include "lib/ratio.h"
#include "lib/dcp_decoder.h"
#include "lib/dcp_content_type.h"
+#include "lib/subtitle_content.h"
+#include "lib/content_subtitle.h"
+#include "lib/subtitle_decoder.h"
#include "test.h"
#include "test.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
#include <iostream>
using std::cout;
using std::list;
using boost::shared_ptr;
#include <iostream>
using std::cout;
using std::list;
using boost::shared_ptr;
+using boost::make_shared;
/** Test pass-through of a very simple DCP subtitle file */
BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
/** Test pass-through of a very simple DCP subtitle file */
BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
@@
-42,14
+48,14
@@
BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
- shared_ptr<DCPSubtitleContent> content
(new DCPSubtitleContent (film, "test/data/dcp_sub.xml")
);
+ shared_ptr<DCPSubtitleContent> content
= make_shared<DCPSubtitleContent> (film, "test/data/dcp_sub.xml"
);
film->examine_and_add_content (content);
wait_for_jobs ();
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
film->examine_and_add_content (content);
wait_for_jobs ();
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
- 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 ();
@@
-63,11
+69,11
@@
BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
- shared_ptr<DCPContent> content
(new DCPContent (film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")
);
+ shared_ptr<DCPContent> content
= make_shared<DCPContent> (film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"
);
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
- shared_ptr<DCPDecoder> decoder
(new DCPDecoder (content, false)
);
+ shared_ptr<DCPDecoder> decoder
= make_shared<DCPDecoder> (content, film->log(), false
);
list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
ContentTimePeriod (
list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
ContentTimePeriod (
@@
-83,11
+89,12
@@
BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04));
BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04));
BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04));
BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04));
- list<ContentTextSubtitle> subs = decoder->
get_text_subtitles
(
+ list<ContentTextSubtitle> subs = decoder->
subtitle->get_text
(
ContentTimePeriod (
ContentTime::from_seconds (25),
ContentTime::from_seconds (26)
),
ContentTimePeriod (
ContentTime::from_seconds (25),
ContentTime::from_seconds (26)
),
+ true,
true
);
true
);