Rename EncodedData -> Data and trim it a bit.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7091930f48ab4be5f8245bf513355901fee7a468..a0a57e0bbd84a66a506ba547757f9c6edc9e8e27 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -30,7 +30,7 @@
 #include "cross.h"
 #include "audio_buffers.h"
 #include "md5_digester.h"
-#include "encoded_data.h"
+#include "data.h"
 #include "version.h"
 #include "font.h"
 #include "util.h"
@@ -48,7 +48,6 @@
 #include <dcp/signer.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
-#include <dcp/font.h>
 #include <boost/foreach.hpp>
 #include <fstream>
 #include <cerrno>
@@ -159,7 +158,7 @@ Writer::~Writer ()
 }
 
 void
-Writer::write (shared_ptr<const EncodedData> encoded, int frame, Eyes eyes)
+Writer::write (shared_ptr<const Data> encoded, int frame, Eyes eyes)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
@@ -329,11 +328,16 @@ try
                        {
                                LOG_GENERAL (N_("Writer FULL-writes %1 (%2)"), qi.frame, qi.eyes);
                                if (!qi.encoded) {
-                                       qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
+                                       qi.encoded.reset (new Data (_film->j2c_path (qi.frame, qi.eyes, false)));
                                }
 
-                               dcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
-                               qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
+                               dcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data().get (), qi.encoded->size());
+                               FILE* file = fopen_boost (_film->info_file(), "ab");
+                               if (!file) {
+                                       throw OpenFileError (_film->info_file ());
+                               }
+                               write_frame_info (file, qi.frame, qi.eyes, fin);
+                               fclose (file);
                                _last_written[qi.eyes] = qi.encoded;
                                ++_full_written;
                                break;
@@ -391,8 +395,8 @@ try
                                _last_written_frame + 1,
                                _last_written_eyes, i->frame
                                );
-                       
-                       i->encoded->write (_film, i->frame, i->eyes);
+
+                       i->encoded->write_via_temp (_film->j2c_path (i->frame, i->eyes, true), _film->j2c_path (i->frame, i->eyes, false));
                        
                        lock.lock ();
                        i->encoded.reset ();
@@ -505,48 +509,34 @@ Writer::finish ()
        shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (_picture_asset);
        if (mono) {
                reel->add (shared_ptr<dcp::ReelPictureAsset> (new dcp::ReelMonoPictureAsset (mono, 0)));
-               dcp.add (mono);
        }
 
        shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (_picture_asset);
        if (stereo) {
                reel->add (shared_ptr<dcp::ReelPictureAsset> (new dcp::ReelStereoPictureAsset (stereo, 0)));
-               dcp.add (stereo);
        }
 
        if (_sound_asset) {
                reel->add (shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (_sound_asset, 0)));
-               dcp.add (_sound_asset);
        }
 
        if (_subtitle_asset) {
                boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf";
 
-               /* Add all the fonts to the subtitle content and as assets to the DCP */
+               /* Add all the fonts to the subtitle content */
                BOOST_FOREACH (shared_ptr<Font> i, _fonts) {
-                       boost::filesystem::path const from = i->file.get_value_or (liberation);
-                       _subtitle_asset->add_font (i->id, from.leaf().string ());
-
-                       boost::filesystem::path to = _film->dir (_film->dcp_name ()) / _subtitle_asset->id ();
-                       boost::filesystem::create_directories (to, ec);
-                       if (ec) {
-                               throw FileError (_("Could not create directory"), to);
-                       }
-
-                       to /= from.leaf();
-
-                       boost::system::error_code ec;
-                       boost::filesystem::copy_file (from, to, ec);
-                       if (ec) {
-                               throw FileError ("Could not copy font to DCP", from);
-                       }
-
-                       dcp.add (shared_ptr<dcp::Font> (new dcp::Font (to)));
+                       _subtitle_asset->add_font (i->id(), i->file().get_value_or (liberation));
                }
 
-               _subtitle_asset->write (
-                       _film->dir (_film->dcp_name ()) / _subtitle_asset->id () / subtitle_content_filename (_subtitle_asset)
-                       );
+               if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (_subtitle_asset)) {
+                       boost::filesystem::path directory = _film->dir (_film->dcp_name ()) / _subtitle_asset->id ();
+                       boost::filesystem::create_directories (directory);
+                       _subtitle_asset->write (directory / ("sub_" + _subtitle_asset->id() + ".xml"));
+               } else {
+                       _subtitle_asset->write (
+                               _film->dir (_film->dcp_name ()) / ("sub_" + _subtitle_asset->id() + ".mxf")
+                               );
+               }
                
                reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
                                   new dcp::ReelSubtitleAsset (
@@ -556,8 +546,6 @@ Writer::finish ()
                                           0
                                           )
                                   ));
-               
-               dcp.add (_subtitle_asset);
        }
        
        cpl->add (reel);
@@ -613,15 +601,15 @@ Writer::check_existing_picture_asset_frame (FILE* asset, int f, Eyes eyes)
        
        /* Read the data from the asset and hash it */
        dcpomatic_fseek (asset, info.offset, SEEK_SET);
-       EncodedData data (info.size);
-       size_t const read = fread (data.data(), 1, data.size(), asset);
+       Data data (info.size);
+       size_t const read = fread (data.data().get(), 1, data.size(), asset);
        if (read != static_cast<size_t> (data.size ())) {
                LOG_GENERAL ("Existing frame %1 is incomplete", f);
                return false;
        }
 
        MD5Digester digester;
-       digester.add (data.data(), data.size());
+       digester.add (data.data().get(), data.size());
        if (digester.get() != info.hash) {
                LOG_GENERAL ("Existing frame %1 failed hash check", f);
                return false;