Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / reel_mxf.cc

diff --git a/src/reel_mxf.cc b/src/reel_mxf.cc
index f9e8890afed05d772c58b24a7900fba1a681e4e9..9c2d3b60d062d7aefa976c4724e89287cb2b1aee 100644 (file)
--- a/src/reel_mxf.cc
+++ b/src/reel_mxf.cc
@@ -1,23 +1,38 @@
 /*
     Copyright (C) 2012-2015 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.
 */
 
 #include "reel_mxf.h"
+#include "util.h"
 #include "mxf.h"
 #include "dcp_assert.h"
 #include <libcxml/cxml.h>
@@ -37,7 +52,7 @@ ReelMXF::ReelMXF (optional<string> key_id)
 ReelMXF::ReelMXF (shared_ptr<const cxml::Node> node)
        : _key_id (node->optional_string_child ("KeyId"))
 {
-       if (_key_id && _key_id.get().length() > 9) {
-               _key_id = _key_id.get().substr (9);
+       if (_key_id) {
+               _key_id = remove_urn_uuid (*_key_id);
        }
 }