/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2016 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 <dcp/subtitle_content.h>
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_asset.h>
+#include <iostream>
using std::list;
using std::cout;
using boost::shared_ptr;
+using boost::bind;
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
- : SubtitleDecoder (content)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
{
- dcp::SubtitleContent c (content->path (0), false);
- _subtitles = c.subtitles ();
+ subtitle.reset (new SubtitleDecoder (this, content->subtitle, log));
+
+ shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+ _subtitles = c->subtitles ();
_next = _subtitles.begin ();
}
void
-DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
+DCPSubtitleDecoder::seek (ContentTime time, bool)
{
- SubtitleDecoder::seek (time, accurate);
-
_next = _subtitles.begin ();
list<dcp::SubtitleString>::const_iterator i = _subtitles.begin ();
- while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().to_seconds()) < time) {
+ while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().as_seconds()) < time) {
++i;
}
}
-bool
+void
DCPSubtitleDecoder::pass ()
{
if (_next == _subtitles.end ()) {
- return true;
+ return;
}
- list<dcp::SubtitleString> s;
- s.push_back (*_next);
- text_subtitle (s);
- ++_next;
+ /* Gather all subtitles with the same time period that are next
+ on the list. We must emit all subtitles for the same time
+ period with the same text_subtitle() call otherwise the
+ SubtitleDecoder will assume there is nothing else at the
+ time of emit the first.
+ */
- return false;
-}
+ list<dcp::SubtitleString> s;
+ ContentTimePeriod const p = content_time_period (*_next);
-list<ContentTimePeriod>
-DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
-{
- /* XXX: inefficient */
-
- list<ContentTimePeriod> d;
-
- for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- ContentTimePeriod period (
- ContentTime::from_seconds (i->in().to_seconds ()),
- ContentTime::from_seconds (i->out().to_seconds ())
- );
-
- if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) {
- d.push_back (period);
- }
+ while (_next != _subtitles.end () && content_time_period (*_next) == p) {
+ s.push_back (*_next);
+ ++_next;
}
- return d;
+ subtitle->emit_text (p, s);
+ subtitle->set_position (p.from);
}
+ContentTimePeriod
+DCPSubtitleDecoder::content_time_period (dcp::SubtitleString s) const
+{
+ return ContentTimePeriod (
+ ContentTime::from_seconds (s.in().as_seconds ()),
+ ContentTime::from_seconds (s.out().as_seconds ())
+ );
+}