Missing initialisattion of DCPReadError::_message.

[libdcp.git] / src / mxf.h

diff --git a/src/mxf.h b/src/mxf.h
index d490e9e4a8a2e66a80a3d8b868448923bce63813..8f83fafdd869572d93e2dc5812f739830ce6a24f 100644 (file)
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 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.
 */
 
 #ifndef LIBDCP_MXF_H
@@ -47,6 +61,7 @@ class PictureAssetWriter;
 class MXF
 {
 public:
+       MXF ();
        virtual ~MXF () {}
 
        /** @return true if the data is encrypted */
@@ -66,13 +81,25 @@ public:
                return _key_id;
        }
 
-       void set_key (Key);
+       virtual void set_key (Key);
 
        /** @return encryption/decryption key, if one has been set */
        boost::optional<Key> key () const {
                return _key;
        }
 
+       /** Set the context ID to be used when encrypting.
+        *  @param id New ID.
+        */
+       void set_context_id (std::string id) {
+               _context_id = id;
+       }
+
+       /** @return context ID used when encrypting; this starts off as a random value */
+       std::string context_id () const {
+               return _context_id;
+       }
+
        /** Set the metadata that is written to the MXF file.
         *  @param m Metadata.
         */
@@ -87,7 +114,7 @@ public:
 
 protected:
        template <class P, class Q>
-       friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t* data, int size);
+       friend void start (PictureAssetWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t const * data, int size);
 
        std::string read_writer_info (ASDCP::WriterInfo const &);
        /** Fill in a ADSCP::WriteInfo struct.
@@ -100,6 +127,7 @@ protected:
        boost::optional<std::string> _key_id;
        /** Key used for encryption/decryption, if there is one */
        boost::optional<Key> _key;
+       std::string _context_id;
        MXFMetadata _metadata;
 };