agx: Added dt_iop_get_module_enabled_preferring_unmasked_first_instance to imageop; refactored finding the 'exposure' instance in develop.c.

Author: kofa73

src/develop/develop.c

@@ -2951,42 +2951,6 @@ float dt_dev_exposure_get_exposure(dt_develop_t *dev)
   return instance && instance->get_exposure && instance->module->enabled ? instance->get_exposure(instance->module) : 0.0f;
 }
 
-static dt_iop_module_t *_find_preferred_enabled_instance(const dt_iop_module_so_t *module,
-                                          const gboolean prefer_expanded,
-                                          const gboolean prefer_unmasked,
-                                          const gboolean prefer_first)
-{
-  dt_iop_module_t *best_mod = NULL;
-  int best_score = -1;
-
-  for(GList *iop_mods = g_list_last(darktable.develop->iop);
-      iop_mods;
-      iop_mods = g_list_previous(iop_mods))
-  {
-    dt_iop_module_t *mod = iop_mods->data;
-
-    if(mod->so == module && mod->iop_order != INT_MAX)
-    {
-      if (!mod->enabled)
-        continue;
-
-      const gboolean no_mask = mod->blend_params->mask_mode == DEVELOP_MASK_DISABLED
-                            || mod->blend_params->mask_mode == DEVELOP_MASK_ENABLED;
-
-      const int score = (mod->expanded && prefer_expanded ? 8 : 0)
-                      + (no_mask       && prefer_unmasked ? 2 : 0);
-
-      if(score + (prefer_first ? 1 : 0) > best_score)
-      {
-        best_score = score;
-        best_mod = mod;
-      }
-    }
-  }
-
-  return best_mod;
-}
-
 float dt_dev_exposure_get_effective_exposure(dt_develop_t *dev)
 {
   if (dt_view_get_current() != DT_VIEW_DARKROOM) return 0.0f;
@@ -3008,7 +2972,7 @@ float dt_dev_exposure_get_effective_exposure(dt_develop_t *dev)
 
   if (exposure_so)
   {
-    dt_iop_module_t *preferred_exposure_instance = _find_preferred_enabled_instance(exposure_so, FALSE, TRUE, TRUE);
+    dt_iop_module_t *preferred_exposure_instance = dt_iop_get_module_enabled_preferring_unmasked_first_instance(exposure_so);
     if (preferred_exposure_instance)
       return dev->proxy.exposure.get_effective_exposure(preferred_exposure_instance);
   }

src/develop/imageop.c

@@ -3620,9 +3620,16 @@ dt_iop_module_t *dt_iop_get_module_by_op_priority(GList *modules,
   return mod_ret;
 }
 
+typedef enum instance_filter_mode_t
+{
+  FILTER_NEUTRAL,
+  FILTER_PREFER,
+  FILTER_REQUIRE,
+} instance_filter_mode_t;
+
 dt_iop_module_t *_find_preferred_instance(const dt_iop_module_so_t *module,
                                           const gboolean prefer_expanded,
-                                          const gboolean prefer_enabled,
+                                          const instance_filter_mode_t enabled_mode,
                                           const gboolean prefer_unmasked,
                                           const gboolean prefer_first)
 {
@@ -3637,6 +3644,10 @@ dt_iop_module_t *_find_preferred_instance(const dt_iop_module_so_t *module,
 
     if(mod->so == module && mod->iop_order != INT_MAX)
     {
+      if (enabled_mode == FILTER_REQUIRE && !mod->enabled) continue;
+
+      const gboolean prefer_enabled = enabled_mode == FILTER_PREFER;
+
       const gboolean no_mask = mod->blend_params->mask_mode == DEVELOP_MASK_DISABLED
                             || mod->blend_params->mask_mode == DEVELOP_MASK_ENABLED;
       const int score = (mod->expanded && prefer_expanded ? 8 : 0)
@@ -3688,11 +3699,20 @@ dt_iop_module_t *dt_iop_get_module_preferred_instance(const dt_iop_module_so_t *
   else
     return _find_preferred_instance(module,
                                     dt_conf_get_bool("accel/prefer_expanded"),
-                                    dt_conf_get_bool("accel/prefer_enabled"),
+                                    dt_conf_get_bool("accel/prefer_enabled") ? FILTER_PREFER : FILTER_NEUTRAL,
                                     dt_conf_get_bool("accel/prefer_unmasked"),
                                     dt_conf_is_equal("accel/select_order", "first instance"));
 }
 
+dt_iop_module_t *dt_iop_get_module_enabled_preferring_unmasked_first_instance(const dt_iop_module_so_t *module)
+{
+  return _find_preferred_instance(module,
+                                    FALSE,
+                                    FILTER_REQUIRE,
+                                    TRUE,
+                                    TRUE);
+}
+
 /** adds keyboard accels to the first module in the pipe to handle
  * where there are multiple instances */
 void dt_iop_connect_accels_multi(dt_iop_module_so_t *module)
@@ -3707,7 +3727,7 @@ void dt_iop_connect_accels_multi(dt_iop_module_so_t *module)
 
   if(!strcmp(module->op, "exposure"))
     darktable.develop->proxy.exposure.module =
-      _find_preferred_instance(module, FALSE, TRUE, TRUE, TRUE);
+      _find_preferred_instance(module, FALSE, FILTER_PREFER, TRUE, TRUE);
 }
 
 void dt_iop_connect_accels_all(void)

src/develop/imageop.h

@@ -457,6 +457,9 @@ int dt_iop_count_instances(dt_iop_module_so_t *module);
 /** return preferred module instance for shortcuts **/
 dt_iop_module_t *dt_iop_get_module_preferred_instance(const dt_iop_module_so_t *module);
 
+/** return an enabled instance, if any, preferring unmasked instances earlier in the pipe **/
+dt_iop_module_t *dt_iop_get_module_enabled_preferring_unmasked_first_instance(const dt_iop_module_so_t *module);
+
 /** returns true if module is the first instance of this operation in the pipe */
 gboolean dt_iop_is_first_instance(GList *modules, const dt_iop_module_t *module);