X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffilm.cc;h=5ccc5437a5cafedd6af5d32a950667772856d901;hb=0d9831021c7dc508bc69f7bd759dacd50ccb2766;hp=7dd0ff6f158273fbceca4f204fbdffc04c19d29f;hpb=8e1b0dfe3103867a749ff51156e3ed6547f298a0;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index 7dd0ff6f1..5ccc5437a 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -846,7 +846,18 @@ Film::isdcf_name (bool if_created_now) const if (dcp_content_type()) { d += "_" + dcp_content_type()->isdcf_name(); - d += "-" + raw_convert(isdcf_metadata().content_version); + string version = "1"; + if (_interop) { + if (!_content_versions.empty()) { + auto cv = _content_versions[0]; + if (!cv.empty() && std::all_of(cv.begin(), cv.end(), isdigit)) { + version = cv; + } + } + } else { + version = dcp::raw_convert(_version_number); + } + d += "-" + version; } auto const dm = isdcf_metadata ();