Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / content_subtitle.h

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index ef904a9805e50476b064b7cdc589290694ff7777..8c0f29f4e29f0faaf453b41c957fc535684cc22a 100644 (file)
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 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/>.
 
 */
 
@@ -31,37 +32,42 @@ class Image;
 class ContentSubtitle
 {
 public:
-       virtual ContentTimePeriod period () const = 0;
+       ContentSubtitle (ContentTimePeriod p)
+               : _period (p)
+       {}
+
+       ContentTimePeriod period () const {
+               return _period;
+       }
+
+private:
+       ContentTimePeriod _period;
 };
 
 class ContentImageSubtitle : public ContentSubtitle
 {
 public:
        ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-               : sub (im, r)
-               , _period (p)
+               : ContentSubtitle (p)
+               , sub (im, r)
        {}
 
-       ContentTimePeriod period () const {
-               return _period;
-       }
-
        /* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */
        ImageSubtitle sub;
-
-private:
-       ContentTimePeriod _period;
 };
 
+/** A text subtitle.  We store the time period separately (as well as in the dcp::SubtitleStrings)
+ *  as the dcp::SubtitleString timings are sometimes quite heavily quantised and this causes problems
+ *  when we want to compare the quantised periods to the unquantised ones.
+ */
 class ContentTextSubtitle : public ContentSubtitle
 {
 public:
-       ContentTextSubtitle (std::list<dcp::SubtitleString> s)
-               : subs (s)
+       ContentTextSubtitle (ContentTimePeriod p, std::list<dcp::SubtitleString> s)
+               : ContentSubtitle (p)
+               , subs (s)
        {}
 
-       ContentTimePeriod period () const;
-
        std::list<dcp::SubtitleString> subs;
 };