map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
map.set(dcp::Channel::LS, 0, overall_gain);
break;
- case 6:
+ default:
map.set(dcp::Channel::LEFT, 0, overall_gain);
map.set(dcp::Channel::RIGHT, 1, overall_gain);
map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB);
map.set(dcp::Channel::RS, 1, overall_gain);
break;
}
- /* XXX: maybe we should do something better for >6 channel DCPs */
return map;
}
for (int i = 0; i < files; ++i) {
boost::filesystem::path filename = _output;
- string extension = boost::filesystem::extension (filename);
- filename = boost::filesystem::change_extension (filename, "");
+ auto extension = dcp::filesystem::extension(filename);
+ filename = dcp::filesystem::change_extension(filename, "");
if (files > 1) {
/// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
for (int j = 0; j < gets_per_frame; ++j) {
Butler::Error e;
- auto v = _butler.get_video(Butler::Behaviour::BLOCKING, &e);
+ auto video = _butler.get_video(Butler::Behaviour::BLOCKING, &e);
_butler.rethrow();
- if (v.first) {
- auto fe = encoder->get (v.first->eyes());
+ if (video.first) {
+ auto fe = encoder->get(video.first->eyes());
if (fe) {
- fe->video(v.first, v.second - reel->from);
+ fe->video(video.first, video.second - reel->from);
}
} else {
if (e.code != Butler::Error::Code::FINISHED) {
)
{
if (three_d) {
- /// TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export
_encoders[Eyes::LEFT] = make_shared<FFmpegFileEncoder>(
video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
+ // TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export
audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension)
);
- /// TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export
_encoders[Eyes::RIGHT] = make_shared<FFmpegFileEncoder>(
video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
+ // TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export
audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension)
);
} else {