#include "film.h"
#include "transcoder.h"
#include "log.h"
-#include "safe_stringstream.h"
#include "compose.hpp"
-#include <boost/make_shared.hpp>
#include <iostream>
#include <iomanip>
using std::setprecision;
using std::cout;
using boost::shared_ptr;
-using boost::make_shared;
/** @param s Film to use.
*/
_transcoder.reset ();
if (_film->upload_after_make_dcp ()) {
- shared_ptr<Job> job = make_shared<UploadJob> (_film);
+ shared_ptr<Job> job (new UploadJob (_film));
JobManager::instance()->add (job);
}
return Job::status ();
}
- SafeStringStream s;
-
- s << Job::status ();
-
- if (!finished () && !_transcoder->finishing ()) {
+ char buffer[256];
+ if (finished() || _transcoder->finishing()) {
+ strncpy (buffer, Job::status().c_str(), 256);
+ } else {
/// TRANSLATORS: fps here is an abbreviation for frames per second
- s << "; " << _transcoder->video_frames_enqueued() << "/"
- << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
- << fixed << setprecision (1) << fps << " " << _("fps");
+ snprintf (
+ buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames; %.1f fps",
+ Job::status().c_str(),
+ _transcoder->video_frames_enqueued(),
+ _film->length().frames_round (_film->video_frame_rate ()),
+ fps
+ );
}
- return s.str ();
+ return buffer;
}
/** @return Approximate remaining time in seconds */
/* _transcoder might be destroyed by the job-runner thread */
shared_ptr<Transcoder> t = _transcoder;
- if (!t) {
- return 0;
+ if (!t || t->finishing()) {
+ /* We aren't doing any actual encoding so just use the job's guess */
+ return Job::remaining_time ();
}
+ /* We're encoding so guess based on the current encoding rate */
+
float fps = t->current_encoding_rate ();
if (fps == 0) {