/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
#include "transcode_job.h"
+#include "upload_job.h"
+#include "job_manager.h"
#include "film.h"
#include "transcoder.h"
#include "log.h"
float fps = 0;
if (finish.tv_sec != start.tv_sec) {
- fps = _transcoder->video_frames_out() / (finish.tv_sec - start.tv_sec);
+ fps = _transcoder->video_frames_enqueued() / (finish.tv_sec - start.tv_sec);
}
LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
_transcoder.reset ();
+ if (_film->upload_after_make_dcp ()) {
+ shared_ptr<Job> job (new UploadJob (_film));
+ JobManager::instance()->add (job);
+ }
+
} catch (...) {
_transcoder.reset ();
throw;
if (!finished () && !_transcoder->finishing ()) {
/// TRANSLATORS: fps here is an abbreviation for frames per second
- s << "; " << _transcoder->video_frames_out() << "/"
+ s << "; " << _transcoder->video_frames_enqueued() << "/"
<< _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
<< fixed << setprecision (1) << fps << " " << _("fps");
}
}
/* Compute approximate proposed length here, as it's only here that we need it */
- return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
+ return (_film->length().frames_round (_film->video_frame_rate ()) - t->video_frames_enqueued()) / fps;
}