X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_picture_asset.h;h=3b65abd245ddc375dc0088a6fa70e3dd38b861ae;hb=093525165f6397ba9eaffd19833dc978bcb32d55;hp=1607379a0993630b0ade428a9588b9643b85bfb6;hpb=1c17602bfc56abbf17c1e974f99477655627725b;p=libdcp.git

diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 1607379a..3b65abd2 100644
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -1,50 +1,74 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    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_picture_asset.h
- *  @brief ReelPictureAsset class.
+ *  @brief ReelPictureAsset class
  */
 
+
 #ifndef LIBDCP_REEL_PICTURE_ASSET_H
 #define LIBDCP_REEL_PICTURE_ASSET_H
 
-#include "reel_mxf_asset.h"
-#include "picture_mxf.h"
+
+#include "reel_encryptable_asset.h"
+#include "reel_asset.h"
+#include "picture_asset.h"
+
 
 namespace dcp {
 
+
 /** @class ReelPictureAsset
- *  @brief Part of a Reel's description which refers to a picture MXF.
+ *  @brief Part of a Reel's description which refers to a picture asset
  */
-class ReelPictureAsset : public ReelMXFAsset
+class ReelPictureAsset : public ReelAsset, public ReelEncryptableAsset
 {
 public:
-	ReelPictureAsset ();
-	ReelPictureAsset (boost::shared_ptr<PictureMXF> content, int64_t entry_point);
-	ReelPictureAsset (boost::shared_ptr<const cxml::Node>);
+	ReelPictureAsset (std::shared_ptr<PictureAsset> asset, int64_t entry_point);
+	explicit ReelPictureAsset (std::shared_ptr<const cxml::Node>);
 
-	virtual void write_to_cpl (xmlpp::Node* node, Standard standard) const;
-	virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
+	virtual xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
+	bool equals (std::shared_ptr<const ReelPictureAsset>, EqualityOptions, NoteHandler) const;
 
-	/** @return the PictureMXF that this object refers to */
-	boost::shared_ptr<PictureMXF> mxf () {
-		return boost::dynamic_pointer_cast<PictureMXF> (_content.object ());
+	/** @return the PictureAsset that this object refers to */
+	std::shared_ptr<const PictureAsset> asset () const {
+		return asset_of_type<const PictureAsset> ();
+	}
+
+	/** @return the PictureAsset that this object refers to */
+	std::shared_ptr<PictureAsset> asset () {
+		return asset_of_type<PictureAsset> ();
 	}
 
 	/** @return picture frame rate */
@@ -59,13 +83,19 @@ public:
 		_screen_aspect_ratio = a;
 	}
 
+	Fraction screen_aspect_ratio () const {
+		return _screen_aspect_ratio;
+	}
+
 private:
 	std::string key_type () const;
-	
+
 	Fraction _frame_rate;
 	Fraction _screen_aspect_ratio;
 };
 
+
 }
 
+
 #endif