Merge master.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index c34a6a66d7350cd624f526b8de4b4689b2a11523..a023d5cd2e1cc28992573e180bc2ccd9cc540cbc 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -45,6 +45,7 @@
 #include "audio_buffers.h"
 #include "md5_digester.h"
 #include "encoded_data.h"
+#include "version.h"
 
 #include "i18n.h"
 
@@ -60,7 +61,6 @@ using std::pair;
 using std::string;
 using std::list;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
@@ -466,7 +466,7 @@ Writer::finish ()
                                   new dcp::ReelSubtitleAsset (
                                           _subtitle_content,
                                           dcp::Fraction (_film->video_frame_rate(), 1),
-                                          _subtitle_content->latest_subtitle_out().to_seconds() * _film->video_frame_rate(),
+                                          _picture_mxf->intrinsic_duration (),
                                           0
                                           )
                                   ));
@@ -487,7 +487,9 @@ Writer::finish ()
                _sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
        }
 
-       dcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
+       dcp::XMLMetadata meta;
+       meta.issuer = Config::instance()->dcp_issuer ();
+       meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit);
        meta.set_issue_date_now ();
 
        shared_ptr<const dcp::Signer> signer;