Support file:// URI-style file specifiers in asset map.

[libdcp.git] / src / picture_mxf.h

diff --git a/src/picture_mxf.h b/src/picture_mxf.h
index 4653196dc14f70d0546779a60053926f5b7cd552..1ce2e7de08836d061a6f1af42bc70824be8f458d 100644 (file)
--- a/src/picture_mxf.h
+++ b/src/picture_mxf.h
@@ -20,14 +20,14 @@
 #ifndef LIBDCP_PICTURE_MXF_H
 #define LIBDCP_PICTURE_MXF_H
 
-/** @file  src/picture_asset.h
- *  @brief An asset made up of JPEG2000 data
+/** @file  src/picture_mxf.h
+ *  @brief PictureMXF class.
  */
 
-#include <openjpeg.h>
 #include "mxf.h"
 #include "util.h"
 #include "metadata.h"
+#include <openjpeg.h>
 
 namespace ASDCP {
        namespace JP2K {
@@ -42,34 +42,46 @@ class MonoPictureFrame;
 class StereoPictureFrame;
 class PictureMXFWriter;
 
-/** @brief An asset made up of JPEG2000 data */
+/** @class PictureMXF
+ *  @brief An asset made up of JPEG2000 data.
+ */
 class PictureMXF : public MXF
 {
 public:
        PictureMXF (boost::filesystem::path file);
        PictureMXF (Fraction edit_rate);
 
-       virtual boost::shared_ptr<PictureMXFWriter> start_write (boost::filesystem::path file, Standard standard, bool overwrite) = 0;
-
-       void write_to_pkl (xmlpp::Node* node) const;
+       virtual boost::shared_ptr<PictureMXFWriter> start_write (
+               boost::filesystem::path file,
+               Standard standard,
+               bool overwrite
+               ) = 0;
 
        Size size () const {
                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;
        }
 
-       Fraction edit_rate () const {
-               return _edit_rate;
+       void set_screen_aspect_ratio (Fraction r) {
+               _screen_aspect_ratio = r;
        }
 
-protected:     
+protected:
 
        bool frame_buffer_equals (
                int frame, EqualityOptions opt, boost::function<void (NoteType, std::string)> note,
@@ -77,7 +89,9 @@ protected:
                ) const;
 
        bool descriptor_equals (
-               ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function<void (NoteType, std::string)>
+               ASDCP::JP2K::PictureDescriptor const & a,
+               ASDCP::JP2K::PictureDescriptor const & b,
+               boost::function<void (NoteType, std::string)>
                ) const;
 
        void read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const &);
@@ -89,7 +103,9 @@ protected:
 
 private:
        std::string key_type () const;
-       virtual int edit_rate_factor () const = 0;
+       std::string asdcp_kind () const {
+               return "Picture";
+       }
 };