Qt: seek slider simplifications

[vlc] / include / vlc_plugin.h

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 0e01ffb7840b8bb7c67493514172a3ca75c6b75e..e227b79a8d08f0f545e1b4e8278035789c2e8c2d 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -110,18 +110,11 @@ enum vlc_module_properties
     /* Insert new VLC_CONFIG_* here */
 };
 
-/*****************************************************************************
- * If we are not within a module, assume we're in the vlc core.
- *****************************************************************************/
-#if !defined( __PLUGIN__ ) && !defined( __BUILTIN__ )
-#   define MODULE_NAME main
-#endif
-
 /**
  * Current plugin ABI version
  */
-# define MODULE_SYMBOL 1_2_0f
-# define MODULE_SUFFIX "__1_2_0f"
+# define MODULE_SYMBOL 1_2_0g
+# define MODULE_SUFFIX "__1_2_0g"
 
 /*****************************************************************************
  * Add a few defines. You do not want to read this section. Really.
@@ -303,23 +296,23 @@ enum vlc_module_properties
     add_string_inner( CONFIG_ITEM_STRING, name, text, longtext, advc, \
                       value )
 
-#define add_password( name, value, p_callback, text, longtext, advc ) \
+#define add_password( name, value, text, longtext, advc ) \
     add_string_inner( CONFIG_ITEM_PASSWORD, name, text, longtext, advc, \
                       value )
 
-#define add_loadfile( name, value, p_callback, text, longtext, advc ) \
+#define add_loadfile( name, value, text, longtext, advc ) \
     add_string_inner( CONFIG_ITEM_LOADFILE, name, text, longtext, advc, \
                       value )
 
-#define add_savefile( name, value, p_callback, text, longtext, advc ) \
+#define add_savefile( name, value, text, longtext, advc ) \
     add_string_inner( CONFIG_ITEM_SAVEFILE, name, text, longtext, advc, \
                       value )
 
-#define add_directory( name, value, p_callback, text, longtext, advc ) \
+#define add_directory( name, value, text, longtext, advc ) \
     add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, \
                       value )
 
-#define add_font( name, value, p_callback, text, longtext, advc )\
+#define add_font( name, value, text, longtext, advc )\
     add_string_inner( CONFIG_ITEM_FONT, name, text, longtext, advc, \
                       value )
 
@@ -345,27 +338,28 @@ enum vlc_module_properties
     change_integer_range (i_subcategory /* gruik */, 0);
 #endif
 
-#define add_integer( name, value, p_callback, text, longtext, advc ) \
+#define add_integer( name, value, text, longtext, advc ) \
     add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, value )
 
-#define add_key( name, value, p_callback, text, longtext, advc ) \
-    add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, value ) \
-    add_int_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \
-                   KEY_UNSET )
+#define add_key( name, value, text, longtext, advc ) \
+    add_string_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \
+                   KEY_UNSET ) \
+        change_need_restart() \
+    add_string_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, value )
 
 #define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \
-    add_integer( name, value, p_callback, text, longtext, advc ) \
+    add_integer( name, value, text, longtext, advc ) \
     change_integer_range( i_min, i_max )
 
-#define add_float( name, v, p_callback, text, longtext, advc ) \
+#define add_float( name, v, text, longtext, advc ) \
     add_typename_inner( CONFIG_ITEM_FLOAT, name, text, longtext, advc ) \
     vlc_config_set (p_config, VLC_CONFIG_VALUE, (double)(v));
 
 #define add_float_with_range( name, value, f_min, f_max, p_callback, text, longtext, advc ) \
-    add_float( name, value, p_callback, text, longtext, advc ) \
+    add_float( name, value, text, longtext, advc ) \
     change_float_range( f_min, f_max )
 
-#define add_bool( name, v, p_callback, text, longtext, advc ) \
+#define add_bool( name, v, text, longtext, advc ) \
     add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc ) \
     if (v) vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)true);