No-op; fix GPL address and use the explicit-program-name version.

[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..f00254ae25ffb357da7e5b06f63fde2ce53e5550 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -27,6 +28,7 @@ using std::string;
 using std::map;
 using std::list;
 using std::cout;
+using std::make_pair;
 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().
@@ -82,6 +84,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 +98,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
@@ -173,3 +185,15 @@ 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;
+}