X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_mono_picture_asset.h;h=13c6545e82707416dbc3cc83b4a181d4447ed07a;hb=066471f69400fc72e9c126ab36f5427329f30220;hp=099feafd997d843d2126288587dcf75a59f1d139;hpb=4946acfd735321e7f0c29ea4b6e371bc9e90a7f6;p=libdcp.git

diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index 099feafd..13c6545e 100644
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,43 +31,62 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_mono_picture_asset.h
- *  @brief ReelMonoPictureAsset class.
+ *  @brief ReelMonoPictureAsset class
  */
 
+
 #ifndef LIBDCP_REEL_MONO_PICTURE_ASSET_H
 #define LIBDCP_REEL_MONO_PICTURE_ASSET_H
 
+
 #include "reel_picture_asset.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_mpeg2_picture_asset.h"
+
 
 namespace dcp {
 
-class MonoPictureAsset;
+
+class MonoJ2KPictureAsset;
+
 
 /** @class ReelMonoPictureAsset
- *  @brief Part of a Reel's description which refers to a monoscopic picture asset.
+ *  @brief Part of a Reel's description which refers to a monoscopic picture asset
  */
 class ReelMonoPictureAsset : public ReelPictureAsset
 {
 public:
-	ReelMonoPictureAsset (boost::shared_ptr<MonoPictureAsset> asset, int64_t entry_point);
-	explicit ReelMonoPictureAsset (boost::shared_ptr<const cxml::Node>);
+	ReelMonoPictureAsset(std::shared_ptr<PictureAsset> asset, int64_t entry_point);
+	explicit ReelMonoPictureAsset (std::shared_ptr<const cxml::Node>);
 
-	/** @return the MonoPictureAsset that this object refers to */
-	boost::shared_ptr<const MonoPictureAsset> mono_asset () const {
-		return asset_of_type<const MonoPictureAsset> ();
+	/** @return the MonoJ2KPictureAsset that this object refers to, if applicable */
+	std::shared_ptr<const MonoJ2KPictureAsset> mono_j2k_asset() const {
+		return asset_of_type<const MonoJ2KPictureAsset>();
 	}
 
-	/** @return the MonoPictureAsset that this object refers to */
-	boost::shared_ptr<MonoPictureAsset> mono_asset () {
-		return asset_of_type<MonoPictureAsset> ();
+	/** @return the MonoJ2KPictureAsset that this object refers to */
+	std::shared_ptr<MonoJ2KPictureAsset> mono_j2k_asset() {
+		return asset_of_type<MonoJ2KPictureAsset>();
+	}
+
+	/** @return the MonoMPEG2PictureAsset that this object refers to, if applicable */
+	std::shared_ptr<const MonoMPEG2PictureAsset> mono_mpeg2_asset() const {
+		return asset_of_type<const MonoMPEG2PictureAsset>();
+	}
+
+	/** @return the MonoMPEG2PictureAsset that this object refers to */
+	std::shared_ptr<MonoMPEG2PictureAsset> mono_mpeg2_asset() {
+		return asset_of_type<MonoMPEG2PictureAsset>();
 	}
 
 private:
-	std::string cpl_node_name (Standard standard) const;
+	std::string cpl_node_name (Standard standard) const override;
 };
 
+
 }
 
+
 #endif