Add Content::set_paths().

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 9c7e790402c157aa7ffec1ad20a7b1e79e30948d..21b04c6493aea2f3d2ee0410a788b39a8dc85d04 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,11 +25,15 @@
 #include "content.h"
 #include "util.h"
 #include "content_factory.h"
+#include "video_content.h"
+#include "audio_content.h"
+#include "subtitle_content.h"
 #include "exceptions.h"
 #include "film.h"
 #include "job.h"
 #include "compose.hpp"
-#include "raw_convert.h"
+#include <dcp/locale_convert.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
@@ -44,6 +48,8 @@ using std::vector;
 using std::max;
 using std::pair;
 using boost::shared_ptr;
+using dcp::raw_convert;
+using dcp::locale_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -132,12 +138,14 @@ Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
 }
 
 void
-Content::as_xml (xmlpp::Node* node) const
+Content::as_xml (xmlpp::Node* node, bool with_paths) const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
-               node->add_child("Path")->add_child_text (i->string ());
+       if (with_paths) {
+               for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
+                       node->add_child("Path")->add_child_text (i->string ());
+               }
        }
        node->add_child("Digest")->add_child_text (_digest);
        node->add_child("Position")->add_child_text (raw_convert<string> (_position.get ()));
@@ -228,7 +236,7 @@ Content::clone () const
        /* This is a bit naughty, but I can't think of a compelling reason not to do it ... */
        xmlpp::Document doc;
        xmlpp::Node* node = doc.create_root_node ("Content");
-       as_xml (node);
+       as_xml (node, true);
 
        /* notes is unused here (we assume) */
        list<string> notes;
@@ -281,6 +289,13 @@ Content::set_path (boost::filesystem::path path)
        signal_changed (ContentProperty::PATH);
 }
 
+void
+Content::set_paths (vector<boost::filesystem::path> paths)
+{
+       _paths = paths;
+       signal_changed (ContentProperty::PATH);
+}
+
 string
 Content::path_summary () const
 {
@@ -319,7 +334,7 @@ Content::reel_split_points () const
 {
        list<DCPTime> t;
        /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */
-       t.push_back (position().round_up (film()->video_frame_rate()));
+       t.push_back (position().ceil (film()->video_frame_rate()));
        return t;
 }
 
@@ -364,7 +379,7 @@ Content::add_properties (list<UserProperty>& p) const
                                UserProperty (
                                        UserProperty::VIDEO,
                                        _("Frame rate"),
-                                       raw_convert<string> (_video_frame_rate.get(), 5),
+                                       locale_convert<string> (_video_frame_rate.get(), 5),
                                        _("frames per second")
                                        )
                                );
@@ -373,10 +388,24 @@ Content::add_properties (list<UserProperty>& p) const
                                UserProperty (
                                        UserProperty::GENERAL,
                                        _("Prepared for video frame rate"),
-                                       raw_convert<string> (_video_frame_rate.get(), 5),
+                                       locale_convert<string> (_video_frame_rate.get(), 5),
                                        _("frames per second")
                                        )
                                );
                }
        }
 }
+
+void
+Content::use_template (shared_ptr<const Content> c)
+{
+       if (video && c->video) {
+               video->use_template (c->video);
+       }
+       if (audio && c->audio) {
+               audio->use_template (c->audio);
+       }
+       if (subtitle && c->subtitle) {
+               subtitle->use_template (c->subtitle);
+       }
+}