Replace slightly weird add_font_assets() API.

[libdcp.git] / src / combine.cc

diff --git a/src/combine.cc b/src/combine.cc
index da893cb73d5738cfcb6485e5c157671d720f78ab..b728298ad2f3ba2c9f45cb587a6b2fc8f84b83bc 100644 (file)
--- a/src/combine.cc
+++ b/src/combine.cc
@@ -155,6 +155,7 @@ dcp::combine (
                                DCP_ASSERT (file);
                                path new_path = make_unique(output / file->filename());
                                sub->write (new_path);
+                               add_to_container(assets, sub->font_assets());
                        }
 
                        assets.push_back (j);
@@ -173,5 +174,10 @@ dcp::combine (
                }
        }
 
-       output_dcp.write_xml (*standard, issuer, creator, issue_date, annotation_text, signer);
+       output_dcp.set_issuer(issuer);
+       output_dcp.set_creator(creator);
+       output_dcp.set_issue_date(issue_date);
+       output_dcp.set_annotation_text(annotation_text);
+
+       output_dcp.write_xml(signer);
 }