X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_picture_asset.h;h=979bd8f6a9acf68fc99892b25484d49f32258706;hb=7b03aba8bc4e9df269430d79ce4ee2c6bd5f344c;hp=15b01b74bc1da9812569237ea0ae0a5484b63c85;hpb=fa2900fedac1030141c56b691c7f6e0f7e629424;p=libdcp.git diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h index 15b01b74..979bd8f6 100644 --- a/src/reel_picture_asset.h +++ b/src/reel_picture_asset.h @@ -1,20 +1,34 @@ /* Copyright (C) 2014-2015 Carl Hetherington - 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 . + + 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 @@ -38,14 +52,19 @@ class ReelPictureAsset : public ReelAsset, public ReelMXF public: ReelPictureAsset (); ReelPictureAsset (boost::shared_ptr asset, int64_t entry_point); - ReelPictureAsset (boost::shared_ptr); + explicit ReelPictureAsset (boost::shared_ptr); virtual void write_to_cpl (xmlpp::Node* node, Standard standard) const; virtual bool equals (boost::shared_ptr, EqualityOptions, NoteHandler) const; + /** @return the PictureAsset that this object refers to */ + boost::shared_ptr asset () const { + return asset_of_type (); + } + /** @return the PictureAsset that this object refers to */ boost::shared_ptr asset () { - return boost::dynamic_pointer_cast (_asset_ref.object ()); + return asset_of_type (); } /** @return picture frame rate */