Untested merge of master.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 34accf6c740afdd60eb0e97a1a2e763d28a2c7e8..20e32bfbf64ce83d58b38672a0a6be5500085eb7 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for decoders of content.
  */
 
-#ifndef DVDOMATIC_DECODER_H
-#define DVDOMATIC_DECODER_H
+#ifndef DCPOMATIC_DECODER_H
+#define DCPOMATIC_DECODER_H
 
 #include <vector>
 #include <string>
@@ -56,7 +56,10 @@ public:
 
        virtual bool pass () = 0;
        virtual bool seek (double);
-       virtual bool seek_to_last ();
+       virtual void seek_back () {}
+       virtual void seek_forward () {}
+
+       boost::signals2::signal<void()> OutputChanged;
 
 protected:
        boost::shared_ptr<const Film> _film;