Merge branch 'master' into trimming

[dcpomatic.git] / src / lib / decoder.cc

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index fd0abee4183e540b4a4db5c5a9cb3588e5d8a34c..52b22fa067955b48341b40947a728161f65c6152 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -26,7 +26,6 @@
 #include <boost/lexical_cast.hpp>
 #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;
@@ -47,12 +48,10 @@ using boost::optional;
 
 /** @param f Film.
  *  @param o Decode options.
- *  @param j Job that we are running within, or 0
  */
-Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
+Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o)
        : _film (f)
        , _opt (o)
-       , _job (j)
 {
        _film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
 }
@@ -63,7 +62,7 @@ Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
 bool
 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.
@@ -72,5 +71,5 @@ Decoder::seek (double)
 bool
 Decoder::seek_to_last ()
 {
-       throw DecodeError ("decoder does not support seek");
+       throw DecodeError (N_("decoder does not support seek"));
 }