Merge.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index f1451763e6c4253a835a34f32c7d2b6c3cba19ba..e9f7ab582a8ed95b489859288e46f7cb11d63478 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -27,7 +27,7 @@
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
-#include "format.h"
+#include "ratio.h"
 #include "log.h"
 #include "dcp_video_frame.h"
 #include "dcp_content_type.h"
@@ -76,7 +76,7 @@ Writer::Writer (shared_ptr<Film> f, shared_ptr<Job> j)
                        _film->internal_video_mxf_dir (),
                        _film->internal_video_mxf_filename (),
                        _film->dcp_video_frame_rate (),
-                       _film->format()->dcp_size ()
+                       _film->container()->size (_film->full_frame ())
                        )
                );
 
@@ -87,7 +87,7 @@ Writer::Writer (shared_ptr<Film> f, shared_ptr<Job> j)
                        _film->dir (_film->dcp_name()),
                        _film->dcp_audio_mxf_filename (),
                        _film->dcp_video_frame_rate (),
-                       MAX_AUDIO_CHANNELS,
+                       _film->dcp_audio_channels (),
                        _film->dcp_audio_frame_rate()
                        )
                );
@@ -133,6 +133,7 @@ Writer::fake_write (int frame)
 void
 Writer::write (shared_ptr<const AudioBuffers> audio)
 {
+       cout << "W: audio " << audio->frames() << "\n";
        _sound_asset_writer->write (audio->data(), audio->frames());
 }
 
@@ -264,15 +265,8 @@ Writer::finish ()
        _sound_asset_writer->finalize ();
        
        int const frames = _last_written_frame + 1;
-       int duration = 0;
-       if (_film->trim_type() == Film::CPL) {
-               duration = frames - _film->trim_start() - _film->trim_end();
-               _picture_asset->set_entry_point (_film->trim_start ());
-       } else {
-               duration = frames;
-       }
        
-       _picture_asset->set_duration (duration);
+       _picture_asset->set_duration (frames);
 
        /* Hard-link the video MXF into the DCP */
 
@@ -296,11 +290,7 @@ Writer::finish ()
 
        _picture_asset->set_directory (_film->dir (_film->dcp_name ()));
        _picture_asset->set_file_name (_film->dcp_video_mxf_filename ());
-
-       if (_film->trim_type() == Film::CPL) {
-               _sound_asset->set_entry_point (_film->trim_start ());
-       }
-       _sound_asset->set_duration (duration);
+       _sound_asset->set_duration (frames);
        
        libdcp::DCP dcp (_film->dir (_film->dcp_name()));