New DCPTime/ContentTime types.

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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index a4c10195c5b156aba190b0ccb4d90560109f58a0..6c63314865dae6f9b760a7f94373d533d13577fa 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -19,16 +19,16 @@
 
 #include <fstream>
 #include <cerrno>
-#include <libdcp/mono_picture_mxf.h>
-#include <libdcp/stereo_picture_mxf.h>
-#include <libdcp/sound_mxf.h>
-#include <libdcp/sound_mxf_writer.h>
-#include <libdcp/reel.h>
-#include <libdcp/reel_mono_picture_asset.h>
-#include <libdcp/reel_stereo_picture_asset.h>
-#include <libdcp/reel_sound_asset.h>
-#include <libdcp/dcp.h>
-#include <libdcp/cpl.h>
+#include <dcp/mono_picture_mxf.h>
+#include <dcp/stereo_picture_mxf.h>
+#include <dcp/sound_mxf.h>
+#include <dcp/sound_mxf_writer.h>
+#include <dcp/reel.h>
+#include <dcp/reel_mono_picture_asset.h>
+#include <dcp/reel_stereo_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
+#include <dcp/dcp.h>
+#include <dcp/cpl.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
@@ -41,6 +41,7 @@
 #include "config.h"
 #include "job.h"
 #include "cross.h"
+#include "audio_buffers.h"
 
 #include "i18n.h"
 
@@ -294,7 +295,7 @@ try
                        if (_film->length()) {
                                shared_ptr<Job> job = _job.lock ();
                                assert (job);
-                               int total = _film->time_to_video_frames (_film->length ());
+                               int64_t total = _film->length().frames (_film->video_frame_rate ());
                                if (_film->three_d ()) {
                                        /* _full_written and so on are incremented for each eye, so we need to double the total
                                           frames to get the correct progress.