options: remove options-to-property bridge

The previous bunch of commits made this unnecessary, so this should be
a purely internal change with no user impact.

This may or may not open the way to future improvements. Even if not,
at least the property/option interaction should now be much less buggy.

1 files changed, 3 insertions, 21 deletions

diff --git a/options/m_config.c b/options/m_config.c
index 3fe8a67235..46b67a774f 100644
--- a/options/m_config.c
+++ b/options/m_config.c
@@ -814,9 +814,9 @@ static int m_config_handle_special_options(struct m_config *config,
     return M_OPT_UNKNOWN;
 }
 
-int m_config_set_option_raw_direct(struct m_config *config,
-                                   struct m_config_option *co,
-                                   void *data, int flags)
+int m_config_set_option_raw(struct m_config *config,
+                            struct m_config_option *co,
+                            void *data, int flags)
 {
     if (!co)
         return M_OPT_UNKNOWN;
@@ -842,24 +842,6 @@ int m_config_set_option_raw_direct(struct m_config *config,
     return 0;
 }
 
-int m_config_set_option_raw(struct m_config *config, struct m_config_option *co,
-                            void *data, int flags)
-{
-    if (!co)
-        return M_OPT_UNKNOWN;
-
-    if (config->option_set_callback) {
-        int r = handle_set_opt_flags(config, co, flags);
-        if (r <= 1)
-            return r;
-
-        return config->option_set_callback(config->option_set_callback_cb,
-                                           co, data, flags);
-    } else {
-        return m_config_set_option_raw_direct(config, co, data, flags);
-    }
-}
-
 // Handle CLI exceptions to option handling.
 // Used to turn "--no-foo" into "--foo=no".
 // It also handles looking up "--vf-add" as "--vf".