From c8ff422a42eac30517a7acde57ab84e55449f4e4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 26 Jun 2015 22:02:00 +0100 Subject: Fix missing subtitles in some cases. We were passing subtitles back from decoders to SubtitleDecoder using dcp::SubtitleStrings and relying on their storage of time to know when the subtitles were. These times are quantised (by the use of dcp::SubtitleString) and then compared with unquantised times (kept as ContentTime) in the main checking loop in SubtitleDecoder::get(). Fix this by storing periods as ContentTimePeriod as well as in the dcp::SubtitleStrings. --- src/lib/content_subtitle.cc | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/lib/content_subtitle.cc (limited to 'src/lib/content_subtitle.cc') diff --git a/src/lib/content_subtitle.cc b/src/lib/content_subtitle.cc deleted file mode 100644 index 4eed8b4b2..000000000 --- a/src/lib/content_subtitle.cc +++ /dev/null @@ -1,31 +0,0 @@ -/* - Copyright (C) 2014 Carl Hetherington - - This program 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, - 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. - -*/ - -#include "content_subtitle.h" - -ContentTimePeriod -ContentTextSubtitle::period () const -{ - /* XXX: assuming we have some subs and they are all at the same time */ - DCPOMATIC_ASSERT (!subs.empty ()); - return ContentTimePeriod ( - ContentTime::from_seconds (subs.front().in().as_seconds()), - ContentTime::from_seconds (subs.front().out().as_seconds()) - ); -} -- cgit v1.2.3