/*
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.
- 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
- 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/>.
*/
#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 <iostream>
BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2));
- content->set_use_subtitles (true);
- content->set_burn_subtitles (false);
+ content->subtitle->set_use (true);
+ content->subtitle->set_burn (false);
film->make_dcp ();
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
- shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, false));
+ shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log()));
list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
ContentTimePeriod (
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)
),
+ true,
true
);