X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_mono_picture_asset.h;h=54429ad4bd4ad49beaf8706c75d174739f06189a;hb=3d53fb23efa153e10c37071a4ecac48b74c2dbd6;hp=e707fc4290829dbe51b167e12578a62d24ecdb92;hpb=d1f0b2b71a702b5624485cfeacaee5d58c4af5b2;p=libdcp.git

diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index e707fc42..54429ad4 100644
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,46 +15,67 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    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"
+
 
 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 ();
-	ReelMonoPictureAsset (boost::shared_ptr<MonoPictureAsset> asset, int64_t entry_point);
-	ReelMonoPictureAsset (boost::shared_ptr<const cxml::Node>);
+	ReelMonoPictureAsset (std::shared_ptr<MonoJ2KPictureAsset> 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 */
+	std::shared_ptr<const MonoJ2KPictureAsset> mono_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_asset () {
+		return asset_of_type<MonoJ2KPictureAsset>();
 	}
 
 private:
-	std::string cpl_node_name () const;
+	std::string cpl_node_name (Standard standard) const override;
 };
 
+
 }
 
+
 #endif