#include "dcpomatic_time.h"
#include "rect.h"
+#include "types.h"
#include "bitmap_text.h"
#include <dcp/subtitle_string.h>
#include <list>
class ContentText
{
public:
- explicit ContentText (ContentTime f)
+ explicit ContentText (dcpomatic::ContentTime f)
: _from (f)
{}
- ContentTime from () const {
+ dcpomatic::ContentTime from () const {
return _from;
}
private:
- ContentTime _from;
+ dcpomatic::ContentTime _from;
};
class ContentBitmapText : public ContentText
{
public:
- ContentBitmapText (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+ ContentBitmapText (dcpomatic::ContentTime f, std::shared_ptr<Image> im, dcpomatic::Rect<double> r)
: ContentText (f)
, sub (im, r)
{}
BitmapText sub;
};
-/** A text subtitle. We store the time period separately (as well as in the dcp::SubtitleStrings)
+/** A text caption. 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 ContentPlainText : public ContentText
+class ContentStringText : public ContentText
{
public:
- ContentPlainText (ContentTime f, std::list<dcp::SubtitleString> s)
+ ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
: ContentText (f)
, subs (s)
{}