Allow specification of video bit rate separately for J2K and MPEG2.

[dcpomatic.git] / src / lib / grok / context.h

diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index d27caa5f6071a613a924fa707db306b7ddf9f4f0..81622ad9d8e1d1e303078731a76c2c6b7a53a33f 100644 (file)
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -112,7 +112,8 @@ public:
        explicit GrokContext(DcpomaticContext* dcpomatic_context)
                : _dcpomatic_context(dcpomatic_context)
        {
-               if (!Config::instance()->enable_gpu()) {
+               auto grok = Config::instance()->grok().get_value_or({});
+               if (!grok.enable) {
                        return;
                }
 
@@ -214,7 +215,7 @@ public:
 
                        auto s = dcpv.get_size();
                        _dcpomatic_context->set_dimensions(s.width, s.height);
-                       auto config = Config::instance();
+                       auto grok = Config::instance()->grok().get_value_or({});
                        if (!_messenger->launchGrok(
                                        _dcpomatic_context->location,
                                        _dcpomatic_context->width,
@@ -225,10 +226,10 @@ public:
                                        device,
                                        _dcpomatic_context->film->resolution() == Resolution::FOUR_K,
                                        _dcpomatic_context->film->video_frame_rate(),
-                                       _dcpomatic_context->film->j2k_bandwidth(),
-                                       config->gpu_license_server(),
-                                       config->gpu_license_port(),
-                                       config->gpu_license())) {
+                                       _dcpomatic_context->film->video_bit_rate(VideoEncoding::JPEG2000),
+                                       grok.licence_server,
+                                       grok.licence_port,
+                                       grok.licence)) {
                                _launch_failed = true;
                                return false;
                        }