Fix deadlock.

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

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index c3c25232f4893ec59776d42c20f483ec5f72acc1..e8915fc960636ca9b0d9299613c513f3d556203d 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 
 #include "content.h"
 
+class Font;
+
 class SubtitleContentProperty
 {
 public:
@@ -30,6 +32,8 @@ public:
        static int const SUBTITLE_X_SCALE;
        static int const SUBTITLE_Y_SCALE;
        static int const USE_SUBTITLES;
+       static int const SUBTITLE_LANGUAGE;
+       static int const FONTS;
 };
 
 /** @class SubtitleContent
@@ -56,6 +60,7 @@ public:
        void set_subtitle_y_offset (double);
        void set_subtitle_x_scale (double);
        void set_subtitle_y_scale (double);
+       void set_subtitle_language (std::string language);
 
        bool use_subtitles () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -82,6 +87,21 @@ public:
                return _subtitle_y_scale;
        }
 
+       std::list<boost::shared_ptr<Font> > fonts () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _fonts;
+       }
+
+       std::string subtitle_language () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _subtitle_language;
+       }
+
+protected:
+       /** subtitle language (e.g. "German") or empty if it is not known */
+       std::string _subtitle_language;
+       std::list<boost::shared_ptr<Font> > _fonts;
+       
 private:
        friend struct ffmpeg_pts_offset_test;