X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=52b22fa067955b48341b40947a728161f65c6152;hb=003de48cd0371a60d095dc9d02ed5763c410cf5e;hp=61e63460bae8469d4650e6fa65932ef8b4a74fef;hpb=dedac27070ac5ad65265a0db1fa316b3e436cea7;p=dcpomatic.git diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 61e63460b..52b22fa06 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -26,7 +26,6 @@ #include #include "film.h" #include "format.h" -#include "job.h" #include "options.h" #include "exceptions.h" #include "image.h" @@ -37,6 +36,8 @@ #include "subtitle.h" #include "filter_graph.h" +#include "i18n.h" + using std::string; using std::stringstream; using std::min; @@ -46,25 +47,22 @@ using boost::shared_ptr; using boost::optional; /** @param f Film. - * @param o Options. - * @param j Job that we are running within, or 0 + * @param o Decode options. */ -Decoder::Decoder (boost::shared_ptr f, boost::shared_ptr o, Job* j) +Decoder::Decoder (boost::shared_ptr f, DecodeOptions o) : _film (f) , _opt (o) - , _job (j) { _film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1)); } -/** Seek. - * @param p Position as a source timestamp in seconds. +/** Seek to a position as a source timestamp in seconds. * @return true on error. */ bool -Decoder::seek (double p) +Decoder::seek (double) { - throw DecodeError ("decoder does not support seek"); + throw DecodeError (N_("decoder does not support seek")); } /** Seek so that the next frame we will produce is the same as the last one. @@ -73,5 +71,5 @@ Decoder::seek (double p) bool Decoder::seek_to_last () { - throw DecodeError ("decoder does not support seek"); + throw DecodeError (N_("decoder does not support seek")); }