/*
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/>.
*/
#include "dcpomatic_time.h"
#include "rect.h"
-#include "image_subtitle.h"
+#include "bitmap_text.h"
#include <dcp/subtitle_string.h>
#include <list>
class ContentSubtitle
{
public:
- ContentSubtitle (ContentTimePeriod p)
- : _period (p)
+ explicit ContentSubtitle (ContentTime f)
+ : _from (f)
{}
- ContentTimePeriod period () const {
- return _period;
+ ContentTime from () const {
+ return _from;
}
private:
- ContentTimePeriod _period;
+ ContentTime _from;
};
-class ContentImageSubtitle : public ContentSubtitle
+class ContentBitmapText : public ContentSubtitle
{
public:
- ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
- : ContentSubtitle (p)
+ ContentBitmapText (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+ : ContentSubtitle (f)
, sub (im, r)
{}
/* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */
- ImageSubtitle sub;
+ BitmapText sub;
};
/** A text subtitle. We store the time period separately (as well as in the dcp::SubtitleStrings)
class ContentTextSubtitle : public ContentSubtitle
{
public:
- ContentTextSubtitle (ContentTimePeriod p, std::list<dcp::SubtitleString> s)
- : ContentSubtitle (p)
+ ContentTextSubtitle (ContentTime f, std::list<dcp::SubtitleString> s)
+ : ContentSubtitle (f)
, subs (s)
{}