Fix erroneous optional dereference.

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

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 7f2e3b136a1720714df15b5a996104f552d14d81..e9017e40da4d51d500a4704235cf160ee6e13b4f 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -32,8 +32,10 @@ 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;
+       static int const SUBTITLE_VIDEO_FRAME_RATE;
 };
 
 /** @class SubtitleContent
@@ -56,10 +58,12 @@ public:
        bool has_subtitles () const;
        virtual bool has_text_subtitles () const = 0;
        virtual bool has_image_subtitles () const = 0;
+       virtual double subtitle_video_frame_rate () 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);
@@ -71,6 +75,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;
@@ -111,6 +120,7 @@ private:
        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.
         */