summaryrefslogtreecommitdiff
path: root/src/lib/writer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-31 15:09:49 +0100
committerCarl Hetherington <cth@carlh.net>2013-03-31 15:09:49 +0100
commit127672223cca569986e35c91265e269ed5a6561c (patch)
tree853793c1b929d4c38ebdf5456808e466083989b7 /src/lib/writer.cc
parented78fd3d138114185e43edf81ffe91db17377da0 (diff)
Runs.
Diffstat (limited to 'src/lib/writer.cc')
-rw-r--r--src/lib/writer.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2d7ee9ba3..5f5dae98f 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -28,6 +28,7 @@
#include "format.h"
#include "log.h"
#include "dcp_video_frame.h"
+#include "playlist.h"
#include "i18n.h"
@@ -41,8 +42,9 @@ using boost::shared_ptr;
int const Writer::_maximum_frames_in_memory = 8;
-Writer::Writer (shared_ptr<Film> f)
+Writer::Writer (shared_ptr<Film> f, shared_ptr<Playlist> p)
: _film (f)
+ , _playlist (p)
, _first_nonexistant_frame (0)
, _thread (0)
, _finish (false)
@@ -74,7 +76,7 @@ Writer::Writer (shared_ptr<Film> f)
_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
- AudioMapping m (_film->audio_channels ());
+ AudioMapping m (_playlist->audio_channels ());
if (m.dcp_channels() > 0) {
_sound_asset.reset (
@@ -83,7 +85,7 @@ Writer::Writer (shared_ptr<Film> f)
N_("audio.mxf"),
_film->dcp_frame_rate (),
m.dcp_channels (),
- dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
+ dcp_audio_sample_rate (_playlist->audio_frame_rate())
)
);