projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes for OS X.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 61e63460bae8469d4650e6fa65932ef8b4a74fef..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 <boost/lexical_cast.hpp>
#include "film.h"
#include "format.h"
-#include "job.h"
#include "options.h"
#include "exceptions.h"
#include "image.h"
#include "options.h"
#include "exceptions.h"
#include "image.h"
@@
-37,6
+36,8
@@
#include "subtitle.h"
#include "filter_graph.h"
#include "subtitle.h"
#include "filter_graph.h"
+#include "i18n.h"
+
using std::string;
using std::stringstream;
using std::min;
using std::string;
using std::stringstream;
using std::min;
@@
-46,25
+47,22
@@
using boost::shared_ptr;
using boost::optional;
/** @param f Film.
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<Film> f,
boost::shared_ptr<const DecodeOptions> o, Job* j
)
+Decoder::Decoder (boost::shared_ptr<Film> f,
DecodeOptions o
)
: _film (f)
, _opt (o)
: _film (f)
, _opt (o)
- , _job (j)
{
_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
}
{
_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
* @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.
}
/** 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 ()
{
bool
Decoder::seek_to_last ()
{
- throw DecodeError (
"decoder does not support seek"
);
+ throw DecodeError (
N_("decoder does not support seek")
);
}
}