Rename ContentText and subclasses to PieceText... and pass subtitles through Piece.

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

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
deleted file mode 100644 (file)
index c6d7d6e..0000000
--- a/src/lib/content_text.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
-
-    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.
-
-    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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef DCPOMATIC_CONTENT_TEXT_H
-#define DCPOMATIC_CONTENT_TEXT_H
-
-#include "dcpomatic_time.h"
-#include "rect.h"
-#include "types.h"
-#include "bitmap_text.h"
-#include <dcp/subtitle_string.h>
-#include <list>
-
-class Image;
-
-class ContentText
-{
-public:
-       explicit ContentText (dcpomatic::ContentTime f)
-               : _from (f)
-       {}
-
-       dcpomatic::ContentTime from () const {
-               return _from;
-       }
-
-private:
-       dcpomatic::ContentTime _from;
-};
-
-class ContentBitmapText : public ContentText
-{
-public:
-       ContentBitmapText (dcpomatic::ContentTime f, std::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-               : ContentText (f)
-               , sub (im, r)
-       {}
-
-       /* Our text, with its rectangle unmodified by any offsets or scales that the content specifies */
-       BitmapText sub;
-};
-
-/** 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 ContentStringText : public ContentText
-{
-public:
-       ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
-               : ContentText (f)
-               , subs (s)
-       {}
-
-       std::list<dcp::SubtitleString> subs;
-};
-
-#endif