From: Carl Hetherington <cth@carlh.net>
Date: Sat, 11 Nov 2023 22:45:37 +0000 (+0100)
Subject: Move a IMB location to try_imb() and add a new IMS pattern (#2644).
X-Git-Tag: v2.16.67~26
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0f225b6df7a9603678a5bd84f9428ff6fb56aea2;p=dcpomatic.git

Move a IMB location to try_imb() and add a new IMS pattern (#2644).
---

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 27d09bbde..d290535c2 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -101,6 +101,11 @@ try_dcp2000(vector<Location>& locations, string prefix, string serial)
 static void
 try_imb(vector<Location>& locations, string prefix, string serial)
 {
+	locations.push_back({
+		String::compose("%1%2xxx/Dolby-IMB-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial),
+		String::compose("Dolby-IMB-%1.cert.sha256.pem", serial)
+	});
+
 	locations.push_back({
 		String::compose("%1%2xxx/imb-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial),
 		String::compose("imb-%1.cert.sha256.pem", serial)
@@ -112,8 +117,8 @@ static void
 try_ims(vector<Location>& locations, string prefix, string serial)
 {
 	locations.push_back({
-		String::compose("%1%2xxx/Dolby-IMB-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial),
-		String::compose("Dolby-IMB-%1.cert.sha256.pem", serial)
+		String::compose("%1%2xxx/Dolby-IMS2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial),
+		String::compose("Dolby-IMS2000-%1.cert.sha256.pem", serial)
 	});
 
 	locations.push_back({