Allow tests to run kdm_cli().

diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index 8086fc4b7ea87e20fc39ba734dedda204a8db8ad..e9a3651ba3d24ca5f7cabe3ce04b4a953ea96ced 100644 (file)
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -596,9 +596,6 @@ try
                valid_to = valid_from.get() + duration_from_string (*duration_string);
        }
 
                valid_to = valid_from.get() + duration_from_string (*duration_string);
        }
 

-       dcpomatic_setup_path_encoding ();
-       dcpomatic_setup ();
-

        if (verbose) {
                out (String::compose("Making KDMs valid from %1 to %2", boost::posix_time::to_simple_string(valid_from.get()), boost::posix_time::to_simple_string(valid_to.get())));
        }
        if (verbose) {
                out (String::compose("Making KDMs valid from %1 to %2", boost::posix_time::to_simple_string(valid_from.get()), boost::posix_time::to_simple_string(valid_to.get())));
        }

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 04f102cf192d28e87108dfe164dfdee255507c85..46ab47a9a4c8d256c4ef9dea22d6038211b3d9da 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -25,12 +25,16 @@
 
 
 #include "lib/kdm_cli.h"
 
 
 #include "lib/kdm_cli.h"

+#include "lib/util.h"

 #include <iostream>
 
 
 int
 main (int argc, char* argv[])
 {
 #include <iostream>
 
 
 int
 main (int argc, char* argv[])
 {

+       dcpomatic_setup_path_encoding ();
+       dcpomatic_setup ();
+

        auto error = kdm_cli (argc, argv, [](std::string s) { std::cout << s << "\n"; });
        if (error) {
                std::cerr << *error << "\n";
        auto error = kdm_cli (argc, argv, [](std::string s) { std::cout << s << "\n"; });
        if (error) {
                std::cerr << *error << "\n";