summaryrefslogtreecommitdiff
path: root/src/subtitle_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-24 08:48:45 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-24 08:48:45 +0100
commit79cddd181d1fefa930cf4427b896af5c36758f46 (patch)
treec5fab06e1f328d8f39b0b7c7b2fd437149fda0a3 /src/subtitle_asset.h
parentf62f5d4514baecbbb7c6821f64d12d89c6f4c385 (diff)
Stuff.fontfix
Diffstat (limited to 'src/subtitle_asset.h')
-rw-r--r--src/subtitle_asset.h24
1 files changed, 0 insertions, 24 deletions
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 31afecb3..725669f7 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -70,7 +70,6 @@ public:
void add (SubtitleString);
virtual void add_font (std::string id, boost::filesystem::path file) = 0;
- std::map<std::string, Data> fonts () const;
virtual void write (boost::filesystem::path) const = 0;
virtual Glib::ustring xml_as_string () const = 0;
@@ -85,33 +84,10 @@ protected:
void parse_subtitles (boost::shared_ptr<cxml::Document> xml, std::list<boost::shared_ptr<FontNode> > font_nodes);
void subtitles_as_xml (xmlpp::Element* root, int time_code_rate, std::string xmlns) const;
- void add_font_data (std::string id, boost::filesystem::path file);
/** All our subtitles, in no particular order */
std::list<SubtitleString> _subtitles;
- class FileData : public Data {
- public:
- FileData () {}
-
- FileData (boost::shared_array<uint8_t> data_, boost::uintmax_t size_)
- : Data (data_, size_)
- {}
-
- FileData (boost::filesystem::path file_)
- : Data (file_)
- {}
-
- /** .ttf file that this data was last written to */
- mutable boost::optional<boost::filesystem::path> file;
- };
-
- /** Font data, keyed by a subclass-dependent identifier.
- * For Interop, the string is the font ID from the subtitle file.
- * For SMPTE, the string is the font's URN from the subtitle file.
- */
- std::map<std::string, FileData> _fonts;
-
private:
/** @struct ParseState
* @brief A struct to hold state when parsing a subtitle XML file.