Butler::Audio::ENABLED
)
{
- _player->set_always_burn_open_subtitles ();
- _player->set_play_referenced ();
+ _player.set_always_burn_open_subtitles();
+ _player.set_play_referenced();
}
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
std::vector<float> interleaved(_output_audio_channels * audio_frames);
auto deinterleaved = make_shared<AudioBuffers>(_output_audio_channels, audio_frames);
int const gets_per_frame = _film->three_d() ? 2 : 1;
- for (DCPTime i; i < _film->length(); i += video_frame) {
+ for (DCPTime time; time < _film->length(); time += video_frame) {
- if (file_encoders.size() > 1 && !reel->contains(i)) {
+ if (file_encoders.size() > 1 && !reel->contains(time)) {
/* Next reel and file */
++reel;
++encoder;
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) {
{
boost::mutex::scoped_lock lm (_mutex);
- _last_time = i;
+ _last_time = time;
}
auto job = _job.lock ();
if (job) {
- job->set_progress (float(i.get()) / _film->length().get());
+ job->set_progress(float(time.get()) / _film->length().get());
}
waker.nudge ();
)
{
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 {