When the player is used in OpenGL mode, pass unscaled XYZ data through to the shader...

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 216ad6784b22f1df56da7f2ebea36468f4fc7953..655b8baf6aa861af5c947eaed8b2e2ce6580c2ed 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -43,13 +43,13 @@ int const VideoContentProperty::USE               = 0;
 int const VideoContentProperty::SIZE              = 1;
 int const VideoContentProperty::FRAME_TYPE        = 2;
 int const VideoContentProperty::CROP              = 3;
-int const VideoContentProperty::SCALE            = 4;
-int const VideoContentProperty::COLOUR_CONVERSION = 5;
-int const VideoContentProperty::FADE_IN           = 6;
-int const VideoContentProperty::FADE_OUT          = 7;
-int const VideoContentProperty::RANGE             = 8;
-int const VideoContentProperty::CUSTOM_RATIO      = 9;
-int const VideoContentProperty::CUSTOM_SIZE       = 10;
+int const VideoContentProperty::COLOUR_CONVERSION = 4;
+int const VideoContentProperty::FADE_IN           = 5;
+int const VideoContentProperty::FADE_OUT          = 6;
+int const VideoContentProperty::RANGE             = 7;
+int const VideoContentProperty::CUSTOM_RATIO      = 8;
+int const VideoContentProperty::CUSTOM_SIZE       = 9;
+int const VideoContentProperty::BURNT_SUBTITLE_LANGUAGE = 10;
 
 using std::string;
 using std::setprecision;
@@ -183,8 +183,15 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
        if (node->optional_string_child("Range").get_value_or("full") == "video") {
                _range = VideoRange::VIDEO;
        }
+
+       auto burnt = node->optional_string_child("BurntSubtitleLanguage");
+       if (burnt) {
+               _burnt_subtitle_language = dcp::LanguageTag (*burnt);
+       }
+
 }
 
+
 VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
        : ContentPart (parent)
        , _length (0)
@@ -227,6 +234,10 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
                        throw JoinError (_("Content to be joined must have the same fades."));
                }
 
+               if (c[i]->video->burnt_subtitle_language() != ref->burnt_subtitle_language()) {
+                       throw JoinError (_("Content to be joined must have the same burnt subtitle language."));
+               }
+
                _length += c[i]->video->length ();
 
                if (c[i]->video->yuv ()) {
@@ -243,8 +254,10 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
        _fade_in = ref->fade_in ();
        _fade_out = ref->fade_out ();
        _range = ref->range ();
+       _burnt_subtitle_language = ref->burnt_subtitle_language ();
 }
 
+
 void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
@@ -272,6 +285,9 @@ VideoContent::as_xml (xmlpp::Node* node) const
        node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
        node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
        node->add_child("Range")->add_child_text(_range == VideoRange::FULL ? "full" : "video");
+       if (_burnt_subtitle_language) {
+               node->add_child("BurntSubtitleLanguage")->add_child_text(_burnt_subtitle_language->to_string());
+       }
 }
 
 void
@@ -284,10 +300,9 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
        auto const yuv = d->yuv ();
        auto const range = d->range ();
 
-       ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
-       ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
-       ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
-       ChangeSignaller<Content> cc4 (_parent, VideoContentProperty::RANGE);
+       ContentChangeSignaller cc1 (_parent, VideoContentProperty::SIZE);
+       ContentChangeSignaller cc2 (_parent, ContentProperty::LENGTH);
+       ContentChangeSignaller cc3 (_parent, VideoContentProperty::RANGE);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -556,6 +571,14 @@ VideoContent::set_use (bool u)
        maybe_set (_use, u, VideoContentProperty::USE);
 }
 
+
+void
+VideoContent::set_burnt_subtitle_language (boost::optional<dcp::LanguageTag> language)
+{
+       maybe_set (_burnt_subtitle_language, language, VideoContentProperty::BURNT_SUBTITLE_LANGUAGE);
+}
+
+
 void
 VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
@@ -574,8 +597,10 @@ VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
        set_custom_size (c->_custom_size);
        set_fade_in (c->_fade_in);
        set_fade_out (c->_fade_out);
+       set_burnt_subtitle_language (c->_burnt_subtitle_language);
 }
 
+
 void
 VideoContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
 {