Merge master.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 2fe265c145a6a863088a39eb2ee597cef164130a..082ad5076cd402647f43800596f45614319616f6 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -23,7 +23,6 @@
 
 #include <iostream>
 #include "film.h"
-#include "options.h"
 #include "exceptions.h"
 #include "util.h"
 #include "decoder.h"
@@ -36,14 +35,13 @@ using boost::shared_ptr;
 /** @param f Film.
  *  @param o Decode options.
  */
-Decoder::Decoder (shared_ptr<const Film> f, DecodeOptions o)
+Decoder::Decoder (shared_ptr<const Film> f)
        : _film (f)
-       , _opt (o)
 {
        _film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
 }
 
-/** Seek to a position as a source timestamp in seconds.
+/** Seek to a position as a content timestamp in seconds.
  *  @return true on error.
  */
 bool
@@ -51,12 +49,3 @@ Decoder::seek (double)
 {
        throw DecodeError (N_("decoder does not support seek"));
 }
-
-/** Seek so that the next frame we will produce is the same as the last one.
- *  @return true on error.
- */
-bool
-Decoder::seek_to_last ()
-{
-       throw DecodeError (N_("decoder does not support seek"));
-}