/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2017 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 "ffmpeg_subtitle_stream.h"
-#include "raw_convert.h"
+#include "warnings.h"
+#include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
using std::string;
using std::map;
using std::list;
using std::cout;
+using std::make_pair;
+using dcp::raw_convert;
/** Construct a SubtitleStream from a value returned from to_string().
- * @param t String returned from to_string().
- * @param v State file version.
+ * @param node String returned from to_string().
+ * @param version State file version.
*/
-FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
+FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version)
: FFmpegStream (node)
{
- BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Period")) {
- add_subtitle (
- ContentTimePeriod (
- ContentTime (i->number_child<ContentTime::Type> ("From")),
- ContentTime (i->number_child<ContentTime::Type> ("To"))
- )
- );
+ if (version >= 33) {
+ boost::mutex::scoped_lock lm (_mutex);
+ for (auto i: node->node_children ("Colour")) {
+ _colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To"));
+ }
}
}
{
FFmpegStream::as_xml (root);
- for (map<ContentTime, ContentTime>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- xmlpp::Node* node = root->add_child ("Period");
- node->add_child("From")->add_child_text (raw_convert<string> (i->first.get ()));
- node->add_child("To")->add_child_text (raw_convert<string> (i->second.get ()));
- }
-}
-
-void
-FFmpegSubtitleStream::add_subtitle (ContentTimePeriod period)
-{
- DCPOMATIC_ASSERT (_subtitles.find (period.from) == _subtitles.end ());
- _subtitles[period.from] = period.to;
-}
-
-list<ContentTimePeriod>
-FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting) const
-{
- list<ContentTimePeriod> d;
-
- /* XXX: inefficient */
- for (map<ContentTime, ContentTime>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- if ((starting && period.contains (i->first)) || (!starting && period.overlaps (ContentTimePeriod (i->first, i->second)))) {
- d.push_back (ContentTimePeriod (i->first, i->second));
- }
+ boost::mutex::scoped_lock lm (_mutex);
+ for (map<RGBA, RGBA>::const_iterator i = _colours.begin(); i != _colours.end(); ++i) {
+ xmlpp::Node* node = root->add_child("Colour");
+ i->first.as_xml (node->add_child("From"));
+ i->second.as_xml (node->add_child("To"));
}
-
- return d;
}
-ContentTime
-FFmpegSubtitleStream::find_subtitle_to (ContentTime from) const
+map<RGBA, RGBA>
+FFmpegSubtitleStream::colours () const
{
- map<ContentTime, ContentTime>::const_iterator i = _subtitles.find (from);
- DCPOMATIC_ASSERT (i != _subtitles.end ());
- return i->second;
+ boost::mutex::scoped_lock lm (_mutex);
+ return _colours;
}
-/** Add some offset to all the times in the stream */
void
-FFmpegSubtitleStream::add_offset (ContentTime offset)
+FFmpegSubtitleStream::set_colour (RGBA from, RGBA to)
{
- map<ContentTime, ContentTime> fixed;
- for (map<ContentTime, ContentTime>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- fixed[i->first + offset] = i->second + offset;
- }
- _subtitles = fixed;
+ boost::mutex::scoped_lock lm (_mutex);
+ _colours[from] = to;
}