diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-18 13:47:29 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-18 13:47:29 +0200 |
| commit | 1baae6f052775956bab33a8d9ae9f94066227225 (patch) | |
| tree | 9c634a1b2914d4bf889e171b73c770469415f799 /src/tools/dcpomatic.cc | |
| parent | 6eba9bffa2371aa71b8981b1a7bcde0448d7623e (diff) | |
| parent | b0c1482f98c7e00634c1bc3dd801e76ce69907e2 (diff) | |
Merge branch 'grok2' into v2.17.xv2.17.8
This is the DoM support for Aaron Boxer's "grok" GPU J2K encoder,
with some cleanups and other assorted/related DoM changes.
Diffstat (limited to 'src/tools/dcpomatic.cc')
| -rw-r--r-- | src/tools/dcpomatic.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 979672fb4..db18d1a2f 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -75,6 +75,9 @@ #include "lib/ffmpeg_encoder.h" #include "lib/film.h" #include "lib/font_config.h" +#ifdef DCPOMATIC_GROK +#include "lib/grok/context.h" +#endif #include "lib/hints.h" #include "lib/job_manager.h" #include "lib/kdm_with_metadata.h" @@ -1180,6 +1183,7 @@ private: FontConfig::drop(); ev.Skip (); + JobManager::drop (); } void active_jobs_changed() @@ -1711,6 +1715,10 @@ private: notes.Centre(); notes.ShowModal(); } + +#ifdef DCPOMATIC_GROK + grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] ")); +#endif } catch (exception& e) { |