Move make_simple() into test.{cc,h}

[libdcp.git] / src / mxf.cc

diff --git a/src/mxf.cc b/src/mxf.cc
index 008dbc2ae8955ae1c37d55eb96d16d9202eeeec4..512da8441a77afcfe14779c92f2ec48b783bb628 100644 (file)
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -77,7 +77,7 @@ MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id) const
 {
        writer_info->ProductVersion = _metadata.product_version;
        writer_info->CompanyName = _metadata.company_name;
-       writer_info->ProductName = _metadata.product_name.c_str();
+       writer_info->ProductName = _metadata.product_name;
 
        DCP_ASSERT (_standard);
        if (_standard == INTEROP) {
@@ -135,7 +135,7 @@ MXF::read_writer_info (ASDCP::WriterInfo const & info)
                _standard = SMPTE;
                break;
        default:
-               DCP_ASSERT (false);
+               throw ReadError ("Unrecognised label set type in MXF");
        }
 
        _metadata.read (info);