diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-09 23:28:07 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-09 23:28:07 +0200 |
| commit | 142c13af321e1078b0acd3227d242bb97a46bdd3 (patch) | |
| tree | 4469897e12dc68b98171e1b8ad565100d8e933a8 | |
| parent | f89f471e821b33839d3a24c2ed39a5595b83b6ee (diff) | |
| parent | bcb7cda686bd428b8367b87343aae8356b4a5bf8 (diff) | |
Merge remote-tracking branch 'origin/main' into v2.17.x
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 5 | ||||
| -rw-r--r-- | src/wx/subscribers.cc | 1 | ||||
| -rw-r--r-- | src/wx/supporters.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 8b55d6205..7ee61ac23 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -267,6 +267,9 @@ main (int argc, char* argv[]) ArgFixer fixer(argc, argv); auto const program_name = fixer.argv()[0]; + dcpomatic_setup_path_encoding (); + dcpomatic_setup (); + boost::filesystem::path film_dir; bool progress = true; bool no_remote = false; @@ -416,8 +419,6 @@ main (int argc, char* argv[]) film_dir = fixer.argv()[optind]; - dcpomatic_setup_path_encoding (); - dcpomatic_setup (); signal_manager = new SignalManager (); if (no_remote || export_format) { diff --git a/src/wx/subscribers.cc b/src/wx/subscribers.cc index 868fc21b0..8fd535462 100644 --- a/src/wx/subscribers.cc +++ b/src/wx/subscribers.cc @@ -15,7 +15,6 @@ subscribers.Add (wxT ("Zbigniew Kamiński")); subscribers.Add (wxT ("Timm Kröger")); subscribers.Add (wxT ("Carlos Lagido")); subscribers.Add (wxT ("Ross Meyer")); -subscribers.Add (wxT ("Owen Morgan")); subscribers.Add (wxT ("Austrian Film Museum")); subscribers.Add (wxT ("LightBender Post")); subscribers.Add (wxT ("Irving Shapiro")); diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index a2b53251e..3a5a985b8 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -878,6 +878,7 @@ supported_by.Add (wxT ("Pierre-Jean Moreau")); supported_by.Add (wxT ("Stanislas Moreau")); supported_by.Add (wxT ("Ted Morée")); supported_by.Add (wxT ("Daniel Morez")); +supported_by.Add (wxT ("Owen Morgan")); supported_by.Add (wxT ("Paolo Morini")); supported_by.Add (wxT ("Lars Moritz")); supported_by.Add (wxT ("Lindsay Morris")); @@ -1357,9 +1358,11 @@ supported_by.Add (wxT ("Ernst Zimmerman")); supported_by.Add (wxT ("Roberto Zin")); supported_by.Add (wxT ("Matthieu Zingle")); supported_by.Add (wxT ("Allard Zoetman")); +supported_by.Add (wxT ("ZOOLOOK")); supported_by.Add (wxT ("Vincent Zorzi")); supported_by.Add (wxT ("Juan Zubillaga")); supported_by.Add (wxT ("Jack Zullo")); +supported_by.Add (wxT ("Jan Zuska")); supported_by.Add (wxT ("Camera Zwo")); supported_by.Add (wxT ("Юров Александр")); supported_by.Add (wxT ("Огрызков Алексей")); |