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 27d09bbde925947eb382d9c5b6416064aaf8d08f..d290535c2d2850f2e8e55897e406d2a58442e014 100644 (file)
--- 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({