Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 692134654a84b3301f40ec02fbae8660b19cc852..5dd9f5d2598f3b9bb566b0ea89f18b317ef8437c 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -88,6 +88,7 @@ ReelWriter::ReelWriter (
 
        if (_film->encrypted ()) {
                _picture_asset->set_key (_film->key ());
+               _picture_asset->set_context_id (_film->context_id ());
        }
 
        _picture_asset->set_file (
@@ -112,11 +113,13 @@ ReelWriter::ReelWriter (
                        _sound_asset->set_key (_film->key ());
                }
 
+               DCPOMATIC_ASSERT (_film->directory());
+
                /* Write the sound asset into the film directory so that we leave the creation
                   of the DCP directory until the last minute.
                */
                _sound_asset_writer = _sound_asset->start_write (
-                       _film->directory() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
+                       _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
                        _film->interop() ? dcp::INTEROP : dcp::SMPTE
                        );
        }
@@ -128,7 +131,20 @@ ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const
 {
        FILE* file = 0;
        boost::filesystem::path info_file = _film->info_file (_period);
+
        bool const read = boost::filesystem::exists (info_file);
+
+#ifdef DCPOMATIC_WINDOWS
+       if (read) {
+               LOG_GENERAL (
+                       "Checked %1 (which exists) length is %2 perms are %3",
+                       info_file, boost::filesystem::file_size (info_file), int(boost::filesystem::status(info_file).permissions())
+                       );
+       } else {
+               LOG_GENERAL ("Checked %1 (which does not exist)", info_file);
+       }
+#endif
+
        if (read) {
                file = fopen_boost (info_file, "r+b");
        } else {
@@ -260,6 +276,7 @@ ReelWriter::finish ()
 {
        if (!_picture_asset_writer->finalize ()) {
                /* Nothing was written to the picture asset */
+               LOG_GENERAL ("Nothing was written to reel %1 of %2", _reel_index, _reel_count);
                _picture_asset.reset ();
        }
 
@@ -328,15 +345,21 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
                        reel_picture_asset.reset (new dcp::ReelStereoPictureAsset (stereo, 0));
                }
        } else {
+               LOG_GENERAL ("no picture asset of our own; look through %1", refs.size());
                /* We don't have a picture asset of our own; hopefully we have one to reference */
                BOOST_FOREACH (ReferencedReelAsset j, refs) {
                        shared_ptr<dcp::ReelPictureAsset> k = dynamic_pointer_cast<dcp::ReelPictureAsset> (j.asset);
+                       if (k) {
+                               LOG_GENERAL ("candidate picture asset period is %1-%2", j.period.from.get(), j.period.to.get());
+                       }
                        if (k && j.period == _period) {
                                reel_picture_asset = k;
                        }
                }
        }
 
+       LOG_GENERAL ("create_reel for %1-%2; %3 of %4", _period.from.get(), _period.to.get(), _reel_index, _reel_count);
+
        DCPOMATIC_ASSERT (reel_picture_asset);
        reel->add (reel_picture_asset);
 
@@ -489,7 +512,7 @@ ReelWriter::write (PlayerSubtitles subs)
                }
        }
 
-       BOOST_FOREACH (dcp::SubtitleString i, subs.text) {
+       BOOST_FOREACH (SubtitleString i, subs.text) {
                i.set_in  (i.in()  - dcp::Time (_period.from.seconds(), i.in().tcr));
                i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
                _subtitle_asset->add (i);