Rename classes to follow preparatory renames in libdcp.

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

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index d925bef864fe9129fc59dd8246b4b305325ea55e..1d2d5cc21563e611cf97195d272dd0e0a44e68cc 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -26,8 +26,8 @@
 
 
 namespace dcp {
-       class MonoPictureFrame;
-       class StereoPictureFrame;
+       class MonoJ2KPictureFrame;
+       class StereoJ2KPictureFrame;
 }
 
 
@@ -37,14 +37,14 @@ public:
        J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
 
        J2KImageProxy (
-               std::shared_ptr<const dcp::MonoPictureFrame> frame,
+               std::shared_ptr<const dcp::MonoJ2KPictureFrame> frame,
                dcp::Size,
                AVPixelFormat pixel_format,
                boost::optional<int> forced_reduction
                );
 
        J2KImageProxy (
-               std::shared_ptr<const dcp::StereoPictureFrame> frame,
+               std::shared_ptr<const dcp::StereoJ2KPictureFrame> frame,
                dcp::Size,
                dcp::Eye,
                AVPixelFormat pixel_format,
@@ -59,13 +59,13 @@ public:
        Result image (
                Image::Alignment alignment,
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
-               ) const;
+               ) const override;
 
-       void add_metadata (xmlpp::Node *) const;
-       void write_to_socket (std::shared_ptr<Socket>) const;
+       void add_metadata(xmlpp::Element*) const override;
+       void write_to_socket (std::shared_ptr<Socket> override) const override;
        /** @return true if our image is definitely the same as another, false if it is probably not */
-       bool same (std::shared_ptr<const ImageProxy>) const;
-       int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
+       bool same (std::shared_ptr<const ImageProxy>) const override;
+       int prepare (Image::Alignment alignment, boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const override;
 
        std::shared_ptr<const dcp::Data> j2k () const {
                return _data;
@@ -79,7 +79,7 @@ public:
                return _eye;
        }
 
-       size_t memory_used () const;
+       size_t memory_used () const override;
 
 private:
        std::shared_ptr<const dcp::Data> _data;