Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / reel_mono_picture_asset.h

diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index 881bbec09c3d3963cfe8db05502710892e91499e..4c5eaa083ae469a1a580659926f2f48d1493a1a4 100644 (file)
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -1,40 +1,74 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2017 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_mono_picture_asset.h
+ *  @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"
 
 namespace dcp {
 
-class MonoPictureMXF;  
+class MonoPictureAsset;
 
+/** @class ReelMonoPictureAsset
+ *  @brief Part of a Reel's description which refers to a monoscopic picture asset.
+ */
 class ReelMonoPictureAsset : public ReelPictureAsset
 {
 public:
        ReelMonoPictureAsset ();
-       ReelMonoPictureAsset (boost::shared_ptr<MonoPictureMXF> content, int64_t entry_point);
-       ReelMonoPictureAsset (boost::shared_ptr<const cxml::Node>);
+       ReelMonoPictureAsset (boost::shared_ptr<MonoPictureAsset> asset, int64_t entry_point);
+       explicit ReelMonoPictureAsset (boost::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 MonoPictureAsset that this object refers to */
+       boost::shared_ptr<MonoPictureAsset> mono_asset () {
+               return asset_of_type<MonoPictureAsset> ();
+       }
 
 private:
-       std::string cpl_node_name () const;
+       std::string cpl_node_name (Standard standard) const;
 };
 
 }
 
-       
-               
+#endif