Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 7726d2057fe9b3eec7c5a20914d4b159ef4ce071..283ab5d884c0f3d4d379e15033dd549032ec29b2 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -27,12 +27,12 @@
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
+       VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
        /** @return video frames per second, or 0 if unknown */
        virtual float frames_per_second () const = 0;
        /** @return native size in pixels */
-       virtual Size native_size () const = 0;
+       virtual libdcp::Size native_size () const = 0;
        /** @return length (in source video frames), according to our content's header */
        virtual SourceFrame length () const = 0;
 
@@ -43,7 +43,7 @@ public:
 
        virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
 
-       void set_progress () const;
+       void set_progress (Job *) const;
        
        int video_frame () const {
                return _video_frame;