More licence fixups.

[libdcp.git] / src / mxf.h

diff --git a/src/mxf.h b/src/mxf.h
index a9f1bfa3b7fe4f94f058d2a4e5243d87d9b4e462..ced9da3b2be8e0fc725e711972714d40c9a84e0a 100644 (file)
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -1,20 +1,20 @@
 /*
     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/>.
 */
 
 #ifndef LIBDCP_MXF_H
@@ -28,7 +28,7 @@
 
 namespace ASDCP {
        class AESDecContext;
-       class WriterInfo;
+       struct WriterInfo;
 }
 
 /* Undefine some stuff that the OS X 10.5 SDK defines */
@@ -39,20 +39,19 @@ namespace dcp
 {
 
 class MXFMetadata;
-class PictureAssetWriter;      
+class PictureAssetWriter;
 
 /** @class MXF
- *  @brief Parent class for classes which represent MXF files.
+ *  @brief Parent for classes which represent MXF files.
  */
 class MXF
 {
 public:
-       MXF ();
-       virtual ~MXF ();
+       virtual ~MXF () {}
 
        /** @return true if the data is encrypted */
        bool encrypted () const {
-               return _key_id;
+               return static_cast<bool>(_key_id);
        }
 
        /** Set the ID of the key that is used for encryption/decryption.
@@ -85,7 +84,7 @@ public:
        MXFMetadata metadata () const {
                return _metadata;
        }
-       
+
 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);
@@ -95,9 +94,8 @@ protected:
         *  @param w struct to fill in.
         *  @param standard INTEROP or SMPTE.
         */
-       void fill_writer_info (ASDCP::WriterInfo* w, std::string id, Standard standard);
+       void fill_writer_info (ASDCP::WriterInfo* w, std::string id, Standard standard) const;
 
-       ASDCP::AESDecContext* _decryption_context;
        /** ID of the key used for encryption/decryption, if there is one */
        boost::optional<std::string> _key_id;
        /** Key used for encryption/decryption, if there is one */