Merge master; MXF subtitle stuff not included.

1 files changed, 14 insertions, 0 deletions

diff --git a/src/mxf.cc b/src/mxf.cc
index 3c75997b..e1ed9650 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -29,6 +29,7 @@
 #include "metadata.h"
 #include "exceptions.h"
 #include "kdm.h"
+#include "compose.hpp"
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
@@ -152,3 +153,16 @@ MXF::read_writer_info (ASDCP::WriterInfo const & info)
 	Kumu::bin2UUIDhex (info.AssetUUID, 16, buffer, 64);
 	_id = buffer;
 }
+
+string
+MXF::pkl_type (Standard standard) const
+{
+	switch (standard) {
+	case INTEROP:
+		return String::compose ("application/x-smpte-mxf;asdcpKind=%1", asdcp_kind ());
+	case SMPTE:
+		return "application/x-smpte-mxf";
+	default:
+		assert (false);
+	}
+}