Add burn_subtitles property to SubtitleContent.

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index c8fa75e7cfb3a8919a80778000d61190c8599a5d..a10e23cafea324a48fe9333e4858c5b30f294771 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -40,12 +40,14 @@ int const SubtitleContentProperty::SUBTITLE_Y_OFFSET = 501;
 int const SubtitleContentProperty::SUBTITLE_X_SCALE = 502;
 int const SubtitleContentProperty::SUBTITLE_Y_SCALE = 503;
 int const SubtitleContentProperty::USE_SUBTITLES = 504;
-int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 505;
-int const SubtitleContentProperty::FONTS = 506;
+int const SubtitleContentProperty::BURN_SUBTITLES = 505;
+int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 506;
+int const SubtitleContentProperty::FONTS = 507;
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> film)
        : Content (film)
        , _use_subtitles (false)
+       , _burn_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
        , _subtitle_x_scale (1)
@@ -57,6 +59,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film)
 SubtitleContent::SubtitleContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film, p)
        , _use_subtitles (false)
+       , _burn_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
        , _subtitle_x_scale (1)
@@ -68,6 +71,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film, boost::filesystem
 SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
        , _use_subtitles (false)
+       , _burn_subtitles (false)
        , _subtitle_x_offset (0)
        , _subtitle_y_offset (0)
        , _subtitle_x_scale (1)
@@ -75,8 +79,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePt
 {
        if (version >= 32) {
                _use_subtitles = node->bool_child ("UseSubtitles");
-       } else {
-               _use_subtitles = false;
+               _burn_subtitles = node->bool_child ("BurnSubtitles");
        }
 
        if (version >= 7) {
@@ -117,6 +120,10 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film, vector<shared_ptr
                        throw JoinError (_("Content to be joined must have the same 'use subtitles' setting."));
                }
 
+               if (sc->burn_subtitles() != ref->burn_subtitles()) {
+                       throw JoinError (_("Content to be joined must have the same 'burn subtitles' setting."));
+               }
+
                if (sc->subtitle_x_offset() != ref->subtitle_x_offset()) {
                        throw JoinError (_("Content to be joined must have the same subtitle X offset."));
                }
@@ -151,6 +158,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film, vector<shared_ptr
        }
 
        _use_subtitles = ref->use_subtitles ();
+       _burn_subtitles = ref->burn_subtitles ();
        _subtitle_x_offset = ref->subtitle_x_offset ();
        _subtitle_y_offset = ref->subtitle_y_offset ();
        _subtitle_x_scale = ref->subtitle_x_scale ();
@@ -168,6 +176,7 @@ SubtitleContent::as_xml (xmlpp::Node* root) const
        boost::mutex::scoped_lock lm (_mutex);
 
        root->add_child("UseSubtitles")->add_child_text (raw_convert<string> (_use_subtitles));
+       root->add_child("BurnSubtitles")->add_child_text (raw_convert<string> (_burn_subtitles));
        root->add_child("SubtitleXOffset")->add_child_text (raw_convert<string> (_subtitle_x_offset));
        root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
        root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
@@ -189,6 +198,16 @@ SubtitleContent::set_use_subtitles (bool u)
        signal_changed (SubtitleContentProperty::USE_SUBTITLES);
 }
 
+void
+SubtitleContent::set_burn_subtitles (bool b)
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _burn_subtitles = b;
+       }
+       signal_changed (SubtitleContentProperty::BURN_SUBTITLES);
+}
+
 void
 SubtitleContent::set_subtitle_x_offset (double o)
 {

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 7f2e3b136a1720714df15b5a996104f552d14d81..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;
 };
@@ -60,6 +61,7 @@ public:
        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 +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;
@@ -111,6 +118,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.
         */