Include tidying.

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

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index a159d78491a3f79695560d2f2ce95dd3bc70929f..99cf3b3825f2050971a72ed515c6f0acd07fb18b 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -32,6 +32,7 @@ public:
        static int const SUBTITLE_X_SCALE;
        static int const SUBTITLE_Y_SCALE;
        static int const USE_SUBTITLES;
+       static int const BURN_SUBTITLES;
        static int const SUBTITLE_LANGUAGE;
        static int const FONTS;
 };
@@ -53,11 +54,14 @@ public:
        void as_xml (xmlpp::Node *) const;
        std::string identifier () const;
 
-       virtual bool has_subtitles () const = 0;
+       bool has_subtitles () const;
+       virtual bool has_text_subtitles () const = 0;
+       virtual bool has_image_subtitles () const = 0;
 
        void add_font (boost::shared_ptr<Font> font);
 
        void set_use_subtitles (bool);
+       void set_burn_subtitles (bool);
        void set_subtitle_x_offset (double);
        void set_subtitle_y_offset (double);
        void set_subtitle_x_scale (double);
@@ -69,6 +73,11 @@ public:
                return _use_subtitles;
        }
 
+       bool burn_subtitles () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _burn_subtitles;
+       }
+
        double subtitle_x_offset () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _subtitle_x_offset;
@@ -102,13 +111,14 @@ public:
 protected:
        /** subtitle language (e.g. "German") or empty if it is not known */
        std::string _subtitle_language;
-       
+
 private:
        friend struct ffmpeg_pts_offset_test;
        void font_changed ();
        void connect_to_fonts ();
 
        bool _use_subtitles;
+       bool _burn_subtitles;
        /** x offset for placing subtitles, as a proportion of the container width;
         * +ve is further right, -ve is further left.
         */