C++11 tidying.

[dcpomatic.git] / src / lib / ffmpeg_subtitle_stream.cc

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 27099b0f34ccf000b3d93179b4cad40c8f2c63ed..e500dd35b6294b91c6750ae6532ef3ae0fdddca1 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -1,47 +1,50 @@
 /*
-    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"));
+               }
        }
 }
 
@@ -50,39 +53,24 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 {
        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 ()));
+       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"));
        }
 }
 
-void
-FFmpegSubtitleStream::add_subtitle (ContentTimePeriod period)
+map<RGBA, RGBA>
+FFmpegSubtitleStream::colours () const
 {
-       DCPOMATIC_ASSERT (_subtitles.find (period.from) == _subtitles.end ());
-       _subtitles[period.from] = period.to;
+       boost::mutex::scoped_lock lm (_mutex);
+       return _colours;
 }
 
-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));
-               }
-       }
-
-       return d;
-}
-
-ContentTime
-FFmpegSubtitleStream::find_subtitle_to (ContentTime from) const
+void
+FFmpegSubtitleStream::set_colour (RGBA from, RGBA to)
 {
-       map<ContentTime, ContentTime>::const_iterator i = _subtitles.find (from);
-       DCPOMATIC_ASSERT (i != _subtitles.end ());
-       return i->second;
+       boost::mutex::scoped_lock lm (_mutex);
+       _colours[from] = to;
 }