From 128278c75f53058efeb4c1549aba63c9373bafb9 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 26 Dec 2023 14:35:37 +0100 Subject: [PATCH] AAF Import CLI: fix media location, use new libAAF API --- session_utils/new_aaf_session.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/session_utils/new_aaf_session.cc b/session_utils/new_aaf_session.cc index c5f3982c45..3f79dc26b9 100644 --- a/session_utils/new_aaf_session.cc +++ b/session_utils/new_aaf_session.cc @@ -858,9 +858,9 @@ main (int argc, char* argv[]) AAF_Iface* aafi = aafi_alloc (NULL); - aafi->ctx.options.trace = 1; - aafi->ctx.options.resolve = aaf_resolve_options; - aafi->ctx.options.protools = aaf_protools_options; + aafi_set_option_int (aafi, "trace", 1); + aafi_set_option_int (aafi, "protools", aaf_protools_options); + aafi_set_option_int (aafi, "resolve", aaf_resolve_options); /* * The following "forbid_nonlatin_filenames" option is there until we find a @@ -890,11 +890,9 @@ main (int argc, char* argv[]) ::exit (EXIT_FAILURE); } - aafi_set_debug (aafi, VERB_DEBUG, logfilefp, NULL, NULL); + aafi_set_debug (aafi, VERB_DEBUG, 0, logfilefp, NULL, NULL); - if (!media_location_path.empty ()) { - aafi_set_media_location (aafi, media_location_path.c_str ()); - } + aafi_set_option_str (aafi, "media_location", media_location_path.c_str ()); if (aafi_load_file (aafi, aaf_file.c_str ())) { PBD::error << "Could not load AAF file." << endmsg;