diff options
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 2d7ee9ba3..7258826ba 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -22,12 +22,16 @@ #include <libdcp/sound_asset.h> #include <libdcp/picture_frame.h> #include <libdcp/reel.h> +#include <libdcp/dcp.h> #include "writer.h" #include "compose.hpp" #include "film.h" #include "format.h" #include "log.h" #include "dcp_video_frame.h" +#include "dcp_content_type.h" +#include "player.h" +#include "audio_mapping.h" #include "i18n.h" @@ -74,16 +78,14 @@ Writer::Writer (shared_ptr<Film> f) _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0); - AudioMapping m (_film->audio_channels ()); - - if (m.dcp_channels() > 0) { + if (_film->audio_channels() > 0) { _sound_asset.reset ( new libdcp::SoundAsset ( _film->dir (_film->dcp_name()), N_("audio.mxf"), _film->dcp_frame_rate (), - m.dcp_channels (), - dcp_audio_sample_rate (_film->audio_stream()->sample_rate()) + _film->audio_mapping().dcp_channels (), + dcp_audio_sample_rate (_film->audio_frame_rate()) ) ); |