Merge branch 'master' of ssh://main.carlh.net/home/carl/git/libdcp

[libdcp.git] / src / reel_stereo_picture_asset.h

diff --git a/src/reel_stereo_picture_asset.h b/src/reel_stereo_picture_asset.h
index ea95710f393fda7302efa6784d884cba0d42d7bb..c7223495bbc48d9fd2fb56efde09250cfe0e32c0 100644 (file)
--- a/src/reel_stereo_picture_asset.h
+++ b/src/reel_stereo_picture_asset.h
@@ -15,6 +15,20 @@
 
     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_stereo_picture_asset.h
@@ -39,7 +53,7 @@ class ReelStereoPictureAsset : public ReelPictureAsset
 public:
        ReelStereoPictureAsset ();
        ReelStereoPictureAsset (boost::shared_ptr<StereoPictureAsset> content, int64_t entry_point);
-       ReelStereoPictureAsset (boost::shared_ptr<const cxml::Node>);
+       explicit ReelStereoPictureAsset (boost::shared_ptr<const cxml::Node>);
 
        /** @return the StereoPictureAsset that this object refers to */
        boost::shared_ptr<const StereoPictureAsset> stereo_asset () const {
@@ -52,7 +66,7 @@ public:
        }
 
 private:
-       std::string cpl_node_name () const;
+       std::string cpl_node_name (Standard standard) const;
        std::pair<std::string, std::string> cpl_node_attribute (Standard standard) const;
 };