projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8a04d3d
)
Move a IMB location to try_imb() and add a new IMS pattern (#2644).
author
Carl Hetherington
<cth@carlh.net>
Sat, 11 Nov 2023 22:45:37 +0000
(23:45 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 11 Nov 2023 22:45:37 +0000
(23:45 +0100)
src/wx/dolby_doremi_certificate_panel.cc
patch
|
blob
|
history
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)
{
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)
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({
try_ims(vector<Location>& locations, string prefix, string serial)
{
locations.push_back({
- String::compose("%1%2xxx/Dolby-IM
B
-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial),
- String::compose("Dolby-IM
B
-%1.cert.sha256.pem", serial)
+ String::compose("%1%2xxx/Dolby-IM
S2000
-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial),
+ String::compose("Dolby-IM
S2000
-%1.cert.sha256.pem", serial)
});
locations.push_back({
});
locations.push_back({