projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 61e63460bae8469d4650e6fa65932ef8b4a74fef..fd0abee4183e540b4a4db5c5a9cb3588e5d8a34c 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-46,10
+46,10
@@
using boost::shared_ptr;
using boost::optional;
/** @param f Film.
using boost::optional;
/** @param f Film.
- * @param o
O
ptions.
+ * @param o
Decode o
ptions.
* @param j Job that we are running within, or 0
*/
* @param j Job that we are running within, or 0
*/
-Decoder::Decoder (boost::shared_ptr<Film> f,
boost::shared_ptr<const DecodeOptions>
o, Job* j)
+Decoder::Decoder (boost::shared_ptr<Film> f,
DecodeOptions
o, Job* j)
: _film (f)
, _opt (o)
, _job (j)
: _film (f)
, _opt (o)
, _job (j)
@@
-57,12
+57,11
@@
Decoder::Decoder (boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptio
_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 ("decoder does not support seek");
}