Fix subtitle_id to work with _TEXT and _ASS subtitles (fixes #969).

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 2b953f75bf8b60e9707ccb12a00e9a8b2b4dacc7..9bb065babc3506c6751c4029b5c5fd43f59ca8e0 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -457,7 +457,7 @@ void
 VideoContent::add_properties (list<UserProperty>& p) const
 {
        p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), length (), _("video frames")));
-       p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), size().width + "x" + size().height));
+       p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), String::compose ("%1x%2", size().width, size().height)));
 }
 
 void
@@ -525,3 +525,14 @@ VideoContent::set_fade_out (Frame t)
 {
        maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
 }
+
+void
+VideoContent::use_template (shared_ptr<const VideoContent> c)
+{
+       _colour_conversion = c->_colour_conversion;
+       _frame_type = c->_frame_type;
+       _crop = c->_crop;
+       _scale = c->_scale;
+       _fade_in = c->_fade_in;
+       _fade_out = c->_fade_out;
+}