projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index a0537cd428b343f2190bd07a57bdaee8ad65953c..4a85fa18aa8935d0a2c0ff5670f504de012b439e 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-30,10
+30,14
@@
#include "i18n.h"
#include "i18n.h"
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
+#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
+
using std::string;
using std::stringstream;
using std::fixed;
using std::setprecision;
using std::string;
using std::stringstream;
using std::fixed;
using std::setprecision;
+using std::cout;
using boost::shared_ptr;
/** @param s Film to use.
using boost::shared_ptr;
/** @param s Film to use.
@@
-61,20
+65,20
@@
TranscodeJob::run ()
{
try {
{
try {
-
_film->log()->log
(N_("Transcode job starting"));
+
LOG_GENERAL_NC
(N_("Transcode job starting"));
_transcoder.reset (new Transcoder (_film, shared_from_this ()));
_transcoder->go ();
set_progress (1);
set_state (FINISHED_OK);
_transcoder.reset (new Transcoder (_film, shared_from_this ()));
_transcoder->go ();
set_progress (1);
set_state (FINISHED_OK);
-
_film->log()->log
(N_("Transcode job completed successfully"));
+
LOG_GENERAL_NC
(N_("Transcode job completed successfully"));
_transcoder.reset ();
} catch (...) {
set_progress (1);
set_state (FINISHED_ERROR);
_transcoder.reset ();
} catch (...) {
set_progress (1);
set_state (FINISHED_ERROR);
-
_film->log()->log
(N_("Transcode job failed or cancelled"));
+
LOG_ERROR_NC
(N_("Transcode job failed or cancelled"));
_transcoder.reset ();
throw;
}
_transcoder.reset ();
throw;
}
@@
-103,6
+107,7
@@
TranscodeJob::status () const
return s.str ();
}
return s.str ();
}
+/** @return Approximate remaining time in seconds */
int
TranscodeJob::remaining_time () const
{
int
TranscodeJob::remaining_time () const
{
@@
-120,6
+125,5
@@
TranscodeJob::remaining_time () const
}
/* Compute approximate proposed length here, as it's only here that we need it */
}
/* Compute approximate proposed length here, as it's only here that we need it */
- VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
- return left / fps;
+ return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
}
}