Fix some code duplication and crashes when decoding FFmpeg-embedded ASS subtitles...

[dcpomatic.git] / src / lib / text_subtitle_content.cc

diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc
index 37ad5649aec353faa2a37070b71c5519a0dddfe2..24a328d088e3c05001f9be31f2f1b614233010da 100644 (file)
--- a/src/lib/text_subtitle_content.cc
+++ b/src/lib/text_subtitle_content.cc
@@ -34,8 +34,6 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-std::string const TextSubtitleContent::font_id = "font";
-
 TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
 {
@@ -60,7 +58,7 @@ TextSubtitleContent::examine (boost::shared_ptr<Job> job)
 
        boost::mutex::scoped_lock lm (_mutex);
        _length = s.length ();
-       subtitle->add_font (shared_ptr<Font> (new Font (font_id)));
+       subtitle->add_font (shared_ptr<Font> (new Font (TEXT_FONT_ID)));
 }
 
 string