{Video,Audio}Frame -> Frame.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 5381fb21ec72a83717ca9b6f7e3368532cb3d48b..5266604c58c54fa94e5132af1146c7440d6c255f 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -43,7 +43,7 @@ class VideoDecoder : public virtual Decoder
 public:
        VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-       std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+       std::list<ContentVideo> get_video (Frame frame, bool accurate);
 
        boost::shared_ptr<const VideoContent> video_content () const {
                return _video_content;
@@ -60,10 +60,10 @@ protected:
        friend struct video_decoder_fill_test2;
 
        void seek (ContentTime time, bool accurate);
-       void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
-       std::list<ContentVideo> decoded_video (VideoFrame frame);
-       void fill_2d (VideoFrame from, VideoFrame to);
-       void fill_3d (VideoFrame from, VideoFrame to, Eyes);
+       void video (boost::shared_ptr<const ImageProxy>, Frame frame);
+       std::list<ContentVideo> decoded_video (Frame frame);
+       void fill_2d (Frame from, Frame to);
+       void fill_3d (Frame from, Frame to, Eyes);
 
        boost::shared_ptr<const VideoContent> _video_content;
        std::list<ContentVideo> _decoded_video;