diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-09 00:58:09 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-09 00:58:09 +0200 |
| commit | 87aead633e6dfa256d42271040a488f1d5fe96e3 (patch) | |
| tree | ec3122028817f2c5e7e6678e670c1f826a07010b | |
| parent | 3317a9b30752e2e311e7bfe36a8ce8201b07636a (diff) | |
| parent | 30dfb151091962231a228a084fb5954b1a75574b (diff) | |
Merge remote-tracking branch 'origin/main' into v2.17.x
| -rw-r--r-- | src/lib/kdm_cli.cc | 6 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 2 | ||||
| -rw-r--r-- | src/wx/supporters.cc | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc index 551be65e5..20cbf33e6 100644 --- a/src/lib/kdm_cli.cc +++ b/src/lib/kdm_cli.cc @@ -469,8 +469,6 @@ optional<string> kdm_cli (int argc, char* argv[], std::function<void (string)> out) try { - ArgFixer fixer(argc, argv); - boost::filesystem::path output = dcp::filesystem::current_path(); auto container_name_format = Config::instance()->kdm_container_name_format(); auto filename_format = Config::instance()->kdm_filename_format(); @@ -526,7 +524,7 @@ try { 0, 0, 0, 0 } }; - int c = getopt_long(fixer.argc(), fixer.argv(), "ho:K:Z:f:t:d:F:pae::zvc:S:C:T:E:G", long_options, &option_index); + int c = getopt_long(argc, argv, "ho:K:Z:f:t:d:F:pae::zvc:S:C:T:E:G", long_options, &option_index); if (c == -1) { break; @@ -682,7 +680,7 @@ try throw KDMCLIError ("you must specify --valid-from"); } - if (optind >= fixer.argc()) { + if (optind >= argc) { throw KDMCLIError ("no film, CPL ID or DKDM specified"); } diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 1db5ce7f9..4ffd0acd7 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -38,7 +38,7 @@ main (int argc, char* argv[]) dcpomatic_setup_path_encoding (); dcpomatic_setup (); - auto error = kdm_cli (fixer.argc(), fixer.argv(), [](std::string s) { std::cout << s << "\n"; }); + auto error = kdm_cli(fixer.argc(), fixer.argv(), [](std::string s) { std::cout << s << "\n"; }); if (error) { std::cerr << *error << "\n"; exit (EXIT_FAILURE); diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index cb595eb5e..a2b53251e 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -442,6 +442,7 @@ supported_by.Add (wxT ("André Fritschi")); supported_by.Add (wxT ("Monte Fullmer")); supported_by.Add (wxT ("Gerhard Funk")); supported_by.Add (wxT ("Stephen Furley")); +supported_by.Add (wxT ("Media Furrate")); supported_by.Add (wxT ("Juliana Fusco")); supported_by.Add (wxT ("Kirk Futrell")); supported_by.Add (wxT ("Maarten Van Gageldonk")); @@ -594,6 +595,7 @@ supported_by.Add (wxT ("Melinda James")); supported_by.Add (wxT ("Luca Jankovic")); supported_by.Add (wxT ("Andy Jans-Brown")); supported_by.Add (wxT ("Mart Jansink")); +supported_by.Add (wxT ("Scott Jennings")); supported_by.Add (wxT ("Jonathan Jensen")); supported_by.Add (wxT ("Frank Jerkic")); supported_by.Add (wxT ("Arturas Jevdokimovas")); @@ -746,6 +748,7 @@ supported_by.Add (wxT ("Deep Structure Productions LLC")); supported_by.Add (wxT ("Spilled Ink Cinema LLC")); supported_by.Add (wxT ("Nova Initia Productions LLC")); supported_by.Add (wxT ("Movie Geek Enterprises LLC")); +supported_by.Add (wxT ("Social Light LLC")); supported_by.Add (wxT ("Road 28 Productions LLC")); supported_by.Add (wxT ("4PM Media LLC")); supported_by.Add (wxT ("Fennworld LLC")); |