From 4e8c725ec3c25093ac73d07926e235af5531e92b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 6 Jul 2024 22:05:45 +0200 Subject: Supporters update. --- src/wx/supporters.cc | 3 +++ 1 file changed, 3 insertions(+) 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")); -- cgit v1.2.3 From 7755ad37d030e46ce9a0dcb35e886139fe51137e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Jul 2024 01:50:31 +0200 Subject: Remove double ArgFixer introduced in fefcccd5. --- src/tools/dcpomatic_kdm_cli.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 1db5ce7f9..c30fe4e6a 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -33,12 +33,10 @@ int main (int argc, char* argv[]) { - ArgFixer fixer(argc, 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(argc, argv, [](std::string s) { std::cout << s << "\n"; }); if (error) { std::cerr << *error << "\n"; exit (EXIT_FAILURE); -- cgit v1.2.3 From 30dfb151091962231a228a084fb5954b1a75574b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Jul 2024 13:12:10 +0200 Subject: Re-fix incorrect ArgFixer. It needs to be in the front-end, not the kdm_cli() method, otherwise the tests break. --- src/lib/kdm_cli.cc | 6 ++---- src/tools/dcpomatic_kdm_cli.cc | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc index ee9622255..bba8fb7c0 100644 --- a/src/lib/kdm_cli.cc +++ b/src/lib/kdm_cli.cc @@ -459,8 +459,6 @@ optional kdm_cli (int argc, char* argv[], std::function 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(); @@ -515,7 +513,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:BDE:G", long_options, &option_index); + int c = getopt_long(argc, argv, "ho:K:Z:f:t:d:F:pae::zvc:S:C:T:BDE:G", long_options, &option_index); if (c == -1) { break; @@ -649,7 +647,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 c30fe4e6a..4ffd0acd7 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -33,10 +33,12 @@ int main (int argc, char* argv[]) { + ArgFixer fixer(argc, argv); + dcpomatic_setup_path_encoding (); dcpomatic_setup (); - auto error = kdm_cli(argc, 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); -- cgit v1.2.3