Various attempts to clean up DCP comparison code.

[libdcp.git] / src / picture_mxf.h

diff --git a/src/picture_mxf.h b/src/picture_mxf.h
index e8040a4efd92a2434a536f94bc9c64d82cc4cb16..bf8fcf763f5a0824055e2ff32d89a7c3a16bd203 100644 (file)
--- a/src/picture_mxf.h
+++ b/src/picture_mxf.h
@@ -31,7 +31,7 @@
 
 namespace ASDCP {
        namespace JP2K {
-               class PictureDescriptor;
+               struct PictureDescriptor;
        }
 }
 
@@ -61,15 +61,27 @@ public:
                return _size;
        }
 
+       void set_size (Size s) {
+               _size = s;
+       }
+
        Fraction frame_rate () const {
                return _frame_rate;
        }
 
+       void set_frame_rate (Fraction r) {
+               _frame_rate = r;
+       }
+
        Fraction screen_aspect_ratio () const {
                return _screen_aspect_ratio;
        }
 
-protected:     
+       void set_screen_aspect_ratio (Fraction r) {
+               _screen_aspect_ratio = r;
+       }
+
+protected:
 
        bool frame_buffer_equals (
                int frame, EqualityOptions opt, boost::function<void (NoteType, std::string)> note,
@@ -90,7 +102,9 @@ protected:
        Fraction _screen_aspect_ratio;
 
 private:
-       std::string key_type () const;
+       std::string asdcp_kind () const {
+               return "Picture";
+       }
 };