Move raw_convert into libdcp.

[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 33759d86e544f348fc374238fc1cc741e2508033..627b0fef1c8b61b6890397c97282f4d42f7700af 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -1,24 +1,25 @@
 /*
     Copyright (C) 2013-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 "ffmpeg_subtitle_stream.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -27,6 +28,8 @@ 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().
@@ -82,6 +85,10 @@ FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version
                                        )
                                );
                }
+
+               BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Colour")) {
+                       _colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To"));
+               }
        }
 }
 
@@ -92,6 +99,12 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 
        as_xml (root, _image_subtitles, "ImageSubtitle");
        as_xml (root, _text_subtitles, "TextSubtitle");
+
+       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
@@ -131,6 +144,13 @@ FFmpegSubtitleStream::text_subtitles_during (ContentTimePeriod period, bool star
        return subtitles_during (period, starting, _text_subtitles);
 }
 
+struct PeriodSorter
+{
+       bool operator() (ContentTimePeriod const & a, ContentTimePeriod const & b) {
+               return a.from < b.from;
+       }
+};
+
 list<ContentTimePeriod>
 FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const
 {
@@ -138,11 +158,13 @@ FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting,
 
        /* XXX: inefficient */
        for (map<string, ContentTimePeriod>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-               if ((starting && period.contains (i->second.from)) || (!starting && period.overlaps (i->second))) {
+               if ((starting && period.contains(i->second.from)) || (!starting && period.overlap(i->second))) {
                        d.push_back (i->second);
                }
        }
 
+       d.sort (PeriodSorter ());
+
        return d;
 }
 
@@ -173,3 +195,27 @@ FFmpegSubtitleStream::add_offset (ContentTime offset)
                i->second.to += offset;
        }
 }
+
+map<RGBA, RGBA>
+FFmpegSubtitleStream::colours () const
+{
+       return _colours;
+}
+
+void
+FFmpegSubtitleStream::set_colour (RGBA from, RGBA to)
+{
+       _colours[from] = to;
+}
+
+bool
+FFmpegSubtitleStream::has_text () const
+{
+       return !_text_subtitles.empty ();
+}
+
+bool
+FFmpegSubtitleStream::has_image () const
+{
+       return !_image_subtitles.empty ();
+}