Split the old PictureAsset into a new PictureAsset + J2KPictureAsset.

1 files changed, 5 insertions, 46 deletions

diff --git a/src/j2k_picture_asset.h b/src/j2k_picture_asset.h
index 405f6531..cbcf5b37 100644
--- a/src/j2k_picture_asset.h
+++ b/src/j2k_picture_asset.h
@@ -37,13 +37,14 @@
  */
 
 
-#ifndef LIBDCP_PICTURE_ASSET_H
-#define LIBDCP_PICTURE_ASSET_H
+#ifndef LIBDCP_J2K_PICTURE_ASSET_H
+#define LIBDCP_J2K_PICTURE_ASSET_H
 
 
 #include "mxf.h"
-#include "util.h"
 #include "metadata.h"
+#include "picture_asset.h"
+#include "util.h"
 
 
 namespace ASDCP {
@@ -64,7 +65,7 @@ class J2KPictureAssetWriter;
 /** @class J2KPictureAsset
  *  @brief An asset made up of JPEG2000 data
  */
-class J2KPictureAsset : public Asset, public MXF
+class J2KPictureAsset : public PictureAsset
 {
 public:
 	/** Load a J2KPictureAsset from a file */
@@ -83,38 +84,6 @@ public:
 		Behaviour behaviour
 		) = 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;
-	}
-
-	void set_screen_aspect_ratio (Fraction r) {
-		_screen_aspect_ratio = r;
-	}
-
-	Fraction edit_rate () const {
-		return _edit_rate;
-	}
-
-	int64_t intrinsic_duration () const {
-		return _intrinsic_duration;
-	}
-
 	static std::string static_pkl_type (Standard standard);
 
 protected:
@@ -134,16 +103,6 @@ protected:
 
 	void read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const &);
 
-	Fraction _edit_rate;
-	/** The total length of this content in video frames.  The amount of
-	 *  content presented may be less than this.
-	 */
-	int64_t _intrinsic_duration = 0;
-	/** picture size in pixels */
-	Size _size;
-	Fraction _frame_rate;
-	Fraction _screen_aspect_ratio;
-
 private:
 	std::string pkl_type (Standard standard) const override;
 };